From 70bb06cba602f488bb29a0a2d520b85e6ea835d1 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Wed, 12 Oct 2022 09:50:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9token=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 6 +-- front/public/static/config/basicConfig.js | 8 ++-- front/src/store/modules/user.js | 15 +++---- front/src/utils/request.js | 50 ++++++++--------------- front/src/vab/plugins/permissions.js | 7 ++-- 5 files changed, 37 insertions(+), 49 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 37616e9b..00261cd2 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -2,16 +2,16 @@ * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-27 14:25:39 + * @LastEditTime: 2022-10-12 09:06:24 * @Description: 告诉大家这是什么 */ var _global = {} var CONFIGITEM = { - version: 'qingdao', // 青岛 + // version: 'qingdao', // 青岛 // version: 'xihaian', // 西海岸 // version: 'test', // 测试 // version: 'frp', // 内网穿透 - // version: 'dev', // 开发 + version: 'dev', // 开发 vNum: 'v0.8.7.2', configData: { // 青岛市大数据局 diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index ea1f9e0d..5072b016 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -1,15 +1,15 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-09-19 09:36:49 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-10-11 10:46:03 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', //青岛 - version: 'xihaian', // 西海岸 - // version: 'dev', // 开发 + //version: 'xihaian', // 西海岸 + version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) //version: 'test', // 测试 //version: 'frp', // 内网穿透 diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js index 08a7e1db..949868d6 100644 --- a/front/src/store/modules/user.js +++ b/front/src/store/modules/user.js @@ -53,7 +53,7 @@ const mutations = { * @param {*} state * @param {*} username */ - setRealname(state, realName) { + setRealname(state, realName) { state.realName = realName }, // 设置角色 @@ -126,16 +126,16 @@ const actions = { * @returns */ async getUserInfo({ commit }) { - const { data } = await getUserInfo() - if (!data) { + const res = await getUserInfo() + if (!res || !res.data) { message.error(`验证失败，请重新登录...`) return false } // debugger - commit('setUsername', data.data.username) - commit('setRealname', data.data.realName) - commit('setRole', data.data.roleIdList.length) - commit('setUserId', data.data.id) + commit('setUsername', res.data.data.username) + commit('setRealname', res.data.data.realName) + commit('setRole', res.data.data.roleIdList.length) + commit('setUserId', res.data.data.id) // TODO 获取用户信息，后续执行部分操作 // let { username, avatar, roles, ability } = data // if (username && roles && Array.isArray(roles)) { @@ -168,6 +168,7 @@ const actions = { * @param {*} { commit, dispatch } */ async resetAll({ dispatch }) { + debugger await dispatch('setAccessToken', '') await dispatch('acl/setFull', false, { root: true, diff --git a/front/src/utils/request.js b/front/src/utils/request.js index 4721f5c7..03239f01 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -11,14 +11,8 @@ import store from '@/store' import qs from 'qs' import router from '@/router' // import { isArray } from '@/utils/validate' -import { - message -} from 'ant-design-vue' -import { - getAccessToken, - setAccessToken -} from '@/utils/accessToken' - +import { message } from 'ant-design-vue' +import { getAccessToken, setAccessToken } from '@/utils/accessToken' let loadingInstance @@ -33,12 +27,14 @@ const handleCode = (code, msg, res) => { switch (code) { case 401: debugger - store.dispatch('user/resetAll').catch(() => { }) + store.dispatch('user/resetAll').catch(() => {}) break case 403: - router.push({ - path: '/401' - }).catch(() => { }) + router + .push({ + path: '/401', + }) + .catch(() => {}) break case 500: message.error(msg || '接口异常') @@ -76,7 +72,7 @@ instance.interceptors.request.use( if ( config.data && 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) if (debounce.some((item) => config.url.includes(item))) { @@ -103,17 +99,14 @@ instance.interceptors.response.use( console.log('接口返回headers', response.headers) console.log('接口返回REDIRECT', response.headers.redirect) response['Access-Control-Expose-Headers'] = 'redirect' - const { - code, - message - } = response.data + const { code, message } = response.data if (response.headers.token) { setAccessToken(response.headers.token) } if (response.headers.redirect) { - const _old_href = window.location.href.split('#')[0]; - const _new_href = response.headers.redirect.split('#')[0]; + const _old_href = window.location.href.split('#')[0] + const _new_href = response.headers.redirect.split('#')[0] window.location.replace(response.headers.redirect) // url 相同，强制刷新 if (_old_href === _new_href) { @@ -124,7 +117,7 @@ instance.interceptors.response.use( if (response.headers.redirect === '/#/login') { var keys = document.cookie.match(/[^ =;]+(?=\=)/g) if (keys) { - for (var i = keys.length; i--;) { + for (var i = keys.length; i--; ) { document.cookie = keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com document.cookie = @@ -168,14 +161,14 @@ instance.interceptors.response.use( console.log('接口error', error) if (loadingInstance) loadingInstance.close() - const { - response, - message - } = error + const { response, message } = error if (error.response) { console.log('接口返回', response) console.log('接口返回headers', response.headers) console.log('接口返回REDIRECT', response.headers.redirect) + const { status, data } = response + + handleCode(status, data.msg || message, response.headers.redirect) if (response.headers.token) { setAccessToken(response.headers.token) } @@ -183,17 +176,10 @@ instance.interceptors.response.use( window.location.replace(response.headers.redirect) return Promise.resolve() } - const { - status, - data - } = response - handleCode(status, data.msg || message, response.headers.redirect) return Promise.reject(error) } else { - let { - message - } = error + let { message } = error if (message === 'Network Error') { message = '后端接口连接异常' } diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js index 1cd6fbd4..4c197d7c 100644 --- a/front/src/vab/plugins/permissions.js +++ b/front/src/vab/plugins/permissions.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-01 17:23:11 - * @LastEditors: Light - * @LastEditTime: 2022-10-10 16:43:58 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-10-11 13:59:18 * @Description: 告诉大家这是什么 */ /** @@ -26,7 +26,7 @@ router.beforeEach(async (to, from, next) => { // if (SSOTOKEN) { // setAccessToken(SSOTOKEN) // } - + console.log('验证白名单', routesWhiteList) const token = getAccessToken() console.log('token', token) let hasToken = token @@ -45,6 +45,7 @@ router.beforeEach(async (to, from, next) => { router.addRoute(item) }) if (routesWhiteList.indexOf(to.path) !== -1) { + debugger next() } else { // 这里是一个单点登录的入口 From 66df6d8c76799ba2afbcdd0b908120c02c0caf26 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 12 Oct 2022 10:04:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B4=A6=E5=8F=B7=20=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/header.vue | 917 +++++++++++---------- 1 file changed, 482 insertions(+), 435 deletions(-) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 5ae0e50e..d0d82917 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -1,8 +1,11 @@ From 140ff7f92c5259158d81084cf9f0cd2611f2e1e5 Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 11:51:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8--=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD-=E6=91=84=E5=83=8F=E5=A4=B4?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=9A=E5=A2=9E=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 92 +++++---------------- 1 file changed, 21 insertions(+), 71 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index e38455bc..5fa40442 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -330,7 +330,6 @@ - {{ pagination.total || 0 }} 个

-

已选 {{ selectedRowKeys.length }} @@ -425,7 +423,6 @@

-
@@ -566,19 +551,19 @@ >
-
+
-
-
+
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
-
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
@@ -843,13 +828,6 @@ }, ], 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: [ { required: true, @@ -948,7 +926,6 @@ dataSource.value = param.dataSource pagination.value.total = param.total - // getCamera() }) //点位点击 mybus.off('pointMarkerClick') @@ -1004,10 +981,6 @@ { arr: [ { - // description: - // '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。', - // resourceId: 'dbsb', - // type: '单兵设备', description: data.description, resourceId: data.id, resourceName: data.wrjName, @@ -1444,14 +1417,6 @@ pagination.value.total = 0 selectType.value = '感知资源' } 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.indexOf(name), @@ -1491,12 +1456,10 @@ mapSearchParam.value.labelCodes.push(item.labelCode) }) } - // todo mapSearchParam.value.gpsX = '' mapSearchParam.value.gpsY = '' mapSearchParam.value.radius = '' mapSearchParam.value.type = '' - console.log('mapSearchParam----->查询条件', mapSearchParam.value) mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' emits('add', 1) getCamera() @@ -1717,7 +1680,6 @@ videoList.value.push(ob) }) } - console.log('验证数据的准确性', videoList) batchVisible.value = true } else { message.error('请选择需要预览的数据') @@ -1750,7 +1712,6 @@ videoList.value.push(ob) }) } - console.log('验证数据的准确性', videoList) batchPicVisible.value = true } else { message.error('请选择需要预览的数据') @@ -1778,8 +1739,6 @@ } const videoClean = () => { //视频预览弹窗关闭后不清除选中行 - // selectedList.value = [] - // selectedRowKeys.value = [] videoList.value = [] current.value = 1 } @@ -1787,11 +1746,8 @@ const changePage = (page) => {} // 一键申请 const dept = reactive({}) - // eslint-disable-next-line no-undef if (infrastructure) { - // eslint-disable-next-line no-undef dept.deptId = infrastructure.deptId || '' - // eslint-disable-next-line no-undef dept.deptName = infrastructure.deptName || '' } @@ -1809,7 +1765,6 @@ } const apply = async () => { - console.log('一键申请', selectedList.value) if (selectedRowKeys.value.length != 0) { // 判断最大数量 let maxNumRes = await judegNumber() @@ -1831,6 +1786,7 @@ deptName: dept.deptName, }, ] + console.log('一键申请', arr) localStorage.setItem('applyList', JSON.stringify(arr)) router.push({ path: '/apply', @@ -1851,30 +1807,27 @@ break } } - // // 添加至购物车 - // const addShopCar = () => { - // console.log('添加至购物车') - // } const wrjFlag = ref(false) + // 西海岸-视频资源loading + const loadingCamera = ref(false) const getCamera = (flag, str) => { - console.log( - 'mapSearchParam.value.cameraName------------>', - mapSearchParam.value.cameraName - ) + loadingCamera.value = true; if (flag) { mapSearchParam.value.cameraName = str - console.log('赋值===============》', str, mapSearchParam.value) } console.log('初始化调用') console.log('不选左侧树的时候不调用接口', mapSearchParam.value) if (!whoShow1.value.itShowXiHaiAn) { getCameraByParentId(mapSearchParam.value).then((res) => { - console.log('RRRRRRRRRR', res.data.data) + console.log('res--查询摄像头---------->', res); + loadingCamera.value = false; dataSource.value = res.data.data pagination.value.total = res.data.count + }).catch(err => { + loadingCamera.value = false; + message.error(err) }) } else { - console.log('mapSearchParam------------>', mapSearchParam) let params = { regionId: mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051', @@ -1911,9 +1864,13 @@ } } getCameraByCondition(params).then((res) => { + console.log('res--查询摄像头---------->', res); + loadingCamera.value = false; dataSource.value = res.data.data 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], }) }) - console.log('_arr------------>', _arr); sgcInsert(_arr).then((res) => { - console.log('res------申购车------>', res); if(res.data.code !== 0) { return message.error(res.data.msg) } @@ -2001,7 +1956,6 @@ align: 'center', }, ]) - // const allClick = ref([]) const onSelectChange = ( record, selected, @@ -2009,7 +1963,6 @@ nativeEvent, type ) => { - console.log('hahhahah', record, selected, selectedRows, nativeEvent) record = JSON.parse(JSON.stringify(record)) if (selected) { if (selectedRowKeys.value.length == 1000) { @@ -2041,9 +1994,6 @@ if (selectedRowKeys.value.length > 1000) { message.warning('最多只能添加1000个摄像头！') changeRows.map((val) => { - // selectedList.value = selectedList.value.filter( - // (item) => item.idtCameraChannel !== val.idtCameraChannel - // ) selectedList.value.forEach((ele, index) => { if (ele.channelCode == record.channelCode) { selectedList.value.splice(index, 1) From edf1cb5af90c1ecf1cf088028b1ce19f7013b8f5 Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 11:52:32 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5--=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E6=B1=87=E8=81=9A=E6=98=BE=E7=A4=BA=E9=94=99=E4=B9=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CapabilityConvergence.vue | 853 +++++++++--------- 1 file changed, 402 insertions(+), 451 deletions(-) diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue index 57554491..494e4f02 100644 --- a/front/src/views/newHome/components/CapabilityConvergence.vue +++ b/front/src/views/newHome/components/CapabilityConvergence.vue @@ -8,65 +8,40 @@
组件服务
-
+
{{ item.name + '-' + item.num + '项' }}
查看更多
应用资源
-
+
{{ item.name + '-' + item.num + '项' }}
查看更多
基础设施
-
+
{{ item.name + '-' + item.num + '项' }}
查看更多
数据资源
-
+
{{ index + 1 }}-{{ item.name }}
查看更多
知识库
-
+
{{ index + 1 }}-{{ item.name }}
查看更多
@@ -76,448 +51,424 @@
From 61592ceaea54884c417880d2f2420c3165e4acb2 Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 11:52:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/DetailsPageconetent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index eff61da6..b8fcc4c9 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1085,7 +1085,7 @@ export default defineComponent({ // 青岛-数据处理 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.id = val.guid // id val.name = val.zyname // 名字 @@ -1101,7 +1101,7 @@ export default defineComponent({ } // 青岛-西海岸处理 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.id = val.serviceId // id val.name = val.serviceName // 名字 From 6f1550734ddd93b2400065593d9126685aa466db Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 11:53:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B8=82=E5=B1=80=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 37616e9b..60961374 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -7,8 +7,8 @@ */ var _global = {} var CONFIGITEM = { - version: 'qingdao', // 青岛 - // version: 'xihaian', // 西海岸 + // version: 'qingdao', // 青岛 + version: 'xihaian', // 西海岸 // version: 'test', // 测试 // version: 'frp', // 内网穿透 // version: 'dev', // 开发 @@ -24,7 +24,8 @@ var CONFIGITEM = { xihaian: { previewUrl: 'http://10.134.135.9:9796/', // 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' }, // 测试