Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/public/static/config/mapConfig.js

@@ -2,12 +2,13 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-21 17:06:10
+ * @LastEditTime: 2022-11-21 19:21:42
  * @Description: 地图静态参数配置
  */
 var _mapConfig = {}
 
-;(function () {
+;
+(function() {
     var L = window.L || {}
         // // 定义底图初始化化参数
         //  请在此处更改你的配置**********************************************
@@ -21,32 +22,11 @@ var _mapConfig = {}
             CURRENT_MAP_OPTIONS: {
                 // crs: CRS_4490,
                 center: [35.96, 120.19],
-        maxZoom: 18,
+                maxZoom: 15,
                 minZoom: 0,
                 zoom: 5,
             },
         },
-    qingdao: {
-      DATABASE_TYPE: 'Highgo',
-      POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
-      ISERVER_URL: '15.2.21.238:8090',
-      WORKPLACE_NAME: 'HIMAP-HIGHGO',
-      MAP_NAME: 'QDMAP',
-      DATASOURCE_NAME: 'HISENSE_map',
-      ATMOSPHERE_URL: 'http://15.2.21.151:9015/service-main',
-      CURRENT_MAP_OPTIONS: {
-        // crs: CRS_4490,
-        center: [36.17, 120.13],
-        maxZoom: 18,
-        minZoom: 0,
-        zoom: 10,
-      },
-      BDMAP_CONFIG: {
-        location: 'qingdao',
-        _initpos: {
-          point: [120.392795, 36.072854],
-          zoom: 2,
-        },
         _keyframes: [
           [121.6011191295479, 36.73422934263509],
           [119.83371870221472, 36.082854],

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],

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());
+            //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);
+                }
+            }
         });
     }
     return markerClusterLayer

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,

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">

front/src/views/home/detailsPageInfrastructureTreeXha.vue

@@ -152,11 +152,17 @@ export default defineComponent({
     }
     //选择标签内容
     const tabClick = (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 () => {
       treeData.value = []
@@ -196,14 +202,15 @@ export default defineComponent({
       chooseId.value=''
     })
     const onSelect = async (item, val, child) => {
+     
+      // if(selectId.value===val.id){
+      //   selectId.value=''
+      //     mybus.emit('clearLeftSelect')
+      // }else{
         let res = {}
-      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-        res = await getCameraAllOrgan({ parentId: val.id })
-      } else {
          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')
         }
       }
     }
@@ -286,8 +303,9 @@ export default defineComponent({
   font-size: 18px;
     color: #7e7676;
     margin-bottom: 10px;
-  padding-left: 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;

front/src/views/home/infrastructurePageXha.vue

@@ -2601,8 +2601,9 @@
   }
   .camera-popup{
      .ant-modal-body {
-      height: 700px !important;
+      height: 720px !important;
-      overflow-y: auto;
+      overflow-y: hidden;
+      overflow-x: hidden;
       padding:14px;
     }
     .ant-modal-footer{

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">
+            </a-carousel>
-              <div class="video-content" style=" z-index: 1">
+          <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>
 </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,23 +182,37 @@
       margin: 8px auto 0;
       cursor: pointer;
     }
-    .ant-carousel {
+    .operation-content{
-    width: 960px;
+       position: absolute;
-    //height: 700px;
+      z-index: 800;
-    margin-left: 8px;
+      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: 950px;
+     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;
     height: 650px;
@@ -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;

front/src/views/home/videoSurveillance/index.vue

@@ -181,6 +181,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
       // 初始化地址检索服务
@@ -389,7 +390,6 @@ import { ElMessage } from 'element-plus'
         })
       },
       getCameraByParentId(type) {
-        debugger
         if (!this.whoShow1.itShowXiHaiAn) {
           getCameraByParentId(this.mapSearchParam).then((res) => {
             console.log('根据parent查询摄像头', res.data.data)
@@ -548,7 +548,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