From 704cfb08dd01640e423484fa5a563bbc97fc30c9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 24 Nov 2022 15:52:18 +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

---
 front/src/views/home/DetailsPageconetent.vue  |  8 +++--
 .../views/home/infrastructureApplication.vue  |  3 +-
 .../components/CameraPopupOnMap.vue           | 31 ++++++++++++-------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 777c3408..b8c0ea1c 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -143,7 +143,7 @@
           show-size-changer
           show-less-items
           show-quick-jumper
-          :showTotal="total => `共 ${total} 项`"
+          :showTotal="(total) => `共 ${total} 项`"
           :total="resourceTotal"
           :page-size-options="pageSizeOptions"
           @change="pageChange"
@@ -514,7 +514,11 @@
     <template v-if="Cardsname == '基础设施'">
       <infrastructureApplication></infrastructureApplication>
     </template>
-    <div class="talk-monitor" @click="openMonitor">
+    <div
+      class="talk-monitor"
+      @click="openMonitor"
+      v-if="Cardsname != '基础设施'"
+    >
       <a-tooltip>
         <template #title>问答机器人</template>
         <i></i>
diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue
index 0de53190..c51a44cc 100644
--- a/front/src/views/home/infrastructureApplication.vue
+++ b/front/src/views/home/infrastructureApplication.vue
@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-23 10:32:10
+ * @LastEditTime: 2022-11-24 15:43:35
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -282,6 +282,7 @@
     }
   }
   const handleOk = () => {
+    console.log('id', instanceId.value)
     endProcess({ instanceId: instanceId.value }).then((res) => {
       if (res.data.code == 0) {
         message.success('撤销成功')
diff --git a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
index 3322ac8d..554a026c 100644
--- a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
+++ b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
@@ -137,17 +137,26 @@
         getApplyCameraListXha().then(res => {
           let flag = true
           if (res.data.code == 0) {
-            res.data.data.map((val) => {
-              val.cameraInfo = JSON.parse(val.cameraInfo)
-              console.log('applyNowapplyNow',val.cameraInfo);
-              if(flag && val.cameraInfo.channelId == item.channelId){
-                flag = false
-              }
-            })
+            if(res.data.data.length >=10 ){
+              message.warning('最多只能申请10个感知资源！')
+              return
+            }else{
+              res.data.data.map((val) => {
+                val.cameraInfo = JSON.parse(val.cameraInfo)
+                console.log('applyNowapplyNow',val.cameraInfo);
+                if(flag && val.cameraInfo.channelId == item.channelId){
+                  flag = false
+                }
+              })
+            }
             if(flag){
-              willApplyCameraSelect().then(res => {
-                if (res.data.code == 0) {
-                  res.data.data.map(val => {
+              willApplyCameraSelect().then(res1 => {
+                if (res1.data.code == 0) {
+                  if(res.data.data.length+res1.data.data.length>=10){
+                    message.warning('最多只能申请10个感知资源！')
+                    return
+                  }
+                  res1.data.data.map(val => {
                     if(item.channelId == val.channelId){
                       item.id = val.id
                     }
@@ -184,7 +193,7 @@
                 }
               })
             }else{
-              message.warning('该摄像头已申请！')
+              message.warning('该感知资源已申请！')
             }
           }
         })