wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-10-12 16:01:10 +08:00
parent 6d3d16bbdf 672981d051
commit e0ca9166e4
9 changed files with 946 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
back/public/config/basicConfig.js
View File

@ -2,16 +2,16 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49 * @Date: 2022-08-25 14:37:49
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-27 14:25:39 * @LastEditTime: 2022-10-12 13:40:14
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
version: 'qingdao', // 青岛 // version: 'qingdao', // 青岛
// version: 'xihaian', // 西海岸 // version: 'xihaian', // 西海岸
// version: 'test', // 测试 // version: 'test', // 测试
// version: 'frp', // 内网穿透 // version: 'frp', // 内网穿透
// version: 'dev', // 开发 version: 'dev', // 开发
vNum: 'v0.8.7.2', vNum: 'v0.8.7.2',
configData: { configData: {
// 青岛市大数据局 // 青岛市大数据局
@ -24,7 +24,8 @@ var CONFIGITEM = {
xihaian: { xihaian: {
previewUrl: 'http://10.134.135.9:9796/', previewUrl: 'http://10.134.135.9:9796/',
// apiURL: 'http://10.134.135.9:8888/renren-admin', // apiURL: 'http://10.134.135.9:8888/renren-admin',
apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成 // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket' websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
}, },
// 测试 // 测试

8
front/public/static/config/basicConfig.js
View File

@ -1,15 +1,15 @@
/* /*
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-09-19 09:36:49 * @LastEditTime: 2022-10-11 10:46:03
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
// version: 'qingdao', //青岛 // version: 'qingdao', //青岛
version: 'xihaian', // 西海岸 //version: 'xihaian', // 西海岸
// version: 'dev', // 开发 version: 'dev', // 开发
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
//version: 'test', // 测试 //version: 'test', // 测试
//version: 'frp', // 内网穿透 //version: 'frp', // 内网穿透

15
front/src/store/modules/user.js
View File

@ -53,7 +53,7 @@ const mutations = {
* @param {*} state * @param {*} state
* @param {*} username * @param {*} username
*/ */
setRealname(state, realName) { setRealname(state, realName) {
state.realName = realName state.realName = realName
}, },
// 设置角色 // 设置角色
@ -126,16 +126,16 @@ const actions = {
* @returns * @returns
*/ */
async getUserInfo({ commit }) { async getUserInfo({ commit }) {
const { data } = await getUserInfo() const res = await getUserInfo()
if (!data) { if (!res || !res.data) {
message.error(`验证失败，请重新登录...`) message.error(`验证失败，请重新登录...`)
return false return false
} }
// debugger // debugger
commit('setUsername', data.data.username) commit('setUsername', res.data.data.username)
commit('setRealname', data.data.realName) commit('setRealname', res.data.data.realName)
commit('setRole', data.data.roleIdList.length) commit('setRole', res.data.data.roleIdList.length)
commit('setUserId', data.data.id) commit('setUserId', res.data.data.id)
// TODO 获取用户信息，后续执行部分操作 // TODO 获取用户信息，后续执行部分操作
// let { username, avatar, roles, ability } = data // let { username, avatar, roles, ability } = data
// if (username && roles && Array.isArray(roles)) { // if (username && roles && Array.isArray(roles)) {
@ -168,6 +168,7 @@ const actions = {
* @param {*} { commit, dispatch } * @param {*} { commit, dispatch }
*/ */
async resetAll({ dispatch }) { async resetAll({ dispatch }) {
debugger
await dispatch('setAccessToken', '') await dispatch('setAccessToken', '')
await dispatch('acl/setFull', false, { await dispatch('acl/setFull', false, {
root: true, root: true,

50
front/src/utils/request.js
View File

@ -11,14 +11,8 @@ import store from '@/store'
import qs from 'qs' import qs from 'qs'
import router from '@/router' import router from '@/router'
// import { isArray } from '@/utils/validate' // import { isArray } from '@/utils/validate'
import { import { message } from 'ant-design-vue'
message import { getAccessToken, setAccessToken } from '@/utils/accessToken'
} from 'ant-design-vue'
import {
getAccessToken,
setAccessToken
} from '@/utils/accessToken'
let loadingInstance let loadingInstance
@ -33,12 +27,14 @@ const handleCode = (code, msg, res) => {
switch (code) { switch (code) {
case 401: case 401:
debugger debugger
store.dispatch('user/resetAll').catch(() => { }) store.dispatch('user/resetAll').catch(() => {})
break break
case 403: case 403:
router.push({ router
path: '/401' .push({
}).catch(() => { }) path: '/401',
})
.catch(() => {})
break break
case 500: case 500:
message.error(msg || '接口异常') message.error(msg || '接口异常')
@ -76,7 +72,7 @@ instance.interceptors.request.use(
if ( if (
config.data && config.data &&
config.headers['Content-Type'] === config.headers['Content-Type'] ===
'application/x-www-form-urlencoded;charset=UTF-8' 'application/x-www-form-urlencoded;charset=UTF-8'
) )
config.data = qs.stringify(config.data) config.data = qs.stringify(config.data)
if (debounce.some((item) => config.url.includes(item))) { if (debounce.some((item) => config.url.includes(item))) {
@ -103,17 +99,14 @@ instance.interceptors.response.use(
console.log('接口返回headers', response.headers) console.log('接口返回headers', response.headers)
console.log('接口返回REDIRECT', response.headers.redirect) console.log('接口返回REDIRECT', response.headers.redirect)
response['Access-Control-Expose-Headers'] = 'redirect' response['Access-Control-Expose-Headers'] = 'redirect'
const { const { code, message } = response.data
code,
message
} = response.data
if (response.headers.token) { if (response.headers.token) {
setAccessToken(response.headers.token) setAccessToken(response.headers.token)
} }
if (response.headers.redirect) { if (response.headers.redirect) {
const _old_href = window.location.href.split('#')[0]; const _old_href = window.location.href.split('#')[0]
const _new_href = response.headers.redirect.split('#')[0]; const _new_href = response.headers.redirect.split('#')[0]
window.location.replace(response.headers.redirect) window.location.replace(response.headers.redirect)
// url 相同，强制刷新 // url 相同，强制刷新
if (_old_href === _new_href) { if (_old_href === _new_href) {
@ -124,7 +117,7 @@ instance.interceptors.response.use(
if (response.headers.redirect === '/#/login') { if (response.headers.redirect === '/#/login') {
var keys = document.cookie.match(/[^ =;]+(?=\=)/g) var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
if (keys) { if (keys) {
for (var i = keys.length; i--;) { for (var i = keys.length; i--; ) {
document.cookie = document.cookie =
keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
document.cookie = document.cookie =
@ -168,14 +161,14 @@ instance.interceptors.response.use(
console.log('接口error', error) console.log('接口error', error)
if (loadingInstance) loadingInstance.close() if (loadingInstance) loadingInstance.close()
const { const { response, message } = error
response,
message
} = error
if (error.response) { if (error.response) {
console.log('接口返回', response) console.log('接口返回', response)
console.log('接口返回headers', response.headers) console.log('接口返回headers', response.headers)
console.log('接口返回REDIRECT', response.headers.redirect) console.log('接口返回REDIRECT', response.headers.redirect)
const { status, data } = response
handleCode(status, data.msg || message, response.headers.redirect)
if (response.headers.token) { if (response.headers.token) {
setAccessToken(response.headers.token) setAccessToken(response.headers.token)
} }
@ -183,17 +176,10 @@ instance.interceptors.response.use(
window.location.replace(response.headers.redirect) window.location.replace(response.headers.redirect)
return Promise.resolve() return Promise.resolve()
} }
const {
status,
data
} = response
handleCode(status, data.msg || message, response.headers.redirect)
return Promise.reject(error) return Promise.reject(error)
} else { } else {
let { let { message } = error
message
} = error
if (message === 'Network Error') { if (message === 'Network Error') {
message = '后端接口连接异常' message = '后端接口连接异常'
} }

7
front/src/vab/plugins/permissions.js
View File

@ -1,8 +1,8 @@
/* /*
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-01 17:23:11 * @Date: 2022-04-01 17:23:11
* @LastEditors: Light * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-10 16:43:58 * @LastEditTime: 2022-10-11 13:59:18
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
/** /**
@ -26,7 +26,7 @@ router.beforeEach(async (to, from, next) => {
// if (SSOTOKEN) { // if (SSOTOKEN) {
// setAccessToken(SSOTOKEN) // setAccessToken(SSOTOKEN)
// } // }
console.log('验证白名单', routesWhiteList)
const token = getAccessToken() const token = getAccessToken()
console.log('token', token) console.log('token', token)
let hasToken = token let hasToken = token
@ -45,6 +45,7 @@ router.beforeEach(async (to, from, next) => {
router.addRoute(item) router.addRoute(item)
}) })
if (routesWhiteList.indexOf(to.path) !== -1) { if (routesWhiteList.indexOf(to.path) !== -1) {
debugger
next() next()
} else { } else {
// 这里是一个单点登录的入口 // 这里是一个单点登录的入口

4
front/src/views/home/DetailsPageconetent.vue
View File

@ -1085,7 +1085,7 @@ export default defineComponent({
// 青岛-数据处理 // 青岛-数据处理
const getQingDao = (res) => { const getQingDao = (res) => {
; ((res.data && res.data.data && res.data.data.data) || []).forEach( ((res.data && res.data.data && res.data.data.data) || []).forEach(
(val) => { (val) => {
val.id = val.guid // id val.id = val.guid // id
val.name = val.zyname // 名字 val.name = val.zyname // 名字
@ -1101,7 +1101,7 @@ export default defineComponent({
} }
// 青岛-西海岸处理 // 青岛-西海岸处理
const getXiHaiAn = (res) => { const getXiHaiAn = (res) => {
; ((res.data && res.data.data && res.data.data.list) || []).forEach( ((res.data && res.data.data && res.data.data.list) || []).forEach(
(val) => { (val) => {
val.id = val.serviceId // id val.id = val.serviceId // id
val.name = val.serviceName // 名字 val.name = val.serviceName // 名字

917
front/src/views/home/components/header.vue
View File

File diff suppressed because it is too large Load Diff

92
front/src/views/home/infrastructurePage.vue
View File

@ -330,7 +330,6 @@
<a-input v-model:value="formState.name" style="width: 72%" /> <a-input v-model:value="formState.name" style="width: 72%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- v-bind="validateInfos.phone" -->
<a-col :span="8"> <a-col :span="8">
<a-form-item <a-form-item
name="phone" name="phone"
@ -416,7 +415,6 @@
<span>{{ pagination.total || 0 }}</span> <span>{{ pagination.total || 0 }}</span>
个 个
</p> </p>
<!-- <i class="boundary"></i> -->
<p> <p>
已选 已选
<span>{{ selectedRowKeys.length }}</span> <span>{{ selectedRowKeys.length }}</span>
@ -425,7 +423,6 @@
</div> </div>
<!-- 右侧 --> <!-- 右侧 -->
<div class="contentRight"> <div class="contentRight">
<!-- 搜索@search="onSearch" -->
<div class="searchInput" v-if="isXiHaiAn"> <div class="searchInput" v-if="isXiHaiAn">
<a-input-search <a-input-search
v-model:value="mapSearchParam.cameraName" v-model:value="mapSearchParam.cameraName"
@ -490,10 +487,10 @@
@change="handleTableChange" @change="handleTableChange"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
// onChange: onSelectChange,
onSelect: onSelectChange, onSelect: onSelectChange,
onSelectAll: onSelectAll, onSelectAll: onSelectAll,
}" }"
:loading="loadingCamera"
> >
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="isXiHaiAn && column.dataIndex === 'status'"> <template v-if="isXiHaiAn && column.dataIndex === 'status'">
@ -512,18 +509,6 @@
> >
预览 预览
</a> </a>
<!-- <a
v-else
@click="
openPicture(
record.channelCode ||
record.channelId ||
record.channelCode.channelId
)
"
>
预览
</a> -->
</template> </template>
</template> </template>
</a-table> </a-table>
@ -566,19 +551,19 @@
> >
<template #footer></template> <template #footer></template>
<div style="width: 100%; display: flex; justify-content: center"> <div style="width: 100%; display: flex; justify-content: center">
<div style="width: 100%; height: 100%; position: relative"> <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
<!-- 西海岸--预览视频--遮罩 todo--> <!-- 西海岸--预览视频--遮罩 todo-->
<div class="video-cover" @click="videoShowMsg" v-show="isXiHaiAn"></div> <div class="video-cover" @click="videoShowMsg"></div>
<div class="waterMark waterMark-left-top" v-show="isXiHaiAn"> <div class="waterMark waterMark-left-top">
{{ userInfo.usernameShow }} {{ userInfo.usernameShow }}
</div> </div>
<div class="waterMark waterMark-right-top" v-show="isXiHaiAn"> <div class="waterMark waterMark-right-top">
{{ userInfo.realNameShow }} {{ userInfo.realNameShow }}
</div> </div>
<div class="waterMark waterMark-left-bottom" v-show="isXiHaiAn"> <div class="waterMark waterMark-left-bottom">
{{ userInfo.usernameShow }} {{ userInfo.usernameShow }}
</div> </div>
<div class="waterMark waterMark-right-bottom" v-show="isXiHaiAn"> <div class="waterMark waterMark-right-bottom">
{{ userInfo.realNameShow }} {{ userInfo.realNameShow }}
</div> </div>
<vue3VideoPlay v-bind="options" /> <vue3VideoPlay v-bind="options" />
@ -843,13 +828,6 @@
}, },
], ],
matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }], matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
// phone: [
// {
// required: true,
// pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
// message: '请输入正确的手机号',
// },
// ],
dept: [ dept: [
{ {
required: true, required: true,
@ -948,7 +926,6 @@
dataSource.value = param.dataSource dataSource.value = param.dataSource
pagination.value.total = param.total pagination.value.total = param.total
// getCamera()
}) })
//点位点击 //点位点击
mybus.off('pointMarkerClick') mybus.off('pointMarkerClick')
@ -1004,10 +981,6 @@
{ {
arr: [ arr: [
{ {
// description:
// '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。',
// resourceId: 'dbsb',
// type: '单兵设备',
description: data.description, description: data.description,
resourceId: data.id, resourceId: data.id,
resourceName: data.wrjName, resourceName: data.wrjName,
@ -1444,14 +1417,6 @@
pagination.value.total = 0 pagination.value.total = 0
selectType.value = '感知资源' selectType.value = '感知资源'
} else if (name == '城市云脑会客厅') { } else if (name == '城市云脑会客厅') {
// room.value = false
// wrjFlag.value = true
// showMap.value = false
// roomYuyue.value = true
// roomResult.value = false
// tabList.value[1] = []
// emits('add', 6)
// searchData()
} }
clickList.value[indexFather].content.splice( clickList.value[indexFather].content.splice(
clickList.value[indexFather].content.indexOf(name), clickList.value[indexFather].content.indexOf(name),
@ -1491,12 +1456,10 @@
mapSearchParam.value.labelCodes.push(item.labelCode) mapSearchParam.value.labelCodes.push(item.labelCode)
}) })
} }
// todo
mapSearchParam.value.gpsX = '' mapSearchParam.value.gpsX = ''
mapSearchParam.value.gpsY = '' mapSearchParam.value.gpsY = ''
mapSearchParam.value.radius = '' mapSearchParam.value.radius = ''
mapSearchParam.value.type = '' mapSearchParam.value.type = ''
console.log('mapSearchParam----->查询条件', mapSearchParam.value)
mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
emits('add', 1) emits('add', 1)
getCamera() getCamera()
@ -1717,7 +1680,6 @@
videoList.value.push(ob) videoList.value.push(ob)
}) })
} }
console.log('验证数据的准确性', videoList)
batchVisible.value = true batchVisible.value = true
} else { } else {
message.error('请选择需要预览的数据') message.error('请选择需要预览的数据')
@ -1750,7 +1712,6 @@
videoList.value.push(ob) videoList.value.push(ob)
}) })
} }
console.log('验证数据的准确性', videoList)
batchPicVisible.value = true batchPicVisible.value = true
} else { } else {
message.error('请选择需要预览的数据') message.error('请选择需要预览的数据')
@ -1778,8 +1739,6 @@
} }
const videoClean = () => { const videoClean = () => {
//视频预览弹窗关闭后不清除选中行 //视频预览弹窗关闭后不清除选中行
// selectedList.value = []
// selectedRowKeys.value = []
videoList.value = [] videoList.value = []
current.value = 1 current.value = 1
} }
@ -1787,11 +1746,8 @@
const changePage = (page) => {} const changePage = (page) => {}
// 一键申请 // 一键申请
const dept = reactive({}) const dept = reactive({})
// eslint-disable-next-line no-undef
if (infrastructure) { if (infrastructure) {
// eslint-disable-next-line no-undef
dept.deptId = infrastructure.deptId || '' dept.deptId = infrastructure.deptId || ''
// eslint-disable-next-line no-undef
dept.deptName = infrastructure.deptName || '' dept.deptName = infrastructure.deptName || ''
} }
@ -1809,7 +1765,6 @@
} }
const apply = async () => { const apply = async () => {
console.log('一键申请', selectedList.value)
if (selectedRowKeys.value.length != 0) { if (selectedRowKeys.value.length != 0) {
// 判断最大数量 // 判断最大数量
let maxNumRes = await judegNumber() let maxNumRes = await judegNumber()
@ -1831,6 +1786,7 @@
deptName: dept.deptName, deptName: dept.deptName,
}, },
] ]
console.log('一键申请', arr)
localStorage.setItem('applyList', JSON.stringify(arr)) localStorage.setItem('applyList', JSON.stringify(arr))
router.push({ router.push({
path: '/apply', path: '/apply',
@ -1851,30 +1807,27 @@
break break
} }
} }
// // 添加至购物车
// const addShopCar = () => {
// console.log('添加至购物车')
// }
const wrjFlag = ref(false) const wrjFlag = ref(false)
// 西海岸-视频资源loading
const loadingCamera = ref(false)
const getCamera = (flag, str) => { const getCamera = (flag, str) => {
console.log( loadingCamera.value = true;
'mapSearchParam.value.cameraName------------>',
mapSearchParam.value.cameraName
)
if (flag) { if (flag) {
mapSearchParam.value.cameraName = str mapSearchParam.value.cameraName = str
console.log('赋值===============》', str, mapSearchParam.value)
} }
console.log('初始化调用') console.log('初始化调用')
console.log('不选左侧树的时候不调用接口', mapSearchParam.value) console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
if (!whoShow1.value.itShowXiHaiAn) { if (!whoShow1.value.itShowXiHaiAn) {
getCameraByParentId(mapSearchParam.value).then((res) => { getCameraByParentId(mapSearchParam.value).then((res) => {
console.log('RRRRRRRRRR', res.data.data) console.log('res--查询摄像头---------->', res);
loadingCamera.value = false;
dataSource.value = res.data.data dataSource.value = res.data.data
pagination.value.total = res.data.count pagination.value.total = res.data.count
}).catch(err => {
loadingCamera.value = false;
message.error(err)
}) })
} else { } else {
console.log('mapSearchParam------------>', mapSearchParam)
let params = { let params = {
regionId: regionId:
mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051', mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@ -1911,9 +1864,13 @@
} }
} }
getCameraByCondition(params).then((res) => { getCameraByCondition(params).then((res) => {
console.log('res--查询摄像头---------->', res);
loadingCamera.value = false;
dataSource.value = res.data.data dataSource.value = res.data.data
pagination.value.total = res.data.count pagination.value.total = res.data.count
console.log('根据parent查询摄像头', res.data.data) }).catch(err => {
loadingCamera.value = false;
message.error(err)
}) })
} }
} }
@ -1931,9 +1888,7 @@
note1: [v], note1: [v],
}) })
}) })
console.log('_arr------------>', _arr);
sgcInsert(_arr).then((res) => { sgcInsert(_arr).then((res) => {
console.log('res------申购车------>', res);
if(res.data.code !== 0) { if(res.data.code !== 0) {
return message.error(res.data.msg) return message.error(res.data.msg)
} }
@ -2001,7 +1956,6 @@
align: 'center', align: 'center',
}, },
]) ])
// const allClick = ref([])
const onSelectChange = ( const onSelectChange = (
record, record,
selected, selected,
@ -2009,7 +1963,6 @@
nativeEvent, nativeEvent,
type type
) => { ) => {
console.log('hahhahah', record, selected, selectedRows, nativeEvent)
record = JSON.parse(JSON.stringify(record)) record = JSON.parse(JSON.stringify(record))
if (selected) { if (selected) {
if (selectedRowKeys.value.length == 1000) { if (selectedRowKeys.value.length == 1000) {
@ -2041,9 +1994,6 @@
if (selectedRowKeys.value.length > 1000) { if (selectedRowKeys.value.length > 1000) {
message.warning('最多只能添加1000个摄像头！') message.warning('最多只能添加1000个摄像头！')
changeRows.map((val) => { changeRows.map((val) => {
// selectedList.value = selectedList.value.filter(
// (item) => item.idtCameraChannel !== val.idtCameraChannel
// )
selectedList.value.forEach((ele, index) => { selectedList.value.forEach((ele, index) => {
if (ele.channelCode == record.channelCode) { if (ele.channelCode == record.channelCode) {
selectedList.value.splice(index, 1) selectedList.value.splice(index, 1)

853
front/src/views/newHome/components/CapabilityConvergence.vue
View File

@ -8,65 +8,40 @@
<div class="bottom"> <div class="bottom">
<div class="item"> <div class="item">
<div class="zj">组件服务</div> <div class="zj">组件服务</div>
<div <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
class="name" :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
v-for="(item, index) in zjList.slice(0, 5)"
:key="item.name"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne1(item.name)"
>
{{ item.name + '-' + item.num + '项' }} {{ item.name + '-' + item.num + '项' }}
</div> </div>
<div class="btn" @click="jumpPage('组件服务')">查看更多</div> <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
</div> </div>
<div class="item"> <div class="item">
<div class="yy">应用资源</div> <div class="yy">应用资源</div>
<div <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
class="name" :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
v-for="(item, index) in yyList.slice(0, 5)"
:key="item.name"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne11(item.name)"
>
{{ item.name + '-' + item.num + '项' }} {{ item.name + '-' + item.num + '项' }}
</div> </div>
<div class="btn" @click="jumpPage('应用资源')">查看更多</div> <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
</div> </div>
<div class="item"> <div class="item">
<div class="jc">基础设施</div> <div class="jc">基础设施</div>
<div <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
class="name" :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
v-for="(item, index) in jcList.slice(0, 5)"
:key="item.name"
:class="index == 2 ? 'name-last' : ''"
@click="selectOne2(item.name)"
>
{{ item.name + '-' + item.num + '项' }} {{ item.name + '-' + item.num + '项' }}
</div> </div>
<div class="btn" @click="jumpPage('基础设施')">查看更多</div> <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
</div> </div>
<div class="item"> <div class="item">
<div class="sj">数据资源</div> <div class="sj">数据资源</div>
<div <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
class="name" @click="selectOne3(item.name)">
v-for="(item, index) in sjList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne3(item.name)"
>
{{ index + 1 }}-{{ item.name }} {{ index + 1 }}-{{ item.name }}
</div> </div>
<div class="btn" @click="jumpPage('数据资源')">查看更多</div> <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
</div> </div>
<div class="item"> <div class="item">
<div class="zs">知识库</div> <div class="zs">知识库</div>
<div <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
class="name" @click="openHref(item)">
v-for="(item, index) in zsList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="openHref(item)"
>
{{ index + 1 }}-{{ item.name }} {{ index + 1 }}-{{ item.name }}
</div> </div>
<div class="btn" @click="jumpPage('知识库')">查看更多</div> <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@ -76,448 +51,424 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { import {
pageWithAttrs, pageWithAttrs,
getDataResource, getDataResource,
selectInfrastructureList, selectInfrastructureList,
selectCollectComponentList, selectCollectComponentList,
selectCollectResourceList selectCollectResourceList
} from '@/api/home.js' } from '@/api/home.js'
import { ref, reactive } from 'vue' import { ref, reactive } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { updateVisits, browsingInsert, getSoldierList } from '@/api/home' import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
import { message, Upload } from 'ant-design-vue' import { message, Upload } from 'ant-design-vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const zjList = ref([]) const zjList = ref([])
const jcList = ref([]) const jcList = ref([])
const sjList = ref([]) const sjList = ref([])
const yyList = ref([]) const yyList = ref([])
// 知识库模块数据 // 知识库模块数据
const zsList = ref([]) const zsList = ref([])
// const jcList = ref([]) // const jcList = ref([])
const paramsGetResources = { const paramsGetResources = {
districtId: '', districtId: '',
pageNum: 1, pageNum: 1,
pageSize: 5, pageSize: 5,
type: '', type: '',
name: '', name: '',
infoList: [], infoList: [],
orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量 orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量
orderType: 'DESC', // ASC 升序 DESC 降序 orderType: 'DESC', // ASC 升序 DESC 降序
} }
console.log('dataShowdev==========================>', whoShow) console.log('dataShowdev==========================>', whoShow)
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
const whoShow1 = ref(whoShow) const whoShow1 = ref(whoShow)
const interfaceSuccess = ref(0) const interfaceSuccess = ref(0)
const object = reactive({ const object = reactive({
yyNum: '', yyNum: '',
zjNum: '', zjNum: '',
jcNum: '', jcNum: '',
sjNum: '', sjNum: '',
zsNum: '', zsNum: '',
}) })
const getAppResources = (type, obj) => { const getAppResources = (type, obj) => {
paramsGetResources.type = type paramsGetResources.type = type
if (type === '数据资源' && !whoShow1.value.itShowBaoTou) { if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
getDataResource({ getDataResource({
serviceName: paramsGetResources.name || '', //资源名称 serviceName: paramsGetResources.name || '', //资源名称
orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段 orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
pageNum: paramsGetResources.pageNum, //页码 pageNum: paramsGetResources.pageNum, //页码
pageSize: paramsGetResources.pageSize, //分页大小 pageSize: paramsGetResources.pageSize, //分页大小
}).then((res) => { }).then((res) => {
console.log('数据资源==================>', res.data.data) console.log('数据资源==================>', res.data.data)
if (whoShow1.value.itShowQingDao) { if (whoShow1.value.itShowQingDao) {
res.data.data.data.forEach((val) => { res.data.data.data.forEach((val) => {
val.id = val.guid // id val.id = val.guid // id
val.name = val.zyname // 名字 val.name = val.zyname // 名字
val.sjlCount = val.sjcczl // 数据量 val.sjlCount = val.sjcczl // 数据量
val.applyCount = val.syqk // 申请量 val.applyCount = val.syqk // 申请量
val.deptName = val.TGBM // 部门 val.deptName = val.TGBM // 部门
val.createDate = val.fbrq // 发布时间 val.createDate = val.fbrq // 发布时间
val.description = val.xgxt // 描述 val.description = val.xgxt // 描述
}) })
obj.value = res.data.data.data || [] obj.value = res.data.data.data || []
object.sjNum = res.data.data.rows object.sjNum = res.data.data.rows
} else if (whoShow1.value.itShowXiHaiAn) { } else if (whoShow1.value.itShowXiHaiAn) {
res.data.data.list.forEach((val) => { res.data.data.list.forEach((val) => {
val.id = val.serviceId // id val.id = val.serviceId // id
val.name = val.serviceName // 名字 val.name = val.serviceName // 名字
val.sjlCount = val.requestQuantity // 数据量 val.sjlCount = val.requestQuantity // 数据量
val.applyCount = val.requestCount // 申请量 val.applyCount = val.requestCount // 申请量
val.deptName = val.departmentName // 部门 val.deptName = val.departmentName // 部门
val.createTime = val.createTime.split('.')[0] val.createTime = val.createTime.split('.')[0]
val.createDate = val.createTime // 发布时间 val.createDate = val.createTime // 发布时间
}) })
obj.value = res.data.data.list || [] obj.value = res.data.data.list || []
object.sjNum = res.data.data.total object.sjNum = res.data.data.total
} }
}) })
} else { } else {
let type = paramsGetResources.type let type = paramsGetResources.type
if (type == '基础设施') { if (type == '基础设施') {
jcList.value = [] jcList.value = []
selectInfrastructureList().then((res) => { selectInfrastructureList().then((res) => {
console.log('基础设施==========>', res.data.data) console.log('基础设施------res------>', res);
for (const key in res.data.data) { for (const key in res.data.data) {
if (whoShow1.value.itShowXiHaiAn) { if (whoShow1.value.itShowXiHaiAn) {
if (key === '视频资源') { if (key === '视频资源') {
jcList.value.push({
name: key,
num: res.data.data[key],
})
}
} else {
jcList.value.push({ jcList.value.push({
name: key, name: key,
num: res.data.data[key], num: res.data.data[key],
}) })
} }
} else {
jcList.value.push({
name: key,
num: res.data.data[key],
})
} }
// 西海岸-单兵设备、无人机 获取数量 }
if (whoShow1.value.itShowXiHaiAn) { // 西海岸-单兵设备、无人机 获取数量
getSoldierData('无人机') if (whoShow1.value.itShowXiHaiAn) {
.then((res) => { getSoldierData('无人机')
let { total = 0 } = res.data.data .then((res) => {
jcList.value.push({ let { total = 0 } = res.data.data
name: '无人机', jcList.value.push({
num: total, name: '无人机',
}) num: total,
}) })
.catch((err) => { })
console.log('err--无人机---------->', err) .catch((err) => {
console.log('err--无人机---------->', err)
})
getSoldierData('单兵设备')
.then((res) => {
let { total = 0 } = res.data.data
jcList.value.push({
name: '单兵设备',
num: total,
}) })
getSoldierData('单兵设备') })
.then((res) => { .catch((err) => {
let { total = 0 } = res.data.data console.log('err--单兵设备---------->', err)
jcList.value.push({ })
name: '单兵设备', }
num: total, })
}) }
}) else if (type == '组件服务') {
.catch((err) => { zjList.value = []
console.log('err--单兵设备---------->', err) selectCollectComponentList().then((res) => {
}) console.log('组件服务----res-------->', res);
} for (const key in res.data.data) {
}) console.log('key------------>', key);
} zjList.value.push({
else if (type == '组件服务') { name: key,
zjList.value = [] num: res.data.data[key],
selectCollectComponentList().then((res) => { })
for (const key in res.data.data) { }
if (whoShow1.value.itShowXiHaiAn) { console.log('zjList------------>', zjList);
if (key === '视频资源') { })
zjList.value.push({ }
name: key, else if (type == '应用资源') {
num: res.data.data[key], yyList.value = []
}) selectCollectResourceList().then((res) => {
} console.log('应用资源---res--------->', res);
} else { for (const key in res.data.data) {
zjList.value.push({ yyList.value.push({
name: key, name: key,
num: res.data.data[key], num: res.data.data[key],
}) })
} }
} })
}) }
} else {
else if (type == '应用资源') { pageWithAttrs(paramsGetResources).then((res) => {
yyList.value = [] console.log('object个数======>', type)
selectCollectResourceList().then((res) => { obj.value = res.data.data.records
for (const key in res.data.data) { switch (type) {
if (whoShow1.value.itShowXiHaiAn) { case '组件服务':
if (key === '视频资源') { assignmentMethod('zjNum', res)
yyList.value.push({ break
name: key, case '应用资源':
num: res.data.data[key], assignmentMethod('yyNum', res)
}) break
} case '基础设施':
} else { assignmentMethod('jcNum', res)
yyList.value.push({ break
name: key, case '知识库':
num: res.data.data[key], assignmentMethod('zsNum', res)
}) break
} }
}
})
}
else {
pageWithAttrs(paramsGetResources).then((res) => {
console.log('object个数======>', type)
obj.value = res.data.data.records
switch (type) {
case '组件服务':
assignmentMethod('zjNum', res)
break
case '应用资源':
assignmentMethod('yyNum', res)
break
case '基础设施':
assignmentMethod('jcNum', res)
break
case '知识库':
assignmentMethod('zsNum', res)
break
}
})
}
}
}
// todo 获取无人机、单兵设备
const getSoldierData = (name) => {
let _params = {
type: name,
page: 1,
limit: 10,
}
return new Promise((resolve, reject) => {
getSoldierList(_params)
.then((res) => {
resolve(res)
console.log('res---获取无人机、单兵设备--------->', res)
if (res.data.code !== 0) {
return message.error(res.data.msg)
}
})
.catch((err) => {
reject(err)
})
})
}
const openHref = (item) => {
console.log(item.id, 'wowowo')
console.log(item.visits, 'wowowo')
browsingInsert({ resourceId: item.id }).then((res) => {
// console.log(res)
})
const arrList = ref([])
arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
if (arrList.value.indexOf(item.id) === -1) {
arrList.value.push(item.id)
updateVisits({
id: item.id,
visits: item.visits || '0',
}).then(() => {
window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
}) })
} }
window.open(item.link)
// window.open(
// window.SITE_CONFIG.previewUrl +
// 'hisense_office/onlinePreview?url=' +
// btoa(encodeURI(item.fileHref))
// )
} }
const assignmentMethod = (type, res) => { }
object[type] = res.data.data.total
// interfaceSuccess.value++
// console.log('object个数======>', object, interfaceSuccess.value, type)
// if (interfaceSuccess.value >= 4) {
// mybus.emit('chagneNum', object)
// }
}
getAppResources('组件服务', zjList)
getAppResources('应用资源', yyList)
getAppResources('基础设施', jcList)
getAppResources('数据资源', sjList)
getAppResources('知识库', zsList)
function jumpPage(type) { // todo 获取无人机、单兵设备
// 点击内存入store const getSoldierData = (name) => {
store.commit('home/selectCardsData', { let _params = {
selectCardsnum: type, type: name,
}) page: 1,
console.log( limit: 10,
'选中===================>', }
store.getters['home/selectCardsnum'] return new Promise((resolve, reject) => {
) getSoldierList(_params)
// router.push({ path: '/DetailsPageconetent' }) .then((res) => {
router.push({ resolve(res)
path: '/DetailsPageconetent', console.log('res---获取无人机、单兵设备--------->', res)
query: { if (res.data.code !== 0) {
select: type, return message.error(res.data.msg)
}, }
}) })
} .catch((err) => {
const selectOne = (id) => { reject(err)
console.log('点击===============》', id) })
router.push({ })
path: '/details', }
query: {
id: id, const openHref = (item) => {
}, console.log(item.id, 'wowowo')
}) console.log(item.visits, 'wowowo')
} browsingInsert({ resourceId: item.id }).then((res) => {
const selectOne1 = (name) => { // console.log(res)
router.push({ })
path: '/DetailsPageconetent', const arrList = ref([])
query: { arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
type: name, if (arrList.value.indexOf(item.id) === -1) {
select: '组件服务', arrList.value.push(item.id)
}, updateVisits({
}) id: item.id,
} visits: item.visits || '0',
const selectOne11 = (name) => { }).then(() => {
router.push({ window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
path: '/DetailsPageconetent',
query: {
type: name,
select: '应用资源',
},
})
}
const selectOne2 = (name) => {
console.log('点击===============》', name)
router.push({
path: '/DetailsPageconetent',
query: {
type: name,
select: '基础设施',
},
})
}
const selectOne3 = (name) => {
console.log('点击===============》', name)
router.push({
path: '/DetailsPageconetent',
query: {
str: name,
select: '数据资源',
},
}) })
} }
window.open(item.link)
}
const assignmentMethod = (type, res) => {
object[type] = res.data.data.total
}
getAppResources('组件服务', zjList)
getAppResources('应用资源', yyList)
getAppResources('基础设施', jcList)
getAppResources('数据资源', sjList)
getAppResources('知识库', zsList)
function jumpPage(type) {
// 点击内存入store
store.commit('home/selectCardsData', {
selectCardsnum: type,
})
console.log(
'选中===================>',
store.getters['home/selectCardsnum']
)
// router.push({ path: '/DetailsPageconetent' })
router.push({
path: '/DetailsPageconetent',
query: {
select: type,
},
})
}
const selectOne = (id) => {
console.log('点击===============》', id)
router.push({
path: '/details',
query: {
id: id,
},
})
}
const selectOne1 = (name) => {
router.push({
path: '/DetailsPageconetent',
query: {
type: name,
select: '组件服务',
},
})
}
const selectOne11 = (name) => {
router.push({
path: '/DetailsPageconetent',
query: {
type: name,
select: '应用资源',
},
})
}
const selectOne2 = (name) => {
console.log('点击===============》', name)
router.push({
path: '/DetailsPageconetent',
query: {
type: name,
select: '基础设施',
},
})
}
const selectOne3 = (name) => {
console.log('点击===============》', name)
router.push({
path: '/DetailsPageconetent',
query: {
str: name,
select: '数据资源',
},
})
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.capability-convergence { .capability-convergence {
height: 7.2rem; height: 7.2rem;
background: url('~@/assets/newHome/Convergence-bg.png') no-repeat; background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
background-size: 100%; background-size: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
.main { .main {
width: 13rem; width: 13rem;
margin-top: 1.8rem; margin-top: 1.8rem;
display: flex;
flex-direction: column;
flex-wrap: wrap;
.top {
font-size: 0.3rem;
color: #212121;
text-align: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center;
align-items: center;
.top { .line {
font-size: 0.3rem; width: 0.34rem;
color: #212121; height: 0.03rem;
text-align: center; background-color: #0058e1;
display: flex; margin-top: 0.08rem;
flex-direction: column; }
flex-wrap: wrap; }
justify-content: center;
align-items: center;
.line { .bottom {
width: 0.34rem; display: flex;
height: 0.03rem; justify-content: space-between;
background-color: #0058e1; margin-top: 0.4rem;
margin-top: 0.08rem;
.item {
width: 2.44rem;
height: 3.91rem;
font-size: 0.16rem;
background-color: #fff;
border-radius: 0.02rem;
box-shadow: 0 0.05rem 0.2rem #ccc;
position: relative;
div:nth-of-type(1) {
height: 1.02rem;
line-height: 1.02rem;
font-size: 0.2rem;
color: #fff;
padding-left: 0.15rem;
background-size: 100%;
}
.jc {
background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
}
.sj {
background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
}
.zj {
background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
}
.yy {
background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
}
.zs {
background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
}
.name {
height: 0.47rem;
line-height: 0.47rem;
margin: 0 0.16rem;
border-bottom: 0.01rem solid #e9e9e9;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
.name:hover {
color: #0058e1;
cursor: pointer;
}
.name-last {
border-bottom: none;
}
.btn {
cursor: pointer;
width: 0.8rem;
height: 0.24rem;
border: 0.01rem solid #0058e1;
font-size: 0.14rem;
color: #0058e1;
border-radius: 0.02rem;
text-align: center;
margin-top: 0.1rem;
margin-left: 0.85rem;
position: absolute;
bottom: 0.2rem;
}
.btn:hover {
background: rgba(0, 88, 225, 0.3);
color: #000;
} }
} }
.bottom { .item:hover {
display: flex; border-radius: 0.02rem;
justify-content: space-between; border: 0.01rem solid #0058e1;
margin-top: 0.4rem; box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
.item {
width: 2.44rem;
height: 3.91rem;
font-size: 0.16rem;
background-color: #fff;
border-radius: 0.02rem;
box-shadow: 0 0.05rem 0.2rem #ccc;
position: relative;
div:nth-of-type(1) {
height: 1.02rem;
line-height: 1.02rem;
font-size: 0.2rem;
color: #fff;
padding-left: 0.15rem;
background-size: 100%;
}
.jc {
background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
}
.sj {
background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
}
.zj {
background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
}
.yy {
background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
}
.zs {
background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
}
.name {
height: 0.47rem;
line-height: 0.47rem;
margin: 0 0.16rem;
border-bottom: 0.01rem solid #e9e9e9;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
.name:hover {
color: #0058e1;
cursor: pointer;
}
.name-last {
border-bottom: none;
}
.btn {
cursor: pointer;
width: 0.8rem;
height: 0.24rem;
border: 0.01rem solid #0058e1;
font-size: 0.14rem;
color: #0058e1;
border-radius: 0.02rem;
text-align: center;
margin-top: 0.1rem;
margin-left: 0.85rem;
position: absolute;
bottom: 0.2rem;
}
.btn:hover {
background: rgba(0, 88, 225, 0.3);
color: #000;
}
}
.item:hover {
border-radius: 0.02rem;
border: 0.01rem solid #0058e1;
box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
}
} }
} }
} }
}
</style> </style>