西海岸bug修复

front/public/static/config/basicConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-24 15:54:56
+ * @LastEditTime: 2022-11-24 19:38:36
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -63,14 +63,14 @@ var CONFIGITEM = {
       },
       // 获取摄像头的后端接口地址
       camreaInfo: {
-        // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
+        cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
         // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
-        cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
+        // cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
       apiURL: 'http://10.134.135.92:8888/renren-admin',
       // apiURL: 'http://192.168.124.233:8888/ucs-admin',
-      previewUrl: 'http://10.134.135.9:9796/',
+      // previewUrl: 'http://10.134.135.9:9796/',
       // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
       // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
       websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄

front/public/static/config/mapConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-24 16:01:04
+ * @LastEditTime: 2022-11-24 17:33:36
  * @Description: 地图静态参数配置
  */
 var _mapConfig = {}

front/src/api/file.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-24 14:32:50
+ * @LastEditTime: 2022-11-24 17:13:34
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -117,7 +117,7 @@ export function getPlaceType() {
 //西海岸 根据标签树查询视频列表
 export function CameraConditionPlaceType(params) {
   return axios.post(
-    `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
+    `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType`,
     params,
     config2
   )

front/src/supermap/advance-init.js

@@ -74,7 +74,7 @@ export function MapFun(mapObj) {
      * @param layerName {String} 图层名
      */
     const _removeLayerByLayerName = function(layerName) {
-            const layer = layerGroup.get(layerName)
+            const layer = layerGroup.get(layerName) ||
                 // const feature = featureGroup;
                 // map.popupclose();
                 // debugger;
@@ -2099,4 +2099,4 @@ export function MapFun(mapObj) {
         thermodynamic: _thermodynamic,
         addPathToMap: _addPathToMap,
     }
-}
+}

front/src/supermap/map-showResource.js

@@ -84,18 +84,11 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
         })
         markerClusterLayer.on('clusterclick', function(a) {
             let clusterList = [];
-            //console.log('cluster ' + a.layer.getAllChildMarkers());
-            if (a.layer.getAllChildMarkers().length < 50) {
+            if (mapObj.getZoom() == mapObj.getMaxZoom()) {
                 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));
-                //console.log('zzzzzzzzz', mapObj.getZoom(), mapObj.getMaxZoom());
-                if (mapObj.getZoom() == mapObj.getMaxZoom()) {
                     mybus.emit('openOperationPopup', clusterList);
-                }
             }
         });
     }
@@ -194,13 +187,14 @@ function addPointOnMap({
                 .openOn(mapObj.map)
         })
     }
-
-    return isOpenPopup ?
-        marker
-        .addTo(mapObj.map)
-        .bindPopup(elementHtml, { className: popupClassName })
-        .openPopup() :
-        marker.addTo(mapObj.map)
+    const layer = marker.addTo(mapObj.map);
+    featureGroup.addLayer(layer)
+    layerGroup.set('potcon', layer)
+        // marker
+        // .addTo(mapObj.map)
+        // .bindPopup(elementHtml, { className: popupClassName })
+        // .openPopup() :
+        // marker.addTo(mapObj.map)
 }
 
 /**

front/src/views/home/DetailsPageconetent.vue

@@ -919,9 +919,14 @@
       const setTitle = () => {
         let title = titleNameArray
         let whoShow1 = ref(whoShow)
-        if (whoShow1 && whoShow1.value.itShowXiHaiAn) {
-          title[0] = title.splice(2, 1, title[0])[0]
+        if (
+          whoShow1 &&
+          whoShow1.value.itShowXiHaiAn &&
+          title[0].name !== '基础设施'
+        ) {
+          ;[title[0], title[2]] = [title[2], title[0]]
         }
+        debugger
         titleName.value = title
       }
       // 查询

front/src/views/home/components/H5Player.vue

@@ -8,6 +8,7 @@
   const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
   const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
   import { message } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
   export default {
     name: 'H5Player',
     props: {
@@ -61,6 +62,7 @@
     created() {},
     mounted() {
       this.init()
+      mybus.emit('closeLoading', true)
       this.createPlayer()
       this.arrangeWindow()
       //videoUrl this.realplay(this.videoUrl,0);//循环传过来的数组进行播放，index根据选中的个数
@@ -113,6 +115,7 @@
             //插件错误回调
             console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
             message.error('取流异常,请稍后尝试')
+            mybus.emit('closeLoading', false)
           },
           windowEventOver: function (iWndIndex) {
             //鼠标移过回调
@@ -140,6 +143,7 @@
             )
             // 首帧绘制完成后停止
             that.pausePlay(iWndIndex)
+            mybus.emit('closeLoading', false)
           },
           performanceLack: function () {
             //性能不足回调
@@ -161,7 +165,8 @@
       // 初始化结束
       // 视频预览
       realplay(playURL, index1) {
-        this.mode = 1 //解码方式：0普通模式 1高级模式
+        mybus.emit('closeLoading', true)
+        this.mode = 0 //解码方式：0普通模式 1高级模式
         const { player, mode, urls } = this,
           index = player.currentWindowIndex
         // playURL = this.realplay
@@ -196,7 +201,7 @@
           () => {
             this.playback.rate = 0
             console.log('stopAllPlay success')
-            this.closeVideoTree()
+            // this.closeVideoTree()
           },
           (e) => {
             console.error(e)

front/src/views/home/detailsPageInfrastructureTreeXha.vue

@@ -109,373 +109,304 @@
         <div class="titleName">{{ item.placeTypeName }}</div>
         <div class="glgkmk" v-for="(child, index) in item.children">
           <a-tooltip placement="topLeft">
-              <template #title>{{ child.placeTypeName }}</template>
-              <div
-            class="glgknum"
-            :class="{ active: child.placeTypeCode == chooseId }"
-            @click="tabClick(child.placeTypeCode)"
-          >
-            {{ child.placeTypeName }}
-          </div>
-            </a-tooltip>
-          
+            <template #title>{{ child.placeTypeName }}</template>
+            <div
+              class="glgknum"
+              :class="{ active: child.placeTypeCode == chooseId }"
+              @click="tabClick(child.placeTypeCode)"
+            >
+              {{ child.placeTypeName }}
+            </div>
+          </a-tooltip>
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-import { defineComponent, ref, watch } from 'vue'
-import { getCameraAllOrgan } from '@/api/videoSurveillance'
+  import { defineComponent, ref, watch } from 'vue'
+  import { getCameraAllOrgan } from '@/api/videoSurveillance'
 
-import { getCameraInfoByAreaId ,getPlaceType} from '@/api/file'
-import mybus from '@/myplugins/mybus'
-import { useRouter } from 'vue-router'
-import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  import { getCameraInfoByAreaId, getPlaceType } from '@/api/file'
+  import mybus from '@/myplugins/mybus'
+  import { useRouter } from 'vue-router'
+  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
 
-export default defineComponent({
-  setup() {
-    const biaoqianList = ref([])
-    const bumenImg = require('@/assets/newHome/bumen.png')
-    const biaoqianImg = require('@/assets/newHome/biaoqian.png')
-    const router = useRouter()
-    const showKey = ref(0)
-    const treeData = ref([])
-    const selectId = ref('')
-    let itemIndex = ref(1)
-    let chooseId = ref('')
-    //切换tab
-    const btnClick = (index) => {
-      itemIndex.value = index
-    if(index===2){
-      if(chooseId.value !==''){
-        let placeTypeCode =[]
-      placeTypeCode.push(chooseId.value)
-      mybus.emit('CameraConditionPlaceType', placeTypeCode)
-    }else{
-      mybus.emit('clearLeftSelect')
-    }
-    }else{
-      if(selectId.value!==''){
-        mybus.emit('getCameraByParentId', selectId.value)
-      }else{
-      mybus.emit('clearLeftSelect')
+  export default defineComponent({
+    setup() {
+      const biaoqianList = ref([])
+      const bumenImg = require('@/assets/newHome/bumen.png')
+      const biaoqianImg = require('@/assets/newHome/biaoqian.png')
+      const router = useRouter()
+      const showKey = ref(0)
+      const treeData = ref([])
+      const selectId = ref('')
+      let itemIndex = ref(1)
+      let chooseId = ref('')
+      //切换tab
+      const btnClick = (index) => {
+        itemIndex.value = index
+        if (index === 2) {
+          if (chooseId.value !== '') {
+            let placeTypeCode = []
+            placeTypeCode.push(chooseId.value)
+            mybus.emit('CameraConditionPlaceType', placeTypeCode)
+          } else {
+            mybus.emit('clearLeftSelect')
+          }
+        } else {
+          if (selectId.value !== '') {
+            mybus.emit('getCameraByParentId', selectId.value)
+          } else {
+            mybus.emit('clearLeftSelect')
+          }
+        }
       }
-    }
-     
-  
-   
-    }
-    //选择标签内容
-    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 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 = []
-      let select =
-        router.currentRoute.value.query.select ||
-        DETAIL_PAGE_CONTENT_DEFAULT_TAB
-      if (select === '123') {
-        select = ''
-      }
-      if (select == '基础设施') {
-  
-        let res = {}
-   
+      // 初始化
+      const init = async () => {
+        treeData.value = []
+        let select =
+          router.currentRoute.value.query.select ||
+          DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        if (select === '123') {
+          select = ''
+        }
+        if (select == '基础设施') {
+          let res = {}
+
           res = await getCameraInfoByAreaId({
             areaId: '70be8c5b664f4bcf869d82f2e8335051',
           })
-        treeData.value = (res.data && res.data.data) || []
-        let tabs={}
-        tabs = await getPlaceType()
-        //获取标签列表=========
-        biaoqianList.value =(tabs.data && tabs.data.data) || []
-        // 只有一个，默认展开到二级菜单
-        if (res.data && res.data.data.length == 1) {
-          showBottom(treeData.value[0])
+          treeData.value = (res.data && res.data.data) || []
+          let tabs = {}
+          tabs = await getPlaceType()
+          //获取标签列表=========
+          biaoqianList.value = (tabs.data && tabs.data.data) || []
+          // 只有一个，默认展开到二级菜单
+          if (res.data && res.data.data.length == 1) {
+            showBottom(treeData.value[0])
+          }
         }
       }
-    }
-    mybus.on('getDeptList', () => {
-      init()
-    })
-    mybus.on('clearChoose', () => {
-      selectId.value=''
-      chooseId.value=''
-    })
-    const onSelect = async (item, val, child) => {
-
-        let res = {}  
+      mybus.on('getDeptList', () => {
+        init()
+      })
+      mybus.on('clearChoose', () => {
+        selectId.value = ''
+        chooseId.value = ''
+      })
+      const onSelect = async (item, val, child) => {
+        let res = {}
         res = await getCameraInfoByAreaId({ areaId: val.id })
-      treeData.value.map((treeDataItem, index) => {
-        if (item.id == treeDataItem.id) {
-          treeData.value[index].children.map((childItem, childIndex) => {
-            if (childItem.id == val.id) {
-              treeData.value[index].children[childIndex].children =
-                res.data.data
-            }
-          })
+        treeData.value.map((treeDataItem, index) => {
+          if (item.id == treeDataItem.id) {
+            treeData.value[index].children.map((childItem, childIndex) => {
+              if (childItem.id == val.id) {
+                treeData.value[index].children[childIndex].children =
+                  res.data.data
+              }
+            })
+          }
+        })
+        if (child) {
+          if (selectId.value === child.id) {
+            selectId.value = ''
+          } else {
+            selectId.value = child.id
+            mybus.emit('getCameraByParentId', val.id)
+          }
+        }
+      }
+
+      watch(selectId, (newVal) => {
+        if (newVal == '') {
+          mybus.emit('clearLeftSelect')
         }
       })
-      if (child) {
-          if(selectId.value===child.id){
-           selectId.value=''    
-      }else{
-        selectId.value = child.id
-        mybus.emit('getCameraByParentId', val.id)
-      }
-      
-      }
- 
-     
-    }
 
-    watch(selectId, (newVal) => {
-      if (newVal == '') { 
-          mybus.emit('clearLeftSelect')
-      }
-    })
-
-    const showBottom = async (item) => {
-      item.show = !item.show
-      let res = {}
+      const showBottom = async (item) => {
+        item.show = !item.show
+        let res = {}
         // 西海岸
         res = await getCameraInfoByAreaId({ areaId: item.id })
-      treeData.value.map((treeDataItem, index) => {
-        if (item.id == treeDataItem.id) {
-          treeData.value[index].children = (res.data && res.data.data) || []
-          console.log('treeData.value.[index]', treeData.value[index])
-        }
-      })
-    }
-    const showDown = (item, val) => {
-      
-      selectId.value = val.id
-      //mybus.emit('getCameraByParentId', val.id)
-      if (item.children) {
-        val.show = !val.show
-        // 取消选中
-        if (!val.show) {
-          selectId.value = ''
-         // mybus.emit('clearLeftSelect')
-        }else{
-          mybus.emit('getCameraByParentId', val.id)
+        treeData.value.map((treeDataItem, index) => {
+          if (item.id == treeDataItem.id) {
+            treeData.value[index].children = (res.data && res.data.data) || []
+            console.log('treeData.value.[index]', treeData.value[index])
+          }
+        })
+      }
+      const showDown = (item, val) => {
+        selectId.value = val.id
+        //mybus.emit('getCameraByParentId', val.id)
+        if (item.children) {
+          val.show = !val.show
+          // 取消选中
+          if (!val.show) {
+            selectId.value = ''
+            // mybus.emit('clearLeftSelect')
+          } else {
+            mybus.emit('getCameraByParentId', val.id)
+          }
         }
       }
-    }
-    return {
-      btnClick,
-      tabClick,
-      treeData,
-      showKey,
-      onSelect,
-      showBottom,
-      showDown,
-      selectId,
-      itemIndex,
-      bumenImg,
-      biaoqianImg,
-      biaoqianList,
-      chooseId,
-    }
-  },
-  beforeUnmount() {
-    mybus.off('getDeptList')
-    mybus.off('clearChoose')
-  },
-  components: {
-    UpOutlined,
-    DownOutlined,
-  },
-})
+      return {
+        btnClick,
+        tabClick,
+        treeData,
+        showKey,
+        onSelect,
+        showBottom,
+        showDown,
+        selectId,
+        itemIndex,
+        bumenImg,
+        biaoqianImg,
+        biaoqianList,
+        chooseId,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('getDeptList')
+      mybus.off('clearChoose')
+    },
+    components: {
+      UpOutlined,
+      DownOutlined,
+    },
+  })
 </script>
 <style lang="less" scoped>
-.titleName {
-  font-size: 18px;
+  .titleName {
+    font-size: 18px;
     color: #7e7676;
     margin-bottom: 10px;
     padding-left: 6px;
     border-left: 6px solid #1296db;
     margin-left: 10px;
-}
-.glgkmk {
-  cursor: pointer;
-  text-align: left;
-  position: relative;
-  display: inline-block;
-  width: 45%;
-  margin-bottom: 10px;
-  margin-left: 10px;
- 
-  .glgknum {
-    // width: 100px;
-    // color: #000000;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-    word-break: break-all;
   }
-  .active {
-    color: #0058e1;
-    font-weight: bold;
-  }
-}
-
-.glgkmk :hover {
-  color: #0058e1;
-}
-.nav {
-  display: flex;
-  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: 24px;
-
-  .photo {
-    display: inline-block;
-    height: 0.3rem;
-    width: 0.3rem;
-    margin-right: 0.1rem;
-  }
-
-  div {
-    padding: 0 0.1rem;
+  .glgkmk {
     cursor: pointer;
-    display: flex;
-    align-items: center;
+    text-align: left;
+    position: relative;
+    display: inline-block;
+    width: 45%;
+    margin-bottom: 10px;
+    margin-left: 10px;
+
+    .glgknum {
+      // width: 100px;
+      // color: #000000;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      word-break: break-all;
+    }
+    .active {
+      color: #0058e1;
+      font-weight: bold;
+    }
   }
 
-  div:hover {
-    color: #1296db;
+  .glgkmk :hover {
+    color: #0058e1;
   }
-
-  .active {
-    font-weight: 600;
-    color: #1296db;
-    border-bottom: 0.02rem solid #1296db;
-  }
-}
-
-.primaryNode {
-  .top {
-    width: 100%;
-    height: 0.4rem;
-    background: rgba(0, 135, 225, 0.1);
+  .nav {
     display: flex;
     justify-content: space-between;
+    margin-right: 20px;
     align-items: center;
-    padding: 0 0.1rem;
-    margin-top: 0.08rem;
-  }
+    font-size: 18px;
+    font-family: 'Alibaba PuHuiTi';
+    color: #000000;
+    line-height: 0.32rem;
+    margin-bottom: 24px;
 
-  .top:hover {
-    cursor: pointer;
-    // 0058e1 透明度 0.5
-    background: rgba(0, 88, 225, 0.8);
-    color: white;
-
-    :deep(.anticon) {
-      color: white;
+    .photo {
+      display: inline-block;
+      height: 0.3rem;
+      width: 0.3rem;
+      margin-right: 0.1rem;
     }
-  }
 
-  .topSelect {
-    background: #0058e1;
-    color: white;
-
-    :deep(.anticon) {
-      color: white;
-    }
-  }
-
-  .bottom {
-    width: 100%;
-    background: rgba(244, 245, 248, 0.8);
-    padding: 0 0.1rem;
-
-    // margin-bottom: .08rem;
-    .up {
+    div {
+      padding: 0 0.1rem;
       cursor: pointer;
+      display: flex;
+      align-items: center;
+    }
+
+    div:hover {
+      color: #1296db;
+    }
+
+    .active {
+      font-weight: 600;
+      color: #1296db;
+      border-bottom: 0.02rem solid #1296db;
+    }
+  }
+
+  .primaryNode {
+    .top {
+      width: 100%;
       height: 0.4rem;
+      background: rgba(0, 135, 225, 0.1);
       display: flex;
       justify-content: space-between;
       align-items: center;
-      border-top: 0.01rem solid #ccc;
+      padding: 0 0.1rem;
+      margin-top: 0.08rem;
+    }
+
+    .top:hover {
+      cursor: pointer;
+      // 0058e1 透明度 0.5
+      background: rgba(0, 88, 225, 0.8);
+      color: white;
+
+      :deep(.anticon) {
+        color: white;
+      }
+    }
+
+    .topSelect {
+      background: #0058e1;
+      color: white;
+
+      :deep(.anticon) {
+        color: white;
+      }
+    }
+
+    .bottom {
+      width: 100%;
+      background: rgba(244, 245, 248, 0.8);
       padding: 0 0.1rem;
 
-      & > div {
-        display: flex;
-        justify-content: flex-start;
-      }
-
-      .name {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-        word-break: break-all;
-      }
-    }
-
-    .up:hover {
-      .name {
-        color: #0058e1;
-        font-weight: 600;
-      }
-
-      span {
-        color: #0058e1;
-        font-weight: 600;
-      }
-    }
-
-    .select {
-      padding: 0 0.1rem 0 0;
-
-      .name {
-        width: 1.7rem;
-        color: #0058e1 !important;
-        font-weight: 600;
-      }
-
-      span {
-        color: #0058e1;
-        font-weight: 600;
-      }
-    }
-
-    .item:nth-of-type(1) .up {
-      border-top: none;
-    }
-
-    .down {
-      width: 100%;
-
-      .child {
+      // margin-bottom: .08rem;
+      .up {
         cursor: pointer;
         height: 0.4rem;
         display: flex;
         justify-content: space-between;
         align-items: center;
+        border-top: 0.01rem solid #ccc;
         padding: 0 0.1rem;
 
         & > div {
@@ -493,7 +424,7 @@ export default defineComponent({
         }
       }
 
-      .child:hover {
+      .up:hover {
         .name {
           color: #0058e1;
           font-weight: 600;
@@ -505,10 +436,12 @@ export default defineComponent({
         }
       }
 
-      .select2 {
+      .select {
+        padding: 0 0.1rem 0 0;
+
         .name {
           width: 1.7rem;
-          color: #0058e1;
+          color: #0058e1 !important;
           font-weight: 600;
         }
 
@@ -516,10 +449,65 @@ export default defineComponent({
           color: #0058e1;
           font-weight: 600;
         }
+      }
 
-        padding: 0 0.1rem 0 0;
+      .item:nth-of-type(1) .up {
+        border-top: none;
+      }
+
+      .down {
+        width: 100%;
+
+        .child {
+          cursor: pointer;
+          height: 0.4rem;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 0 0.1rem;
+
+          & > div {
+            display: flex;
+            justify-content: flex-start;
+          }
+
+          .name {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+        }
+
+        .child:hover {
+          .name {
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          span {
+            color: #0058e1;
+            font-weight: 600;
+          }
+        }
+
+        .select2 {
+          .name {
+            width: 1.7rem;
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          span {
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          padding: 0 0.1rem 0 0;
+        }
       }
     }
   }
-}
 </style>

front/src/views/home/infrastructurePageXha.vue

@@ -648,10 +648,12 @@
               {{ userInfo.realNameShow }}
             </div>
             <!--地图上点击之后弹出的操作弹窗-->
-            <camera-popup-on-map
-              :camera-Data-List="cameraDataList"
-              :reset-flag="resetFlag"
-            ></camera-popup-on-map>
+            <a-spin size="large" :spinning="spinning">
+              <camera-popup-on-map
+                :camera-Data-List="cameraDataList"
+                :reset-flag="resetFlag"
+              ></camera-popup-on-map>
+            </a-spin>
           </div>
         </div>
       </a-modal>
@@ -699,6 +701,7 @@
   const current = ref(1)
   const videoTotal = ref(0)
   const router = useRouter()
+  const spinning = ref(true)
   const whoShow1 = ref(whoShow)
   const isXiHaiAn = whoShow1.value.itShowXiHaiAn
   const options = reactive({
@@ -956,6 +959,10 @@
       mapSearchParam.value.parentId = parentId
       getCamera()
     })
+    mybus.off('closeLoading')
+    mybus.on('closeLoading', (val) => {
+      spinning.value = val
+    })
     mybus.off('changeRoomInput')
     mybus.on('changeRoomInput', (val) => {
       console.log('更改=======》')

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

@@ -237,8 +237,6 @@ import { ElMessage } from 'element-plus'
       queryCameraConditionPlace(data) {
           let params = {
         placeTypeCode: data,
-        pageNum: "1",
-        pageSize: 40000,
         }
       CameraConditionPlaceType(params).then((res) => {
           this.addResourceTomap('videoMap', res.data.data)
@@ -294,7 +292,7 @@ import { ElMessage } from 'element-plus'
         if(this.addressType=='2'){
           mybus.emit('openOperationPopup', [item]);
         }else{
-          // this.hiMapFun.removeLayerByLayerName('potcon');
+          this.hiMapFun.removeLayerByLayerName('potcon');
           // this.hiMapFun.clearAllLayers();
           // this.getCameraAllPage()
           this.hiMapFun.addPointOnMap({feature:latLng,iconUrl:'poi-red.png',layerName:'potcon'})
@@ -384,9 +382,11 @@ import { ElMessage } from 'element-plus'
         if (!this.whoShow1.itShowXiHaiAn) {
           getCameraByParentId(this.mapSearchParam).then((res) => {
             console.log('根据parent查询摄像头', res.data.data)
+
             this.addResourceTomap('videoMap', res.data.data)
           })
         } else {
+          this.hiMapFun.mapFlyTo({lat:'36.017043',lng: '119.922772'}, 9)
             console.log('根据parent查询摄像头111111',this.mapSearchParam)
           let params = {
             regionId:
@@ -537,9 +537,6 @@ import { ElMessage } from 'element-plus'
       getCameraAllPage(page) {
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
-        // pageNum: "1",
-        // pageSize: 1000,
-        // type: 1,
         borderPolygonList: []
         }
         getCameraByCondition(params).then((res) => {