From 56e11a088edc6927378daebd6ecf92d6540a6754 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 22 Nov 2022 09:47:10 +0800
Subject: [PATCH 1/2] =?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

---
 .../components/CameraPopupOnMap.vue           | 90 ++++++++++++++-----
 1 file changed, 70 insertions(+), 20 deletions(-)

diff --git a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
index 5f691d90..dac8d827 100644
--- a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
+++ b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
@@ -25,12 +25,12 @@
             </a-carousel>
           <div class="operation-content" style="position:ab">
               <div class="video-content">
-              <h5-player :video-url="videoUrl"></h5-player> 
+              <h5-player :video-url="videoUrl"></h5-player>
               </div>
               <div class="text-label">
                 <span>{{defaultIndex+1}}</span>/<span>{{cameraDataList.length}}</span>
               </div>
-              <div class="footer-button"> 
+              <div class="footer-button">
                 <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>
                 <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申购车</a-button>
                 </div>
@@ -46,11 +46,15 @@
     LeftCircleOutlined,
     RightCircleOutlined,
   } from '@ant-design/icons-vue'
-  import { useRouter } from 'vue-router'
+  // import { useRouter } from 'vue-router'
   import H5Player from '@/views/home/components/H5Player.vue'
   import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
   import { getStreamByChannelCode } from '@/api/videoSurveillance'
   import {getCameraLiveStream} from '@/api/file'
+  import {willApplyCameraSelect,
+    getApplyCameraListXha,
+  } from '@/api/home'
   export default {
     name: '',
     components: {
@@ -78,10 +82,10 @@
     data() {
       return {
         openVideo: false,
-        videoStream: '',  
+        videoStream: '',
          videoUrl:'', //视频预览url
          defaultIndex:0,//默认显示列表中的对一个
-         router:useRouter()
+        //  router:useRouter()
       }
     },
     methods: {
@@ -94,13 +98,59 @@
       },
       //立即申请
       applyNow(item){
-        console.log('applyNowapplyNow',item);
-       //跳转至申请页面
-          this.router.push({
-          path: '/apply',
-          query: {
-         
-          },
+        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(flag){
+              willApplyCameraSelect().then(res => {
+                if (res.data.code == 0) {
+                  res.data.data.map(val => {
+                    if(item.channelId == val.channelId){
+                      item.id = val.id
+                    }
+                  })
+                }
+                let obj = {
+                  arr: [
+                    {
+                      checked: true,
+                      delFlag: 0,
+                      id: '1593084734789996545',
+                      idtCameraChannel: '790582098133127168',
+                      loading: false,
+                      note1: '',
+                      resourceId: '1522550195055828996',
+                      resourceName: '摄像头列表',
+                      type: '基础设施',
+                    },
+                  ],
+                  deptName: '西海岸新区工业和信息化局',
+                  deptId: '732560225344761856',
+                }
+                item.type = '基础设施'
+                item.delFlag = 0
+                item.resourceId = item.channelId
+                item.resourceName = item.channelName
+                obj.arr[0].note1 = JSON.stringify([item])
+                if (obj.arr.length > 0) {
+                  localStorage.setItem('applyList', JSON.stringify([obj]))
+                  console.log('applyNowapplyNowobj',obj);
+                  this.$router.push({
+                    path: '/apply',
+                  })
+                }
+              })
+            }else{
+              message.warning('该摄像头已申请！')
+            }
+          }
         })
       },
       //加入申购车
@@ -136,7 +186,7 @@
            console.log('uyutyuyopopopop',this.cameraDataList[this.defaultIndex]);
             this.getVideoUrl(this.cameraDataList[this.defaultIndex]);
         }
-       
+
       },
       //查看下一个
       handleNext(){
@@ -146,10 +196,10 @@
             this.getVideoUrl(this.cameraDataList[0]);
           }else{
             this.defaultIndex = this.defaultIndex + 1;
-               console.log('opopopop',this.cameraDataList[this.defaultIndex]); 
+               console.log('opopopop',this.cameraDataList[this.defaultIndex]);
                   this.getVideoUrl(this.cameraDataList[this.defaultIndex]);
           }
-       
+
       }
     },
   }
@@ -229,14 +279,14 @@
       }
         .video-content{
      width: 750px;
-     height:600px; 
-     text-align: left; 
+     height:600px;
+     text-align: left;
      padding: 5px;
     }
     .footer-button{
        width: 750px;
-       //height:50px; 
-       text-align: center; 
+       //height:50px;
+       text-align: center;
        padding-top:5px;
     }
     }
@@ -289,7 +339,7 @@
   .ant-carousel :deep(.slick-dots) {
    display: none !important;
   }
-   
+
   }
   // .current-video {
   //   width: 320px;

From 962f1ad766da5e86127e082ffdd31d0ee82141e9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 22 Nov 2022 09:49:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=9F=A5=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/videoSurveillance/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 44ee5f19..3ca60641 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: 10,
+            pageSize: 30000,
             regionId: "70be8c5b664f4bcf869d82f2e8335051",
             type: "0",
             name:queryString,