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') { %> diff --git a/back/src/views/modules/abilityStatistics/applicationResources.vue b/back/src/views/modules/abilityStatistics/applicationResources.vue new file mode 100644 index 00000000..a44f8bb8 --- /dev/null +++ b/back/src/views/modules/abilityStatistics/applicationResources.vue @@ -0,0 +1,110 @@ + + \ No newline at end of file diff --git a/back/src/views/modules/abilityStatistics/componentServices.vue b/back/src/views/modules/abilityStatistics/componentServices.vue new file mode 100644 index 00000000..2ab65dfb --- /dev/null +++ b/back/src/views/modules/abilityStatistics/componentServices.vue @@ -0,0 +1,358 @@ + + + \ 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/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue index 94acd632..e17e29db 100644 --- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue +++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue @@ -1,106 +1,134 @@ + diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue b/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue new file mode 100644 index 00000000..17fec47b --- /dev/null +++ b/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue @@ -0,0 +1,175 @@ + + + + diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue new file mode 100644 index 00000000..dc18fb61 --- /dev/null +++ b/back/src/views/modules/activiti/demo/comments.vue @@ -0,0 +1,114 @@ + + + + diff --git a/back/src/views/modules/activiti/my-todo-task.vue b/back/src/views/modules/activiti/my-todo-task.vue index 29bff2c0..d9c0482b 100644 --- a/back/src/views/modules/activiti/my-todo-task.vue +++ b/back/src/views/modules/activiti/my-todo-task.vue @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-27 19:34:30 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-04-28 19:26:07 + * @LastEditTime: 2022-06-23 21:08:01 * @Description: 告诉大家这是什么 --> @@ -62,7 +63,8 @@ (scope.row.params && scope.row.params.resourceDTO && scope.row.params.resourceDTO.name) || - (scope.row.params && scope.row.params.undercarriageReason) + (scope.row.params && scope.row.params.undercarriageReason)|| + (scope.row.params && scope.row.params.comment) }} @@ -126,41 +128,42 @@ diff --git a/back/src/views/modules/project/use.vue b/back/src/views/modules/project/use.vue index 499f0480..2c482148 100644 --- a/back/src/views/modules/project/use.vue +++ b/back/src/views/modules/project/use.vue @@ -11,7 +11,7 @@ @@ -29,26 +29,26 @@ align="center" > diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index cf3fbae5..b8618151 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-23 14:17:52 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-23 17:55:06 * @Description: 数据资源参数配置 */ const newLocation = 'qingdao' @@ -14,6 +14,8 @@ 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/api/demandCenter.js b/front/src/api/demandCenter.js index 21fdb8fb..75d5dd37 100644 --- a/front/src/api/demandCenter.js +++ b/front/src/api/demandCenter.js @@ -1,3 +1,10 @@ +/* + * @Author: hisense.wuhongjian + * @Date: 2022-06-14 09:43:30 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-23 20:04:39 + * @Description: 告诉大家这是什么 + */ import request from '@/utils/request' export function demandComment(data) { @@ -7,6 +14,13 @@ export function demandComment(data) { data, }) } +export function demandCommentApply(data) { + return request({ + url: '/comment/center/apply', + method: 'post', + data, + }) +} export function demandCommentPage(params) { return request({ diff --git a/front/src/assets/home/remove-hover.png b/front/src/assets/home/remove-hover.png new file mode 100644 index 00000000..9152216b Binary files /dev/null and b/front/src/assets/home/remove-hover.png differ diff --git a/front/src/assets/home/remove.png b/front/src/assets/home/remove.png new file mode 100644 index 00000000..87b146ba Binary files /dev/null and b/front/src/assets/home/remove.png differ diff --git a/front/src/utils/request.js b/front/src/utils/request.js index b9b36c15..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) { @@ -149,7 +173,9 @@ instance.interceptors.response.use( } } console.log('已清除') - location.reload() + setTimeout(() => { + location.reload() + }, 1000) } if (response.headers.redirect) { window.location.href = response.headers.redirect 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/assignCase/components/AssignCaseDetailPage.vue b/front/src/views/assignCase/components/AssignCaseDetailPage.vue index 577a47d1..795b597c 100644 --- a/front/src/views/assignCase/components/AssignCaseDetailPage.vue +++ b/front/src/views/assignCase/components/AssignCaseDetailPage.vue @@ -41,9 +41,12 @@ :key="index" @click="tabSwitch(item, index)" :class=" - tabName == item.attrType + (tabName == item.attrType ? 'assign-case-detail-page-content-left-border-click' - : '' + : '') || + (selectNow == item.id + ? 'assign-case-detail-page-content-left-border-click' + : '') " > {{ item.attrType }} @@ -175,7 +178,7 @@ ) //tab点击事件 const tabSwitch = (item, index) => { - tabName.value = item.title + tabName.value = item.attrType if (index != 0 && index != 3) { let top = document.querySelector( diff --git a/front/src/views/assignCase/components/queryPage.vue b/front/src/views/assignCase/components/queryPage.vue index dab439ec..8345faeb 100644 --- a/front/src/views/assignCase/components/queryPage.vue +++ b/front/src/views/assignCase/components/queryPage.vue @@ -168,6 +168,7 @@ tabClickShow.value = true } else { let list = [] + listBg.value = '' init(list) tabClickShow.value = false } diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index 56dada22..cbf6ca70 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -186,15 +186,14 @@