From 2ee35c68143defac0af860099b836dfe5ce5a9ae Mon Sep 17 00:00:00 2001
From: chenchenzai <xiaoshangqing@hisense.com>
Date: Mon, 21 Nov 2022 19:10:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E5=9C=B0=E5=9B=BE=E4=BF=AE=E6=94=B91121?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/mapConfig.js       |   2 +-
 front/src/assets/home/arrow-left.png          | Bin 0 -> 1377 bytes
 front/src/assets/home/arrow-right.png         | Bin 0 -> 1380 bytes
 front/src/supermap/advance-init.js            |   2 +-
 front/src/supermap/map-showResource.js        |  25 +++--
 front/src/views/home/components/H5Player.vue  |   6 ++
 front/src/views/home/detailBack.vue           |   8 ++
 .../src/views/home/infrastructurePageXha.vue  |   5 +-
 .../components/CameraPopupOnMap.vue           |  94 +++++++++++++-----
 .../views/home/videoSurveillance/index.vue    |   4 +-
 10 files changed, 105 insertions(+), 41 deletions(-)
 create mode 100644 front/src/assets/home/arrow-left.png
 create mode 100644 front/src/assets/home/arrow-right.png

diff --git a/front/public/static/config/mapConfig.js b/front/public/static/config/mapConfig.js
index d9bd74c6..9cd3d574 100644
--- a/front/public/static/config/mapConfig.js
+++ b/front/public/static/config/mapConfig.js
@@ -22,7 +22,7 @@ var _mapConfig = {}
             CURRENT_MAP_OPTIONS: {
                 // crs: CRS_4490,
                 center: [35.96, 120.19],
-                maxZoom: 13,
+                maxZoom: 15,
                 minZoom: 0,
                 zoom: 5,
             },
