From 57b89687d18fc806f4560dd1780418fd3541cc1c Mon Sep 17 00:00:00 2001
From: chenchenzai <xiaoshangqing@hisense.com>
Date: Tue, 22 Nov 2022 11:24:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E4=B8=8A=E5=9B=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/supermap/map-showResource.js           | 3 ++-
 front/src/views/home/components/H5Player.vue     | 1 +
 front/src/views/home/videoSurveillance/index.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/front/src/supermap/map-showResource.js b/front/src/supermap/map-showResource.js
index 8990447e..3aab1872 100644
--- a/front/src/supermap/map-showResource.js
+++ b/front/src/supermap/map-showResource.js
@@ -83,11 +83,12 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
             maxClusterRadius: 80,
         })
         markerClusterLayer.on('clusterclick', function(a) {
-            //console.log('cluster ' + a.layer.getAllChildMarkers().length);
+            //console.log('cluster ' + a.layer.getAllChildMarkers());
             if (a.layer.getAllChildMarkers().length < 50) {
                 let clusterList = [];
                 for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
                     //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
+                    //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);
                     clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
                 }
                 //console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));
diff --git a/front/src/views/home/components/H5Player.vue b/front/src/views/home/components/H5Player.vue
index ccb06eb6..8542c31c 100644
--- a/front/src/views/home/components/H5Player.vue
+++ b/front/src/views/home/components/H5Player.vue
@@ -67,6 +67,7 @@ import { message } from 'ant-design-vue'
                 handler(newVal, oldVal) {
                     console.log('oldVal:', oldVal)
                     console.log('newVal:', newVal)
+                   //this.realplay(newVal,0);   
                 },
                 // 立即处理 进入页面就触发
                 immediate: true
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 44ee5f19..fdc94a94 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -551,7 +551,7 @@ import { ElMessage } from 'element-plus'
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
         pageNum: "1",
-        pageSize: 30000,
+        pageSize: 40000,
         type: 0,
         borderPolygonList: []
         }

From 20f5dd7999c5f752033dccd0c35244983f9ab113 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 22 Nov 2022 11:51:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/infrastructureApplication.vue  | 69 ++++++++++++-------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue
index dd386684..2db08d2a 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-22 10:54:46
+ * @LastEditTime: 2022-11-22 11:49:24
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -23,7 +23,7 @@
               cancel-text="否"
               @confirm="delWillApplyCamera(item.id)"
             >
-              <a-button type="link" danger>移出</a-button>
+              <a-button type="link" danger style="padding: 0">移出</a-button>
             </a-popconfirm>
           </a-list-item>
         </template>
@@ -45,17 +45,26 @@
                 {{ item.cameraInfo.channelName }}
               </a-tooltip>
             </div>
+            <a-tag color="cyan" style="margin-right: 0">
+              {{ item.approveStatus }}
+            </a-tag>
             <a-popconfirm
               v-if="item.approveStatus == '通过'"
-              :title="'是否删除' + item.cameraInfo.channelName + '?'"
+              :title="'是否撤销' + item.cameraInfo.channelName + '?'"
               ok-text="是"
               cancel-text="否"
               @confirm="deleteApply(item)"
             >
-              <a-button type="link" danger>删除</a-button>
+              <a-button type="link" danger style="padding: 0">撤销</a-button>
             </a-popconfirm>
-            <a-button v-else type="link" danger @click="deleteApply(item)">
-              删除
+            <a-button
+              v-else
+              type="link"
+              danger
+              @click="deleteApply(item)"
+              style="padding: 0"
+            >
+              撤销
             </a-button>
           </a-list-item>
         </template>
@@ -68,12 +77,18 @@
   <a-modal
     :width="800"
     v-model:visible="visible"
-    title="删除申请"
+    title="撤销申请"
     @ok="handleOk"
     @cancel="clear"
   >
-    <p>本次申请的摄像头包含以下{{ showArr.length }}个摄像头，是否删除申请？</p>
-    <a-table :columns="columns" :data-source="showArr">
+    <p>本次申请的视频监控包含以下{{ showArr.length }}个，是否撤销申请？</p>
+    <a-table
+      :columns="columns"
+      :data-source="showArr"
+      :pagination="{
+        pageSize: 5,
+      }"
+    >
       <template #bodyCell="{ column, text }">
         <template v-if="column.dataIndex === 'name'">
           <a>{{ text }}</a>
