From a6ab3b9194e1f761ee9dce236d3805df501a4baf Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Thu, 13 Oct 2022 18:01:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abilityStatistics/components/SharingSituation.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue index c49277ad..fa70bfe6 100644 --- a/front/src/views/abilityStatistics/components/SharingSituation.vue +++ b/front/src/views/abilityStatistics/components/SharingSituation.vue @@ -187,6 +187,7 @@ require('../../../assets/abilityStatistics/zujianfuwu-bg.png'), require('../../../assets/abilityStatistics/shujuziyuan-bg.png'), require('../../../assets/abilityStatistics/jichujianshe-bg.png'), + require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'), ]) let photo = ref([ require('../../../assets/abilityStatistics/yingyongziyuan.png'), @@ -194,12 +195,13 @@ require('../../../assets/abilityStatistics/zujianfuwu.png'), require('../../../assets/abilityStatistics/shujuziyuan.png'), require('../../../assets/abilityStatistics/jichujianshe.png'), + require('../../../assets/abilityStatistics/yingyongziyuan.png'), ]) //申请量接口 let dataLists = ref([]) const myApplyAmount = () => { applyAmount().then((res) => { - // dataLists.value = res.data.data + dataLists.value = res.data.data res.data.data.map((item) => { switch (item.type) { case '应用资源': @@ -217,6 +219,9 @@ case '智能算法': dataLists.value[4] = item break + case '会客厅': + dataLists.value[5] = item + break default: dataLists.value.push(item) break From 0c83991e6c2f8ff945ced5290706c16fc1736511 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 13 Oct 2022 18:08:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= 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 | 6 +++--- .../abilityStatistics/components/AbilityTotal.vue | 14 +++++++++++++- front/src/views/home/integrationServices.vue | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 8f8c94c0..913ffc94 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -2,14 +2,14 @@ * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 14:49:32 + * @LastEditTime: 2022-10-13 16:46:41 * @Description: 告诉大家这是什么 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', // 青岛 // version: 'xihaian', // 西海岸 - version: 'test', // 测试 + version: 'dev', // 测试 // version: 'frp', // 内网穿透 // version: 'xihaian', // 开发 vNum: 'v0.8.7.2', @@ -43,7 +43,7 @@ var CONFIGITEM = { }, dev: { previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.236:8888/renren-admin', + apiURL: 'http://192.168.124.233:8888/renren-admin', websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket' } } diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 4e0eaedd..98ece7ec 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 13:50:44 + * @LastEditTime: 2022-10-13 16:47:03 * @Description: 系统静态参数配置 */ var _global = {} @@ -11,7 +11,7 @@ var CONFIGITEM = { // version: 'xihaian', // 西海岸 // version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - version: 'test', // 测试 + version: 'dev', // 测试 //version: 'frp', // 内网穿透 vNum: 'v0.8.7.2', configData: { @@ -86,7 +86,7 @@ var CONFIGITEM = { }, backUrl: 'http://localhost:8001', previewUrl: 'http://192.168.124.236:9796/', - websocketURL: '192.168.124.236:8888/renren-admin', + websocketURL: '192.168.124.233:8888/renren-admin', // websocketURL: '10.18.1.99:8889/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', diff --git a/front/src/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue index 9c26c740..66dfc5bd 100644 --- a/front/src/views/abilityStatistics/components/AbilityTotal.vue +++ b/front/src/views/abilityStatistics/components/AbilityTotal.vue @@ -25,7 +25,19 @@ " > - + + + 482 + + {{ item.amount }} diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 92a04545..4e7370c2 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -148,7 +148,7 @@ // 读取本地存储：表单赋值 const handleSetSearchData = () => { if (storageSearchInfo) { - number.value = storageSearchInfo.type == '打包模式' ? 1 : 0 + number.value = storageSearchInfo.type == '打包模式' ? 0 : 1 // 搜索名称 searchValue.value = storageSearchInfo.name currentPage.value = storageSearchInfo.page From 2c4752c97ba37fab61fd92b0506022cee45edbd1 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 13 Oct 2022 18:13:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 7 +++---- front/src/views/home/integrationServices.vue | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 98ece7ec..b3005ac8 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 16:47:03 + * @LastEditTime: 2022-10-13 18:10:05 * @Description: 系统静态参数配置 */ var _global = {} @@ -11,7 +11,7 @@ var CONFIGITEM = { // version: 'xihaian', // 西海岸 // version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - version: 'dev', // 测试 + version: 'qingdao', // 测试 //version: 'frp', // 内网穿透 vNum: 'v0.8.7.2', configData: { @@ -28,8 +28,7 @@ var CONFIGITEM = { previewUrl: 'http://15.72.183.90:7008/', //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', //apiURL: 'http://15.72.183.90:8000/renren-admin', - // websocketURL: '15.72.183.90:8000/renren-admin', - websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄 + websocketURL: '15.72.183.90:8000/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 4e7370c2..89313d69 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -35,7 +35,7 @@
{ if (storageSearchInfo) { - number.value = storageSearchInfo.type == '打包模式' ? 0 : 1 + number.value = storageSearchInfo.type == '打包模式' ? 1 : 0 // 搜索名称 searchValue.value = storageSearchInfo.name currentPage.value = storageSearchInfo.page From d278b2194cfecc215023ad710a46872ba5f0b27c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Oct 2022 18:54:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=89=80=E9=9C=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assignedScene/add-update-scene.vue | 18 ++++++++++- .../ability/components/combine-ability.vue | 30 ++++++++++++++----- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue index 9f121c0e..3e01307e 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -163,12 +163,26 @@ export const modalTypeText = { } export const getFuseResourceList = (abilityListObj) => { + debugger const arr = [] let length = 0 for (const key in abilityListObj) { if (Object.hasOwnProperty.call(abilityListObj, key)) { const itemArray = abilityListObj[key] - itemArray.map((v, i) => { + debugger + if(key=='数据资源'){ + itemArray.map((v, i) => { + const index = (i + 1) + length + arr.push({ + resourceId: v.id, + type: key, + sequence: index, + resourceName:v.resourceName, + deptName:v.deptName, + }) + }) + }else{ + itemArray.map((v, i) => { const index = (i + 1) + length arr.push({ resourceId: v, @@ -176,6 +190,8 @@ export const getFuseResourceList = (abilityListObj) => { sequence: index }) }) + } + length = itemArray.length } } diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue index dc6faeca..c35979c9 100644 --- a/back/src/views/modules/ability/components/combine-ability.vue +++ b/back/src/views/modules/ability/components/combine-ability.vue @@ -20,7 +20,8 @@ :titles="nameArray" :props="{ key: 'id', label: 'name', - }" :data="transferData"> + }" :data="transferData" + @change="handleChange"> v.type == this.type) + const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type); + console.log('attrValue',attrValue); if (attrValue.length > 0) { attrValue.map(val => { const _obj = { type: val.type, id: val.resourceId, - name: val.resource && val.resource.name + name: val.resource && val.resource.resourceName, } arr.push(_obj) }) } - // 展示 - this.displayList = JSON.parse(JSON.stringify(arr)) + this.displayList = JSON.parse(JSON.stringify(arr)); // 已选中 this.selectedArray = arr.map(v => v.id) this.$nextTick(() => { @@ -288,7 +289,9 @@ export default { this.transferData.push({ type: this.type, id: v.guid, - name: v.zyname || '--' + name: v.zyname || '--', + deptName:v.TGBM, +              resourceName:v.zyname }) }) this.allData = JSON.parse(JSON.stringify(this.transferData)) @@ -302,6 +305,16 @@ export default { return item.name && item.name.indexOf(query) > -1 }, confirmSubmitHandle () { + console.log('lllooooo',this.selectedArray); + //通过选中的数据去查找原始列表数据 + let selectedObjectList = []; + this.selectedArray.forEach((item)=>{ + let filterData = []; + filterData = this.allData.filter(v => v.id == item); + //console.log('filterDatafilterData',filterData); + selectedObjectList.push(filterData[0]); + }); + console.log('selectedObjectListselectedObjectList',selectedObjectList); if (this.selectedArray.length > this.maxNum) { return this.$message.error('最多选择十条数据！') } @@ -314,10 +327,13 @@ export default { }) this.$emit('update', { title: this.type, - list: this.selectedArray + list: selectedObjectList }) console.log(this.selectedArray, this.displayList, 'this.displayList') }, + handleChange(){ + console.log('222222',this.selectedArray); + }, getDisplay (displayList) { this.displayList = [] this.displayList = displayList From b79797b09a7f16b3907eaae935b76898b55f881f Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 13 Oct 2022 19:11:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 6 +++--- .../components/ResourceAggregation.vue | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index b3005ac8..b2ef7ec4 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,16 +2,16 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 18:10:05 + * @LastEditTime: 2022-10-13 19:03:07 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', //青岛 // version: 'xihaian', // 西海岸 - // version: 'dev', // 开发 + version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - version: 'qingdao', // 测试 + // version: 'qingdao', // 测试 //version: 'frp', // 内网穿透 vNum: 'v0.8.7.2', configData: { diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index c81190be..fae3e810 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -211,6 +211,7 @@ }) } console.log('laiyuanDataList.value', laiyuanDataList.value) + funnelPlot(laiyuanDataList.value) }) } //来源部门饼图 @@ -567,14 +568,14 @@ }, { deep: true } ) - watch( - laiyuanDataList, - (value) => { - funnelPlot(value) - console.log(value, ' laiyuanDataList') - }, - { deep: true } - ) + // watch( + // laiyuanDataList, + // (value) => { + // funnelPlot(value) + // console.log(value, ' laiyuanDataList') + // }, + // { deep: true } + // )