diff --git a/back/public/index.html b/back/public/index.html index b48dcb0f..eb19bbb6 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -27,9 +27,9 @@ 'isTab': true, // 是否通过tab展示内容? 'iframeURL': '' // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配) }; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; + window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo'; - window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表（后台返回，未做处理） window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限（后台返回，未做处理） @@ -42,7 +42,8 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> + \ No newline at end of file diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue new file mode 100644 index 00000000..5d4a90f1 --- /dev/null +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -0,0 +1,250 @@ + + + diff --git a/front/public/index.html b/front/public/index.html index 3ccfd971..feceaf8f 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-22 18:46:16 + * @LastEditTime: 2022-06-23 14:37:03 * @Description: 告诉大家这是什么 --> @@ -33,10 +33,10 @@ // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/'; // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; // 包头 - window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001'; - window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; - window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin'; + // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001'; + // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin'; // 西海岸版本 // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; @@ -49,10 +49,10 @@ // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; // 穿透版本 - // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; + window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 9dbe439d..b8618151 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,18 +2,20 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-22 18:46:24 + * @LastEditTime: 2022-06-23 17:55:06 * @Description: 数据资源参数配置 */ -// const newLocation = 'qingdao' +const newLocation = 'qingdao' // const newLocation = 'baotou' -const newLocation = 'baotou' +// const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} const launchedDataNumObject = {} // 导航数据 const navListManagement = {} +// 区市站点数据 +const mapTestNum = {} // 底部数据 const footerDataList = {} // qingdao @@ -51,6 +53,45 @@ if (newLocation === 'qingdao') { }, ], } + mapTestNum.lsNum = [ + { + name: '基础设施', + key: 'lsjcss', + num: 20135, + }, + { + name: '数据资源', + key: 'lsjcss', + num: 857, + }, + { + name: '应用资源', + key: 'lsjcss', + num: 28, + }, + ] + mapTestNum.xhaNum = [ + { + name: '基础设施', + key: 'xhajcss', + num: 35282, + }, + { + name: '数据资源', + key: 'xhajcss', + num: 11, + }, + { + name: '应用资源', + key: 'xhajcss', + num: 23, + }, + { + name: '组件服务', + key: 'xhazjfw', + num: 8, + }, + ] } // baotou else if (newLocation === 'baotou') { diff --git a/front/src/utils/request.js b/front/src/utils/request.js index a939dd25..0ab87260 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -90,6 +90,30 @@ instance.interceptors.response.use( console.log('接口返回', response) console.log('接口返回headers', response.headers) console.log('接口返回REDIRECT', response.headers.redirect) + + if (response.headers.redirect === '/#/login') { + var keys = document.cookie.match(/[^ =;]+(?=\=)/g) + if (keys) { + for (var i = keys.length; i--; ) { + document.cookie = + keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com + document.cookie = + keys[i] + + '=0;path=/;domain=' + + document.domain + + ';expires=' + + new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com + document.cookie = + keys[i] + + '=0;path=/;domain=kevis.com;expires=' + + new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com + } + } + console.log('已清除') + setTimeout(() => { + location.reload() + }, 1000) + } response['Access-Control-Expose-Headers'] = 'redirect' const { code, message } = response.data if (response.headers.token) { @@ -129,7 +153,30 @@ instance.interceptors.response.use( if (error.response && error.response.data) { console.log('接口返回', response) console.log('接口返回headers', response.headers) - console.log('接口返回REDIRECT', response.headers.redirect) + console.log('接口返回REDIRECT1111', response.headers.redirect) + if (response.headers.redirect === '/#/login') { + var keys = document.cookie.match(/[^ =;]+(?=\=)/g) + if (keys) { + for (var i = keys.length; i--; ) { + document.cookie = + keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com + document.cookie = + keys[i] + + '=0;path=/;domain=' + + document.domain + + ';expires=' + + new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com + document.cookie = + keys[i] + + '=0;path=/;domain=kevis.com;expires=' + + new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com + } + } + console.log('已清除') + setTimeout(() => { + location.reload() + }, 1000) + } if (response.headers.redirect) { window.location.href = response.headers.redirect return Promise.reject(error) diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 12e7f225..3fdf4885 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -89,7 +89,7 @@ dataList.value.dataList = res.data.data res.data.data.map((item, index) => { if (dataList.value.dataList[index].type === '数据资源') { - dataList.value.dataList[index].amount = dataSourceNum.value || 10433 + dataList.value.dataList[index].amount = dataSourceNum.value || 0 } dataList.value.dataList[index].organization = '个' dataList.value.dataList[index].photo = photo.value[index] diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 1c2d79ec..7d58846a 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -544,7 +544,6 @@ - -->
diff --git a/front/src/views/home/mapTest/index.vue b/front/src/views/home/mapTest/index.vue index c1352872..73300ce4 100644 --- a/front/src/views/home/mapTest/index.vue +++ b/front/src/views/home/mapTest/index.vue @@ -2,7 +2,7 @@
-
+
西海岸 @@ -11,12 +11,12 @@
-
- 基础设施 +
+ {{ item.name }} - 35282 + {{ item.num }}
-
+
-
+
崂山区 @@ -43,7 +43,12 @@
-
+
+ {{ item.name }} + + {{ item.num }} +
+
@@ -73,6 +78,15 @@ const echarts = require('echarts') const xhaFlag = ref(false) const lsqFlag = ref(false) + const lsList = ref([]) + const xhaList = ref([]) + // eslint-disable-next-line no-undef + const mapTestNum1 = mapTestNum + if (mapTestNum1) { + lsList.value = mapTestNum1.lsNum + xhaList.value = mapTestNum1.xhaNum + } + console.log('===============>', mapTestNum1) const areaMenuList = ref([ // 全市概况 // { diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue index 3a02c403..ff34baec 100644 --- a/front/src/views/newHome/components/CapabilityConvergence.vue +++ b/front/src/views/newHome/components/CapabilityConvergence.vue @@ -34,24 +34,28 @@
基础设施
-
1-J1-党建展示区走廊-北向
-
2-J2-党建数据中心机房
-
3-J3-党建展示区走廊-南向
-
4-J4-党建大厅电动门
-
5-J5-指挥席位东北向
+
+ {{ index + 1 }}-{{ item.name }} +
查看更多
数据资源
-
1-扬尘数据接口
-
2-根据证件号码查询全员核酸检测信息(人社专用)
-
- 3-根据身份证号、姓名、开始日期、结束日期获取医保住院结算信息（市人社局专用） +
+ {{ index + 1 }}-{{ item.name }}
-
- 4-根据身份证号、姓名、年度查询医保参保缴费信息（市委组织部专用） -
-
5-"金种子"人才培养经费查询API
查看更多
@@ -72,13 +76,15 @@