@@ -123,7 +138,7 @@
   ]
   const router = useRouter()
   const delWillApplyCamera = (id) => {
-    console.log('删除===>', id)
+    console.log('撤销===>', id)
     if (delWacFlag.value) {
       delWacFlag.value = false
       willApplyCameraBatchDelete([id]).then((res) => {
@@ -147,7 +162,7 @@
           loading: false,
           note1: '',
           resourceId: '1522550195055828996',
-          resourceName: '摄像头列表',
+          resourceName: '视频监控列表',
           type: '基础设施',
         },
       ],
@@ -170,9 +185,9 @@
       })
     }
   }
-  // 删除已申请
+  // 撤销已申请
   const deleteApply = (item) => {
-    console.log('删除========>', item)
+    console.log('撤销========>', item)
     if (delApply.value) {
       delApply.value = false
       switch (item.approveStatus) {
@@ -189,9 +204,9 @@
         case '通过':
           delApplyCamera([item.id]).then((res) => {
             if (res.data.code == 0) {
-              message.success('删除成功')
+              message.success('撤销成功')
             } else {
-              message.warning('删除失败')
+              message.warning('撤销失败')
             }
             initApply()
           })
@@ -202,9 +217,9 @@
   const handleOk = () => {
     endProcess({ instanceId: instanceId.value }).then((res) => {
       if (res.data.code == 0) {
-        message.success('删除成功')
+        message.success('撤销成功')
       } else {
-        message.warning('删除失败')
+        message.warning('撤销失败')
       }
       initApply()
       visible.value = false
@@ -247,7 +262,7 @@
   mybus.on('selectCamera', (obj) => {
     // 判断最多10条
     if (dataList.toBeApplied.length + dataList.requested.length >= 10) {
-      message.warning('最多只能申请10个摄像头！')
+      message.warning('最多只能申请10个视频监控！')
       return
     }
     // 判断是否已操作
@@ -275,7 +290,7 @@
           init()
         })
       } else {
-        message.warning('已申请该摄像头！')
+        message.warning('已申请该视频监控！')
       }
     }
   })
@@ -289,34 +304,40 @@
     position: fixed;
     top: 50%;
     right: 0.16rem;
-    margin-top: -3.5rem;
+    margin-top: -3.9rem;
     .bottom {
-      margin-top: 32px;
+      margin-top: 20px;
     }
     .title {
       font-size: 16px;
       font-weight: 600;
     }
     .name {
-      width: 150px;
+      width: 1.3rem;
       overflow: hidden;
       display: -webkit-box;
       -webkit-line-clamp: 1;
       -webkit-box-orient: vertical;
       word-break: break-all;
     }
+    .top .name {
+      width: 1.8rem;
+    }
     :deep(.ant-list-footer) {
       display: flex;
       justify-content: flex-end;
     }
     :deep(.ant-list-items) {
       width: 2.5rem;
-      height: 2.45rem;
+      height: 3rem;
       overflow-y: scroll;
     }
+    :deep(.ant-list-item) {
+      padding: 5px 5px 5px 10px;
+    }
     :deep(.ant-spin-nested-loading) {
       width: 2.5rem;
-      height: 2.45rem;
+      height: 3rem;
     }
   }
 </style>

From f85c4b1ccbb8c929965e51d79bee61ba80458b26 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 22 Nov 2022 12:00:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9D=A1=E6=95=B0=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/videoSurveillance/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 7104f2d4..af8f9714 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -523,7 +523,7 @@ import { ElMessage } from 'element-plus'
         if(queryString){
           getCameraByCondition({
             pageNum: 1,
-            pageSize: 30000,
+            pageSize: 40000,
             regionId: "70be8c5b664f4bcf869d82f2e8335051",
             type: "0",
             name:queryString,
@@ -551,7 +551,7 @@ import { ElMessage } from 'element-plus'
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
         pageNum: "1",
-        pageSize: 30000,
+        pageSize: 40000,
         type: 0,
         borderPolygonList: []
         }