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] =?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 @@
               </div>
               <div class="footer-button" v-if="showFlag">
                 <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>
-                <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申购车</a-button>
+                <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申请列表</a-button>
               </div>
       </div>
     </div>
@@ -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 {