diff --git a/front/src/assets/home/arrow-left.png b/front/src/assets/home/arrow-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..29cd118d4f18dbfa1dd2abfb65307717e1655360
GIT binary patch
literal 1377
zcmV-n1)lneP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)8%ab#RA@u(Sx;yjWfcFt*%X_ArZa0%w25GM5(RA!7WANCF9k6XEHph>J$Oji
zS?j@*_0sJ{J$Y!|Z%Gawv>w_(1(P83(tsW;#6zQ?$!rDF)<2{>+jvMScIU~=>?E_Z
zv%BByA48yXobP?_z2AG^d*8g@5O(-OJKTTV2jFK=%M}I~JgN|$VbCCm2f-M0*9j|N
zS|RX?&G?BxGgc;bqZ8S0D+3RU!gCBhVgpAAcsY(k49qLQWddEkZKQsPvo|Q)5&*|>
z8}>Lr<E<L5-p5l4l&MyL#0H>=<;f_=nXw9Bnr%!|qHHNd#omoR%W-t0cU`lYlUz<{
zq~I8UV?@|n3!bMeV`w5yP+|el#PYWQy%<X23=_^<f2A%VOZTLVXSqjvq;QlNCm0wF
zW#c=`7<x%ck6T`nk0#9DfJ#w%8)s}%rb_Akvyv(z#nk-u5rysX5Reti(4UaeD+NFk
zCI^)<<5Vf5e=K7_Rz}U4?-SvppuA=1P5o;spo!&c03GlZlWiX@zBBxltYdNHlAkWU
z&WdtrYY#74#?Zk=IvN7dgn7{^IA4KGMB+GHPd1eCY0J>Z>dDpx5bib#=uj(dt`$ID
zo92Z;ChB&lNC06444Nnzsi{_+@%QXGXSx^Nos;^!j2=}K#tA&>%hn5EB!FP_oo-V!
z^w(sJ);$urr7TD}?X1ViWKx)4Z*`~WJE8_aP4r0_ZKqXg0p}e6b{U7Ivyi_&LTt}8
z%0dkQEpMI%BkOExH~L}c!S)#|GwkY?eX6oR$XaRrOmJ^40AYR);CV-g2`5Tv{YzP6
zLAg#i@90zW<{QK~U(tQlGV~Yf0_YdZPbNUuJps0?#NUr%;?Tcw0R*$?sfr)@O`DSo
zyR`B{e*&aA@5<o)YsS#8{(4mgl4AKJgU-4(fiFsi{?@iSUoox<^K$~;^o}*ZTQr8w
z)d64%2GVhh%~#gZ$Oj_lv|uHHE0wy;7Y*Hr1fYq+EWodN87Lnt8BZ<BW}s7NKFXdd
zemOu$T=Ujw&N5OX(E#%1A{fuQVr1_triX9I0O+Rkj{RhQ>2YS|rsqF?w9@+4w^`6Z
zO_+B8^gHkR?(Xip`QE@rGXVQOxzW46`=8qY_qAQHb&Pp7?ygss*DOQdQ|Ac92aq~z
zK4A5@)7XRC4`AmXp&eetNzrB-4Sn~tb%C|gM%A2Y5FzKbQHCgG^h~oN4zG8kBdIwv
zM+CR`Gb2;V=pwp^bA<sAuT%tAORK5Jq?v{Ql8%DNa*w*V@cSkW!!#IV^=dxmRAFA(
zWZ4MEt+eipm9d{rfza~i7#J74%N6q_Lq8mJrUpP#n5P){(7Q9*8)iBIBKSE?zz0P`
zuVOC#_ko6E3`h=V6nmg?BHzuCGR{QS(n#q5s2M9eKx8@5Ofdf;%WQ;+u2@5TI16q)
zbdk^scZdjrD;}-lD-4sl+e2(|L$X(bTC65@<Io~;dv7hFg{CBLQvlv^3X!`VAiBcf
z!bFy{E|YO70F|1kCV9I`uQw-kBR?gYr94db`j?$exKL8oE=n^PlMB04yMIh!9IySs
zfreym*hlFM1PVLy7n4K7Fldg;_^jbCrUc$5ckcFRlIo|+znFYuJNhSIFk&tc;t?=j
z@!7m)$1t#d6@+gTrdip`ElPLnBUH~pht=x=oTKq{qaWP>|9lUa3$kl5K-Y+N3_v?h
jw6pg<fOewSiM{^;psL_c_T^V`00000NkvXXu0mjftJZ{a

literal 0
HcmV?d00001

diff --git a/front/src/assets/home/arrow-right.png b/front/src/assets/home/arrow-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..77a08e6358542a4b69e329a51feb571cbd54b667
GIT binary patch
literal 1380
zcmV-q1)KVbP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)9!W$&RA@u(SxsykMHK$tIu%V0q`Pj!UlSziO+bS7KqWYUL@$*P2@;i>9w;0*
zB=VZ}z=?9HdjU=yC|)Z$aDZ}XBNd4xLh7ZF;6SBtXh4EwT_oHVfr8f!NJ$X!KD4`W
zvfdwi*4`9Fs*m0`GvD{#yf^c{A?)%W?Q;CMPoN$_rBLc;@Q6fsnn42~9spy&`A#T<
zsZ8Lq#rTmx(`GJnD~afL6oLJE=~)IJvw&j+yc7oz19K8^l|Wbj)H2`48SAxei+~N>
zf;9%vSi1{1j^jxQ(qubCViQpGrHL@$%vc66#TKS0RWl``O7~iiX#-vBUR5mSG}lrJ
zNjL%E1QGgz<ayH62FK$#B^CiiU-|~17knX{X2M1DkIWV1X+vo7Ja;J%m5vkR6ayo^
zXnbpGgD(or<D{41PtlEEfz70J2TofgO;)o9X9TARHIs`shb6Ygd_>Boramq*uMh!6
zH`qHFGtO3X>W3l=h}y^n<6R<r;I%h3wI#lm28zCP1E53oiOI5#SKc1_QWRJmyYwfE
zudyUu*&f3SrZ#xE*&Iy?D7takPPqC6A|8nYILg)+@hMYNN26>b3HYmx1Uk}AnQMoT
zTc&y56N$*`6iUE90fWY?T4quN%)SeTbD-Tlt<H(qN7=}FX^g-V_3u#*3?<<8zFlo9
zn)<2;m<Hl(oi}qsd698ZHfi1XYP&jxpAi890q>JEB3deK?@K9M+XB=f3A@A+Thq;=
z5FnrwjdNf)o{QuC`XWkUF%Oc?B}Jkk3WU6wRnL1P79^k>-vM~eHe$l5YF7Os?lwr0
zgj_UUC&tB14A)IfeLj*vufFs|3Ut#oVAD+f^)SYd{2P~mZ66>J;ys~xC+7DkwFiF(
zNU`l};DamL;4k&D4G~D|OQ#w1u>&9YysD{h3M~?0loSbBH$Efa4R>4fnTj@eA%cLR
zGmy1ES~VQ)v=k;432$*ApjgpVEtG(wmu3Kd#f?Dia8-M9p_2$CmDsZW^C3d&hC3h4
znp$Q!oIuf70OJ|QjI0Bd?9iPg2!uu=Mu|-q7awDmZoByLgPB#g?`B?rif-Hm&};wK
zv%a_I_B;J+Nf8K=pw*uB2lk7sap0p{-K%@oS2wY&n3}pTVhi0%0{C0mKws&M`cEq-
zi4)lUTWFUjaaz9zWi&?e*0+{$8I=o$MudV>Mj3iFr{-Gi&t~6~x>Cpmqd)|w_A?__
z&8d2L5*JGSATDnjE?1W`j|wXdJ|;<lN1nUnzS3`7G7QszSJew#=49QtwxzNWPMTTO
zZYyK`5(97FsfxxZ7?<3`6?0WhJ?aG$AduFLvkbiNo*ClJOj4(=-&5Y}Gy(5bG_^sw
zNVK8xHy~&uVZ8*}YG|Aj(<2|oi9$n1)**NsM_VnWJuuK##t^dXu{EMcMBC7)<njw$
zv6^~+6r6n6K|w39?}GwYJXvKcA$?-*|08U1Q?XY-T5J?`cT(UA3R-9>^0p-4ZYQ6(
z8$;+4JwW_ImOV}+;z9&AbD~k?-BEeHwWu3<m1yNHzt~$p>@32is<d)hSizW>-y>VS
zqY~p}@PPwO#aur|;RtvVJM@XkmSGq)%Qbx3^oc2jx5(+cU74iux5H0N^~HAeBcIn}
z4iVyEFkY^!d9Ajg=lgXKzLuC~I+5*TZ=ooFwyM_!*jwYNW)Ix}|Fi+jdeyZUqywgj
m5$FU&Cu8pu=)`+TjQtM)q}WeX)TCwr0000<MNUMnLSTaR&vCK<

literal 0
HcmV?d00001

diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js
index e61c160e..6068870d 100644
--- a/front/src/supermap/advance-init.js
+++ b/front/src/supermap/advance-init.js
@@ -1680,7 +1680,7 @@ export function MapFun(mapObj) {
             let layers = null;
             let clickDataList = [];
             // 判断是否是聚合图层
-            layers = createMarkerClusterLayer()
+            layers = createMarkerClusterLayer('', map)
             const icon1 = createDefaultFeatureStyle({
                 img: url,
                 iconSize: [33, 33],
diff --git a/front/src/supermap/map-showResource.js b/front/src/supermap/map-showResource.js
index 07390e3e..8990447e 100644
--- a/front/src/supermap/map-showResource.js
+++ b/front/src/supermap/map-showResource.js
@@ -39,11 +39,9 @@ function updateProgressBar(processed, total, elapsed, layersArray) {
  * @param layerClassName 据此判断是否需要自定义聚合图层的样式
  * @returns {*}
  */
-function createMarkerClusterLayer(layerClassName) {
+function createMarkerClusterLayer(layerClassName, mapObj) {
     let array = [];
     let markerClusterLayer = null
-        //let currentZoom = this.map._zoom
-        //console.log('zzzzzz', currentZoom);
     if (layerClassName) {
         // 如果存在类名，表示需要自定义图标
         markerClusterLayer = L.markerClusterGroup({
@@ -81,18 +79,23 @@ function createMarkerClusterLayer(layerClassName) {
             // 是否显示标记的边界
             showCoverageOnHover: false,
             // 是否点击展开
-            zoomToBoundsOnClick: false,
+            zoomToBoundsOnClick: true,
             maxClusterRadius: 80,
         })
         markerClusterLayer.on('clusterclick', function(a) {
-            //console.log('cluster ' + a.layer.getAllChildMarkers());
-            let clusterList = [];
-            for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
-                //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
-                clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
+            //console.log('cluster ' + a.layer.getAllChildMarkers().length);
+            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);
+                    clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
+                }
+                //console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));
+                //console.log('zzzzzzzzz', mapObj.getZoom(), mapObj.getMaxZoom());
+                if (mapObj.getZoom() == mapObj.getMaxZoom()) {
+                    mybus.emit('openOperationPopup', clusterList);
+                }
             }
-            //console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));
-            mybus.emit('openOperationPopup', clusterList);
         });
     }
     return markerClusterLayer
diff --git a/front/src/views/home/components/H5Player.vue b/front/src/views/home/components/H5Player.vue
index d0494749..6ace8674 100644
--- a/front/src/views/home/components/H5Player.vue
+++ b/front/src/views/home/components/H5Player.vue
@@ -13,6 +13,10 @@ const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
      videoUrl:{
         type: String,
         default: '',
+     },
+     index:{
+        type: Number,
+        default: 0,
      }
     },
     data() {
@@ -64,7 +68,9 @@ const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
        })
      },
      createPlayer () {
+      //console.log('this.index',this.index);
      this.player = new window.JSPlugin({
+       //szId: 'player'+this.index,
        szId: 'player',
        szBasePath: "/util/",  //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
        iMaxSplit: 4,
diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue
index 2f1c1f46..518cb5e0 100644
--- a/front/src/views/home/detailBack.vue
+++ b/front/src/views/home/detailBack.vue
@@ -13,6 +13,7 @@
 import { reactive, ref, watch, defineProps } from 'vue'
 import { useRouter } from 'vue-router'
 import { useStore } from 'vuex'
+import mybus from '@/myplugins/mybus'
 const router = useRouter()
 const oldValue1= ref('')
 const props = defineProps({
@@ -32,6 +33,13 @@ const previousPage = () => {
 
 const detailName = ref("应用资源")
 
+const goToDetailsPageconetent = () =>{
+   let pathData =  {
+          path: '/DetailsPageconetent',
+        };
+     mybus.emit('changeMenuStyle',pathData);
+}
+
 </script>
 
 <style scoped lang="less">
diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue
index e2c75bb9..6685a8cf 100644
--- a/front/src/views/home/infrastructurePageXha.vue
+++ b/front/src/views/home/infrastructurePageXha.vue
@@ -2601,8 +2601,9 @@
   }
   .camera-popup{
      .ant-modal-body {
-      height: 700px !important;
-      overflow-y: auto;
+      height: 720px !important;
+      overflow-y: hidden;
+      overflow-x: hidden;
       padding:14px;
     }
     .ant-modal-footer{
diff --git a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
index cc65efc8..feadb2dd 100644
--- a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
+++ b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
@@ -5,12 +5,14 @@
         <a-carousel arrows>
               <template #prevArrow>
                 <div class="custom-slick-arrow" style="left: 10px; z-index: 1">
-                  <left-circle-outlined />
+                  <!-- <div style="background-color:red">11111111</div> -->
+                  <div class="arrow-left" @click="handlePrev()"></div>
                 </div>
               </template>
               <template #nextArrow>
                 <div class="custom-slick-arrow" style="right: 10px">
-                  <right-circle-outlined />
+                  <!-- <right-circle-outlined /> -->
+                  <div class="arrow-right" @click="handleNext()"></div>
                 </div>
               </template>
               <div
@@ -18,27 +20,21 @@
                 :width="800"
                 :height="400"
                 :key="url"
-                :src="url"
               >
-              <div class="video-content">
-              <h5-player></h5-player> 
               </div>
-              <!-- <div style="color:#000000">
-              <div class="video-content" style=" z-index: 1">
+            </a-carousel>
+          <div class="operation-content" style="position:ab">
+              <div class="video-content">
               <h5-player :video-url="videoUrl"></h5-player> 
               </div>
-              </div> -->
+              <div class="text-label">
+                <span>{{defaultIndex}}</span>/<span>{{cameraDataList.length}}</span>
+              </div>
               <div class="footer-button"> 
                 <a-button type="primary" @click="applyNow(url)">立即申请</a-button>
                 <a-button type="primary" style="margin-left:20px" @click="addIntoCart(url)">加入申购车</a-button>
                 </div>
-               <!-- <div class="footer-button">
-                <a-button type="primary">立即申请</a-button>
-                 <a-button type="primary" style="margin-left:20px">加入申购车</a-button>
-               </div> -->
-              </div>
-            </a-carousel>
-      <!-- -->
+      </div>
     </div>
   </div>
 </template>
@@ -79,7 +75,8 @@
       return {
         openVideo: false,
         videoStream: '',  
-         videoUrl:'' //视频预览url
+         videoUrl:'', //视频预览url
+         defaultIndex:0//默认显示列表中的对一个
       }
     },
     methods: {
@@ -99,6 +96,28 @@
       addIntoCart(item){
          console.log('addIntoCartaddIntoCart',item);
           mybus.emit('selectCamera', item)
+      },
+      handlePrev(){
+        let maxLength = this.cameraDataList.length-1;
+        this.defaultIndex = this.defaultIndex - 1;
+         console.log('opopopop',this.cameraDataList[maxLength]);
+        if(this.defaultIndex === 0){
+          console.log('opopopop',this.cameraDataList[maxLength]);
+          //根据当前数据的channelId查询视频播放的url传递给H5组件调用接口
+          //this.videoUrl =
+        } else{
+           console.log('uyutyuyopopopop',this.cameraDataList[this.defaultIndex]);
+        }
+       
+      },
+      handleNext(){
+         this.defaultIndex = this.defaultIndex + 1;
+          if(this.defaultIndex === this.cameraDataList.length){
+          console.log('opopopop',this.cameraDataList[0]);
+          }else{
+               console.log('opopopop',this.cameraDataList[this.defaultIndex]); 
+          }
+       
       }
     },
   }
@@ -112,6 +131,7 @@
     padding-bottom: 20px;
     display: flex;
     flex-direction: column;
+    position: relative;
     .content {
       // width: 280px;
       min-height: 100px;
@@ -162,22 +182,36 @@
       margin: 8px auto 0;
       cursor: pointer;
     }
-    .ant-carousel {
-    width: 960px;
-    //height: 700px;
-    margin-left: 8px;
-     .video-content{
-     width: 950px;
+    .operation-content{
+       position: absolute;
+      z-index: 800;
+      top: 0.1rem;
+      //right: 0.1rem;
+      left:0.8rem;
+      .text-label{
+      width:800px;
+      height:30px;
+      margin-top:10px;
+      text-align:center;
+      font-size: 18px;
+      }
+        .video-content{
+     width: 750px;
      height:600px; 
      text-align: left; 
      padding: 5px;
     }
     .footer-button{
-       width: 950px;
+       width: 750px;
        //height:50px; 
        text-align: center; 
-       padding-top:20px;
+       padding-top:5px;
     }
+    }
+    .ant-carousel {
+    width: 960px;
+    //height: 700px;
+    margin-left: 8px;
   }
   .ant-carousel :deep(.slick-slide) {
     text-align: center;
@@ -195,9 +229,19 @@
     height: 50px;
     font-size: 50px;
     color: #fff;
-    background-color: rgba(31, 45, 61, 0.11);
+    //background-color: rgba(31, 45, 61, 0.11);
     opacity: 0.8;
     z-index: 1;
+    .arrow-left{
+      width:48px;
+      height:48px;
+      background-image: url('~@/assets/home/arrow-left.png');
+    }
+    .arrow-right{
+      width:48px;
+      height:48px;
+      background-image: url('~@/assets/home/arrow-right.png');
+    }
   }
   .ant-carousel :deep(.custom-slick-arrow:before) {
     display: none;
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 2627f8a1..812cf1a7 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -168,6 +168,7 @@ import { ElMessage } from 'element-plus'
         this.hiMap.mapObj,
         this.hiMapFun
       )
+      //console.log('this.hiMap.mapObj',this.hiMap.mapObj.map.getZoom());
       // this.hiMap.mapObj.map.flyTo({ lat: 36.06, lng: 120.3899 }, 16)
       this.addressMatchUrl = window.SITE_CONFIG.POI_URL
       // 初始化地址检索服务
@@ -204,6 +205,7 @@ import { ElMessage } from 'element-plus'
       mybus.on('cameraDataOnMap', (data) => {
           this.addResourceTomap('videoMap', data)
       })
+
     },
     methods: { // 查询
       handleEnter(){
@@ -475,7 +477,7 @@ import { ElMessage } from 'element-plus'
         pageSize: 30000,
         type: 0,
         borderPolygonList: []
-}
+        }
         getCameraByCondition(params).then((res) => {
           // let t1 = new Date().getTime();
           // this.cameraAllData = res.data.data

From d70ca5878179ae5721ab4d4ee31717a4cdaa8678 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Mon, 21 Nov 2022 19:16:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bus=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/detailsPageInfrastructureTreeXha.vue | 51 +++++++++++++------
 .../views/home/videoSurveillance/index.vue    |  1 -
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
index 9387dcb6..4ceed28f 100644
--- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue
+++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
@@ -152,10 +152,16 @@ export default defineComponent({
     }
     //选择标签内容
     const tabClick = (id) => {
-      chooseId.value = id
+      if(chooseId.value === id){
+        chooseId.value = ''
+        mybus.emit('clearLeftSelect')
+      }else{
+        chooseId.value = id
       let placeTypeCode =[]
       placeTypeCode.push(id)
       mybus.emit('CameraConditionPlaceType', placeTypeCode)
+      }
+     
     }
     // 初始化
     const init = async () => {
@@ -196,14 +202,15 @@ export default defineComponent({
       chooseId.value=''
     })
     const onSelect = async (item, val, child) => {
-      let res = {}
-      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-        res = await getCameraAllOrgan({ parentId: val.id })
-      } else {
+     
+      // if(selectId.value===val.id){
+      //   selectId.value=''
+      //     mybus.emit('clearLeftSelect')
+      // }else{
+        let res = {}
          mybus.emit('getCameraByParentId', val.id)
-        // 西海岸
+
         res = await getCameraInfoByAreaId({ areaId: val.id })
-      }
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
           treeData.value[index].children.map((childItem, childIndex) => {
@@ -215,11 +222,20 @@ export default defineComponent({
         }
       })
       if (child) {
+          if(selectId.value===child.id){
+        selectId.value=''
+          mybus.emit('clearLeftSelect')
+      }else{
         selectId.value = child.id
       }
+      
+      }
+     // }
+     
     }
 
     watch(selectId, (newVal) => {
+ 
       if (newVal == '') {
         mybus.emit('getCameraByParentId', '')
         mybus.emit('getListByParentId', '')
@@ -244,14 +260,15 @@ export default defineComponent({
       })
     }
     const showDown = (item, val) => {
+      
       selectId.value = val.id
-      console.log('item---showDown--------->', item)
-      console.log('val----showDown-------->', val)
+     
       if (item.children) {
         val.show = !val.show
         // 取消选中
         if (!val.show) {
           selectId.value = ''
+          mybus.emit('clearLeftSelect')
         }
       }
     }
@@ -284,10 +301,11 @@ export default defineComponent({
 <style lang="less" scoped>
 .titleName {
   font-size: 18px;
-  color: #7e7676;
-  margin-bottom: 10px;
-  padding-left: 10px;
-  border-left: 6px solid #1296db;
+    color: #7e7676;
+    margin-bottom: 10px;
+    padding-left: 6px;
+    border-left: 6px solid #1296db;
+    margin-left: 10px;
 }
 .glgkmk {
   cursor: pointer;
@@ -310,6 +328,7 @@ export default defineComponent({
   }
   .active {
     color: #0058e1;
+    font-weight: bold;
   }
 }
 
@@ -317,15 +336,15 @@ export default defineComponent({
   color: #0058e1;
 }
 .nav {
-  margin-bottom: 13px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
+   margin-right: 20px;
   align-items: center;
   font-size: 18px;
   font-family: 'Alibaba PuHuiTi';
   color: #000000;
   line-height: 0.32rem;
-  margin-bottom: 0.1rem;
+  margin-bottom: 24px;
 
   .photo {
     display: inline-block;
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 0da6d3fa..a6ed94d1 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -389,7 +389,6 @@ import { ElMessage } from 'element-plus'
         })
       },
       getCameraByParentId(type) {
-        debugger
         if (!this.whoShow1.itShowXiHaiAn) {
           getCameraByParentId(this.mapSearchParam).then((res) => {
             console.log('根据parent查询摄像头', res.data.data)