From 4ba21bd41e4e65fea5c1e07b39437345fb433213 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 24 Nov 2022 17:34:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/myAgent/demo/competency-application.vue | 12 ++++++++---- .../components/CameraPopupOnMap.vue | 12 +++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 4c2c1690..fe182c31 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: Light - * @LastEditTime: 2022-11-17 17:39:31 + * @LastEditTime: 2022-11-24 17:22:23 * @Description: 告诉大家这是什么 --> @@ -180,7 +180,7 @@ export default { }) }) // 将业务KEY赋值给表单 - console.log('params=================>', this.$route, this.$route.params) + console.log('params=================>', this.$route, this.$route.params, this.dataForm) this.dataForm.taskId = this.$route.params.taskId this.dataForm.instanceId = this.$route.params.processInstanceId this.init() @@ -262,6 +262,7 @@ export default { getInfo () { let params = '' if (this.dataForm.taskId) { + console.log('获取信息') params = `taskId=${this.dataForm.taskId}` this.$http .get( @@ -277,7 +278,9 @@ export default { this.dataForm, 'elas============================' ) - this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name + if (res.data.tAbilityApplicationDTOList[0].resourceOwnerDept) { + this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name + } this.$http .get( `/act/task/getTaskVariables?${params}&variableName=allowEntrust` @@ -297,6 +300,7 @@ export default { } } }) + console.log('获取信息', res.data) if (res.data.tAbilityApplicationDTOList[0].applicationScene) { res.data.tAbilityApplicationDTOList[0].applicationSceneStr = '' res.data.tAbilityApplicationDTOList[0].applicationScene.map( @@ -359,6 +363,7 @@ export default { this.dataForm, 'elas============================' ) + console.log('获取信息2', res.data) if (res.data[0].applicationScene) { res.data[0].applicationSceneStr = '' res.data[0].applicationScene.map((val, index) => { @@ -416,7 +421,6 @@ export default { agreeOrNot: debounce( function (data, type) { if (type === '同意') { - const params = qs.stringify({ taskId: this.dataForm.taskId, comment: this.input || '同意' diff --git a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue index 554a026c..34e27f92 100644 --- a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue +++ b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue @@ -36,7 +36,7 @@
@@ -337,10 +337,12 @@ padding: 5px; } .footer-button{ - width: 750px; - //height:50px; - text-align: center; - padding-top:5px; + display: flex; + justify-content: center; + // width: 750px; + //height:50px; + text-align: center; + padding-top:5px; } } .ant-carousel { From 5e9759544dd06ebdded2c296c994aa96c609f828 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 24 Nov 2022 19:54:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/main-content.vue | 82 +-- front/src/api/file.js | 6 +- .../home/detailsPageInfrastructureTreeXha.vue | 628 +++++++++--------- .../views/home/infrastructureApplication.vue | 4 +- 4 files changed, 359 insertions(+), 361 deletions(-) diff --git a/back/src/views/main-content.vue b/back/src/views/main-content.vue index 9466136c..a84e161c 100644 --- a/back/src/views/main-content.vue +++ b/back/src/views/main-content.vue @@ -65,75 +65,83 @@ \ No newline at end of file + diff --git a/front/src/api/file.js b/front/src/api/file.js index c0e0dd66..7bb2e58d 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-20 17:16:35 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-11-24 14:32:50 + * @LastEditors: Light + * @LastEditTime: 2022-11-24 18:04:45 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -117,7 +117,7 @@ export function getPlaceType() { //西海岸 根据标签树查询视频列表 export function CameraConditionPlaceType(params) { return axios.post( - `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`, + `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType`, params, config2 ) diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue index 56d11d22..b345a31f 100644 --- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue +++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue @@ -109,373 +109,306 @@