diff --git a/.gitignore b/.gitignore index b1d42a94..3521ee6e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ back/dist-西海岸-后台管理.zip back/public/index.html back/dist-西海岸-后台管理-带配置文件.zip back/dist-市局-后台管理-带配置文件.zip +back/dist-包头-后台管理.zip +back/dist-市局-后台管理.zip diff --git a/back/public/index.html b/back/public/index.html index 59ed843e..eb19bbb6 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -27,10 +27,10 @@ '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://10.134.135.9:9797/#/vueTemplateDemo'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表（后台返回，未做处理） window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限（后台返回，未做处理） window.SITE_CONFIG['dynamicRoutes'] = []; // 动态路由列表 @@ -42,7 +42,8 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> diff --git a/back/src/assets/img/TOP5.png b/back/src/assets/img/TOP5.png new file mode 100644 index 00000000..e43592f2 Binary files /dev/null and b/back/src/assets/img/TOP5.png differ diff --git a/back/src/assets/img/imgLeft.png b/back/src/assets/img/imgLeft.png new file mode 100644 index 00000000..bda88ff9 Binary files /dev/null and b/back/src/assets/img/imgLeft.png differ diff --git a/back/src/components/ren-process-detail/src/ren-process-detail-import.vue b/back/src/components/ren-process-detail/src/ren-process-detail-import.vue new file mode 100644 index 00000000..2355a143 --- /dev/null +++ b/back/src/components/ren-process-detail/src/ren-process-detail-import.vue @@ -0,0 +1,97 @@ + + + + + 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/front/public/index.html b/front/public/index.html index 0c666626..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-21 17:21:23 + * @LastEditTime: 2022-06-23 14:37:03 * @Description: 告诉大家这是什么 --> @@ -32,11 +32,12 @@ // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/'; // 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://15.72.183.90:8001'; - window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/'; - 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.134.135.9:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; @@ -48,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 f4ff914d..b8618151 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,19 +1,21 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-22 16:18:47 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-23 17:55:06 * @Description: 数据资源参数配置 */ -// const newLocation = 'qingdao' -// const newLocation = 'baotou' const newLocation = 'qingdao' +// 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') { @@ -80,21 +121,21 @@ else if (newLocation === 'baotou') { ] footerDataList.footerList = { company: { - left: '青岛西海岸新区大数据发展促进局建设', - right: 'v0.81', + left: '包头市工业和信息化局大数据中心建设', + right: '海信网络科技股份有限公司', }, address: [ { - name: '鲁IC备00000000号', - value: '政府标识码3702000106', + name: '蒙ICP备05003330-1号', + value: '政府标识码1502000040', }, { - name: '版权所有：青岛西海岸新区大数据发展促进局', - value: '地址：青岛市西海岸新区长江中路369号', + name: '版权所有：包头市工业和信息化局大数据中心', + value: '地址：内蒙古自治区包头市九原区开元大街1号', }, { - name: '电话：0532-86986596', - value: '传真：0532-86986596', + name: '电话：0472-5618235', + value: '传真：0472-5618235', }, ], } 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/api/home.js b/front/src/api/home.js index aa979e96..6f560eb9 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-22 15:27:36 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-06-22 18:59:03 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -62,7 +62,14 @@ export function pageWithAttrs(data) { data, }) } - +// 获取hls视频流 +export function getHls(params) { + return request({ + url: '/resource/hls/getHls', + method: 'get', + params, + }) +} // 加入申购车 export function sgcInsert(data) { 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 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/abilityStatistics/index.vue b/front/src/views/abilityStatistics/index.vue index 4c81d746..9d48cd94 100644 --- a/front/src/views/abilityStatistics/index.vue +++ b/front/src/views/abilityStatistics/index.vue @@ -1,3 +1,10 @@ +