second commit

2025-12-25 18:33:15 +08:00
parent 78407f1cbd
commit 6a6ddba71a
34 changed files with 527 additions and 1226 deletions
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,10 @@ NODE_ENV = 'development'
 # 渔船点位
 VITE_WS_BASE_URL ='ws://220.185.188.222:8055/api/gisWs'

-VITE_APP_BASE_URL = 'http://125.124.131.105:6811/api'
-# VITE_APP_BASE_URL = 'http://119.167.138.11:7282/video-service'
+# VITE_APP_BASE_URL = 'http://125.124.131.105:6811/api'
+# 成彬本地
+VITE_APP_BASE_URL = 'http://100.95.157.241:6061/api'
+# VITE_APP_BASE_URL = 'http://119.167.138.11:6061/video-service'

 # 智能体访问地址 
 # 宋凯忠本地
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@ NODE_ENV = 'production'
 # 渔船点位
 VITE_WS_BASE_URL ='ws://100.95.225.221:6810/api/gisWs'

-VITE_APP_BASE_URL = 'http://125.124.131.105:6811/api'
+VITE_APP_BASE_URL = 'http://198.16.74.211:7284/api'
 # 智能体访问地址 
-VITE_APP_MODEL_URL = 'http://198.16.74.211:7282/zhinengti'
+VITE_APP_MODEL_URL = 'http://198.16.74.211:7284/zhinengti'
 # 海康播放插件配置
 VITE_APP_HAIKANG_SECRET = 'pvQSichVMqtLGh4Ltedo'
 VITE_APP_HAIKANG_APPKEY = '28273161'
--- a/src/api/identification.js
+++ b/src/api/identification.js
@@ -0,0 +1,132 @@
+import request from '@/utils/request'
+
+/**
+ * 分页查询渔船识别记录
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const videoIdentificationPage = (data) => {
+  return request({
+    url: '/videoIdentification/findByPage',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 渔船识别记录
+ * 修改
+ * @param data
+ * @returns {*}
+ */
+export const updateVideoIdentification = (data) => {
+  return request({
+    url: '/videoIdentification/updateVideoIdentification',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    }
+  })
+}
+/**
+ * 渔船识别记录
+ * 删除
+ * @param data
+ * @returns {*}
+ */
+export const removeVideoIdentification = (data) => {
+  return request({
+    url: '/videoIdentification/removeVideoIdentification',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    }
+  })
+}
+/**
+ * 实时预览-识别率
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getIdentityRate = (params) => {
+  return request({
+    url: `/videoIdentification/getIdentityRate?type=${params.type}`,
+    method: 'get'
+  })
+}
+/**
+ * 卡口流量趋势
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getPortTrend = () => {
+  return request({
+    url: '/videoIdentification/getPortTrend',
+    method: 'get'
+  })
+}
+/**
+ * 无人机执行次数
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getVAVOperateCount = () => {
+  return request({
+    url: '/videoIdentification/getVAVOperateCount',
+    method: 'get'
+  })
+}
+
+/**
+ * 卡口识别累计
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getPortIdentityTotal = () => {
+  return request({
+    url: '/videoIdentification/getPortIdentityTotal',
+    method: 'get'
+  })
+}
+/**
+ * 无人机识别累计
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getUAVIdentityTotal = () => {
+  return request({
+    url: '/videoIdentification/getUAVIdentityTotal',
+    method: 'get'
+  })
+}
+/**
+ * 航道流速信息
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getWaterwayVelocity = (params) => {
+  return request({
+    url: `/videoIdentification/getWaterwayVelocity?waterwayVelocity=${params.waterwayVelocity}`,
+    method: 'get'
+  })
+}
+/**
+ * 航道气象信息
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getWaterwayWeather = (params) => {
+  return request({
+    url: `/videoIdentification/getWaterwayWeather?waterwayVelocity=${params.waterwayVelocity}`,
+    method: 'get'
+  })
+}
--- a/src/api/login/index.js
+++ b/src/api/login/index.js
@@ -6,7 +6,7 @@ import request from '@/utils/request'
 */
 export const login = (data) => {
  return request({
-    url: '/validateLogin',
+    url: '/login',
    headers: {
      isToken: false,
      repeatSubmit: false
--- a/src/api/map/index.js
+++ b/src/api/map/index.js
@@ -18,9 +18,10 @@ export const findByCurrent = (data) => service({
 */
 export const findAISPointPositionByMmsi = (data) => {
  return service({
-    url: '/boatData/findAISPointPositionByMmsi',
+    url: '/aisSolr/findAISPointPositionByMmsi',
    method: 'post',
-    data: data
+    data: data,
+    timeout: 60000
  })
 }

--- a/src/api/uav.js
+++ b/src/api/uav.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+/**
+ * 获取视频流检测算法开关
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const videoStreamDetectSwitch = (data) => {
+  return request({
+    url: '/rest/drone/videoStreamDetectSwitch',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    }
+  })
+}
+
+/**
+ * 获取视频流地址
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const getVideoStream = (data) => {
+  return request({
+    url: '/rest/drone/getVideoStream',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    }
+  })
+}
+
+/**
+ * 开启/关闭算法
+ * 查询
+ * @param data
+ * @returns {*}
+ */
+export const doStartOrStopUavAlgorithm = (data) => {
+  return request({
+    url: '/rest/drone/doStartOrStopUavAlgorithm',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    }
+  })
+}
--- a/src/assets/images/common/icon-triangle.png
+++ b/src/assets/images/common/icon-triangle.png
--- a/src/components/Map/index.vue
+++ b/src/components/Map/index.vue
@@ -113,12 +113,35 @@ const addMonitorToMap = () => {
          id: item.id,
          symbol: $configs.getDevicePointSymbol('_monitor', { ...item, name: item.videoName }),
          properties: item,
-          zIndex: 1
+          zIndex: 2
        }
      )
      marker.addTo(vector.monitor)
      drawSector('_monitor', [ item.longitude, item.latitude ], 5 * 1000, item.id, 30)
      marker.on('click', (evt) => {
+        // 先隐藏所有扇形
+        changeSectorsInLayer('sectors_monitor', false)
+
+        // 确保扇形图层是可见的
+        if (!vector.sectors_monitor.isVisible()) {
+          vector.sectors_monitor.show()
+        }
+
+        // 显示当前点击项的所有相关扇形（圆、椭圆、线）
+        const baseId = `sector__monitor${item.id}`
+        const circleGeometry = vector.sectors_monitor.getGeometryById(baseId + '_circle')
+        const ellipseGeometry = vector.sectors_monitor.getGeometryById(baseId + '_ellipse')
+        const lineGeometry = vector.sectors_monitor.getGeometryById(baseId + '_line')
+
+        if (circleGeometry) {
+          circleGeometry.show()
+        }
+        if (ellipseGeometry) {
+          ellipseGeometry.show()
+        }
+        if (lineGeometry) {
+          lineGeometry.show()
+        }
        mapStore.updateWindowInfo({ visible: true, type: '_monitor', data: { ...item } })
      })
    }
@@ -144,18 +167,46 @@ const addUAVToMap = () => {
          id: item.id,
          symbol: $configs.getDevicePointSymbol('_UAV', { ...item, name: item.videoName }),
          properties: item,
-          zIndex: 1
+          zIndex: 2
        }
      )
      marker.addTo(vector.UAV)
      drawSector('_UAV', [ item.longitude, item.latitude ], 5 * 1000, item.id)
      marker.on('click', (evt) => {
+        // 先隐藏所有扇形
+        changeSectorsInLayer('sectors_UAV', false)
+
+        // 确保扇形图层是可见的
+        if (!vector.sectors_UAV.isVisible()) {
+          vector.sectors_UAV.show()
+        }
+
+        // 显示当前点击项的所有相关扇形（圆、椭圆、线）
+        const baseId = `sector__UAV${item.id}`
+        const circleGeometry = vector.sectors_UAV.getGeometryById(baseId + '_circle')
+
+        if (circleGeometry) {
+          circleGeometry.show()
+        }
        mapStore.updateWindowInfo({ visible: true, type: '_UAV', data: { ...item } })
      })
    }
  })
  vector.UAV.show()
 }
+// 添加辅助函数来隐藏所有扇形
+const changeSectorsInLayer = (layerName, show) => {
+  if (vector[layerName]) {
+    const allGeometries = vector[layerName].getGeometries()
+    allGeometries.forEach(geometry => {
+      if(show) {
+        geometry.show()
+      }else{
+        geometry.hide()
+      }
+    })
+  }
+}
 // 需要监控的起始角度和结束角度,修改视野范围可以传递经纬度坐标
 const drawSector = (type, center, radius, id, angle) => {
  const sectorId = `sector_${type}${id}`
@@ -171,7 +222,7 @@ const drawSector = (type, center, radius, id, angle) => {
  }

  let circle = new maptalks.Circle(center, radius, {
-     id: sectorId,
+    id: sectorId + '_circle',
    symbol: {
      lineColor: '#1CA8FF',
      lineWidth: 1,
@@ -182,12 +233,14 @@ const drawSector = (type, center, radius, id, angle) => {
  })
  if(angle) {
    let ellipse = new maptalks.Sector(center, radius - 1 * 1000, angle - 30, angle + 30, {
+      id: sectorId + '_ellipse',
      symbol: {
        lineColor: '#FF8D1C',
        polygonFill: '#ff8d1c29'
      }
    })
    let line = new maptalks.Sector(center, radius + 1 * 1000, angle, angle, {
+      id: sectorId + '_line',
      symbol: {
        lineColor: '#FF8D1C',
        polygonFill: '#ff8d1c29',
@@ -199,7 +252,8 @@ const drawSector = (type, center, radius, id, angle) => {
    vector['sectors' + type].addGeometry(circle)
  }
  // 添加到可视域图层
-    vector['sectors' + type].hide()
+  changeSectorsInLayer('sectors' + type, false)
+    // vector['sectors' + type].hide()
  }
 /**
 * 叠加ais基站数据
@@ -219,7 +273,7 @@ const addAisStationToMap = () => {
          id: item.id,
          symbol: $configs.getDevicePointSymbol('_ais_station', { ...item }),
          properties: item,
-          zIndex: 1
+          zIndex: 2
        }
      )
      marker.addTo(vector.ais_station)
@@ -247,7 +301,7 @@ const addEnvironmentalToMap = () => {
          id: item.id,
          symbol: $configs.getDevicePointSymbol('_environmental', { ...item }),
          properties: item,
-          zIndex: 1
+          zIndex: 2
        }
      )
      marker.addTo(vector.environmental)
@@ -336,18 +390,22 @@ watch(() => fence.value, () => {
 watch(() => sector.value.monitor, (newVal) => {
  if(vector.sectors_monitor) {
    if(newVal) {
-      vector.sectors_monitor.show()
+      // vector.sectors_monitor.show()
+      changeSectorsInLayer('sectors_monitor', true)
    } else {
-      vector.sectors_monitor.hide()
+      // vector.sectors_monitor.hide()
+      changeSectorsInLayer('sectors_monitor', false)
    }
  }
 })
 watch(() => sector.value.UAV, (newVal) => {
  if(vector.sectors_UAV) {
    if(newVal) {
-      vector.sectors_UAV.show()
+      // vector.sectors_UAV.show()
+      changeSectorsInLayer('sectors_UAV', true)
    } else {
-      vector.sectors_UAV.hide()
+      // vector.sectors_UAV.hide()
+      changeSectorsInLayer('sectors_UAV', false)
    }
  }
 })
@@ -425,6 +483,8 @@ onUnmounted(() => {
  border-radius: 0;
  padding: 0;
  .el-dialog__header{
+    display: flex;
+    justify-content: space-between;
    padding: 0 16px;
    background: linear-gradient(0deg, rgba(10, 169, 255, 0) 0%, rgba(10, 169, 255, 0.5) 100%);
    .title{
--- a/src/components/Map/lbtbox/boatTerminal.js
+++ b/src/components/Map/lbtbox/boatTerminal.js
@@ -54,16 +54,16 @@ const setStyleToBoatLayer = (key, zIndex) => {
                type: 'interval',
                stops: [
                  [ 5, 5 ],
-                  [ 10, 10 ],
-                  [ 11, 0 ]
+                  [ 10, 10 ]
+                  // [ 11, 0 ]
                ]
              },
              markerHeight: {
                type: 'interval',
                stops: [
                  [ 5, 10 ],
-                  [ 10, 20 ],
-                  [ 11, 0 ]
+                  [ 10, 20 ]
+                  // [ 11, 0 ]
                ]
              },
              markerFill: {
--- a/src/components/Map/map-config.js
+++ b/src/components/Map/map-config.js
@@ -2,7 +2,8 @@ import { getAssetsFile } from '@/utils/common'
 // 底图配置
 const baseLayerConfig = {
  baseConfig: {
-    satellite: [ 'tdt_image', 'tdt_cia' ],
+    // satellite: [ 'tdt_image', 'tdt_cia' ],
+    satellite: [ 'tdt_image' ],
    sea: [ 'sea' ],
    light: [ 'light' ],
    dark: [ 'tdt_ter', 'tdt_tbo', 'tdt_cta' ]
@@ -39,7 +40,8 @@ const baseLayerConfig = {
      maxAvailableZoom: 18,
      subdomains: [ '0', '1', '2', '3', '4', '5', '6', '7' ],
      urlTemplate:
-        'https://inner.qdlimap.cn:9443/gisAssistant/wmts/grid_tile/tianditu/img_w/{z}/{y}/{x}'
+      'http://198.16.74.211:5000/{z}/{x}/{y}.png'
+        // 'https://inner.qdlimap.cn:9443/gisAssistant/wmts/grid_tile/tianditu/img_w/{z}/{y}/{x}'
    },
    tdt_tbo: {
      max: 18,
--- a/src/components/Map/window/index.vue
+++ b/src/components/Map/window/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <DialogComponent @mousedown="drag" :style="{ resize: 'both', overflow: 'auto' }" v-if="visible && option[type]" :title="option[type].title" :width="type==='_UAV' ? 1800:395" :draggable="true" :modal="false" @close="close">
+  <DialogComponent @mousedown="drag" @resize="handleResize" :style="{ resize: 'both', overflow: 'auto' }" v-if="visible && option[type]" :title="option[type].title" :width="type==='_UAV' ? 1800:395" :draggable="true" :modal="false" @close="close">
    <component :is="option[type].component" ref="component"/>
  </DialogComponent>
 </template>
@@ -11,7 +11,7 @@ import MonitorComponent from './monitor.vue'
 import UAVComponent from './uav.vue'
 import MeteorologyComponent from './meteorology.vue'
 import useMapStore from '@/store/modules/map'
-import { dragEvent } from '@/utils/common'
+import { dragEvent, resizeEvent } from '@/utils/common'

 const mapStore = useMapStore()

@@ -43,12 +43,22 @@ const close = () => {
 *
 */
 const drag = (e) => {
+  if(e.target.className.includes('el-dialog-title')) {
     dragEvent(e, 'el-dialog-title', () => {
      if(component.value.HikCCTV) {
        component.value.HikCCTV.initResize(false)
      }
    })
+  }else{
+    resizeEvent(e, 'el-dialog', () => {
+      if(component.value?.HikCCTV) {
+        component.value.HikCCTV.initResize()
+      }
+    })
+  }
+
 }
+
 </script>

 <style lang="scss" scoped>
--- a/src/components/Map/window/monitor.vue
+++ b/src/components/Map/window/monitor.vue
@@ -169,7 +169,8 @@ defineExpose({
  }
 }
 .monitor-cctv{
-    height: 289px;
+    min-height: 289px;
    width: 100%;
+    height: -webkit-fill-available;
 }
 </style>=>
--- a/src/components/Map/window/trawler.vue
+++ b/src/components/Map/window/trawler.vue
@@ -205,10 +205,8 @@ const handleExitServo = () => {
 const handleTrack = () => {
  globalMap = GlobalMap.instance
  findAISPointPositionByMmsi({ mmsi: data.value.terminalCode }).then(res => {
-    if (res.success) {
-      const arr = res.result[data.value.terminalCode]
+      const arr = res.data[data.value.terminalCode]
      new ShipPathInMap(globalMap.map, globalMap.map.getLayer('track'), formatTrackData(arr))
-    }
  }).finally(() => {
    mapStore.updateWindowInfo(false)
  })
--- a/src/components/Player/HikPlayer-back.vue
+++ b/src/components/Player/HikPlayer-back.vue
@@ -308,7 +308,7 @@ export default {
      //列表选项在下方
      this.width = document.getElementsByClassName(
        this.videoWindowClassName
-      )[0].scrollWidth;
+      )[0].clientWidth;
      var btnHeight = 0;
      if (document.getElementsByClassName("playBtn").length > 0) {
        btnHeight = document.getElementsByClassName("playBtn")[0].clientHeight;
--- a/src/components/Player/HikPlayer.vue
+++ b/src/components/Player/HikPlayer.vue
@@ -296,13 +296,13 @@ const destroy = () => {

 const windowChange = () => {
  // 列表选项在下方
-  width = document.getElementsByClassName(`video-window${props.id}`)[0].scrollWidth
+  width = document.getElementsByClassName(`video-window${props.id}`)[0].clientWidth
  let btnHeight = 0
  if (document.getElementsByClassName('playBtn').length > 0) {
    btnHeight = document.getElementsByClassName('playBtn')[0].clientHeight
    height = document.getElementsByClassName(`video-window${props.id}`)[0].scrollHeight - btnHeight - 10
  } else {
-    height = document.getElementsByClassName(`video-window${props.id}`)[0].scrollHeight
+    height = document.getElementsByClassName(`video-window${props.id}`)[0].clientHeight
  }
  if (document.getElementById(`playWnd${props.id}`)) {
    document.getElementById(`playWnd${props.id}`).style.height = `${height}px`
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -26,8 +26,13 @@ const useMapStore = defineStore(
        level: 1,
        data: {}
      },
-      dialogVisible: {
+      dialog: {
+        visible: false,
        type: '' // 弹窗类型 alarm/CCTV/UAV
+      },
+      // 无人机信息
+      uavs: {
+        data: {}
      }
    }),
    actions: {
@@ -51,8 +56,13 @@ const useMapStore = defineStore(
        this.hik.level = level
        this.hik.data = data
      },
-      updateDialog(type) {
-        this.dialogVisible.type = type
+      updateDialog(option) {
+        const { visible = false, type = '' } = option
+        this.dialog.visible = visible
+        this.dialog.type = type
+      },
+      updateUavData(option) {
+        this.uavs.data = option
      }
    }
  })
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -191,6 +191,71 @@ export function dragEvent(e, className, moving, moveEnd) {
    }
  }
 }
+export function resizeEvent(e, className, resizing, resizeEnd) {
+  if (e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'svg' || e.target.nodeName === 'path') {
+    return
+  }
+  if (className && !e.target.className.includes(className)) {
+    return
+  }
+
+  const dialogElement = e.target.closest('.el-dialog') || e.target // 获取对话框元素
+  if (!dialogElement) {
+return
+}
+
+  const startX = e.clientX
+  const startY = e.clientY
+  const startWidth = parseInt(document.defaultView.getComputedStyle(dialogElement).width, 10)
+  const startHeight = parseInt(document.defaultView.getComputedStyle(dialogElement).height, 10)
+
+  // 防止文本在拖拽过程中被选中
+  document.body.style.userSelect = 'none'
+
+  document.onmousemove = (e) => {
+    const newWidth = startWidth + (e.clientX - startX)
+    const newHeight = startHeight + (e.clientY - startY)
+
+    // 设置最小宽度和高度限制
+    const minWidth = 200
+    const minHeight = 150
+    const width = Math.max(newWidth, minWidth)
+    const height = Math.max(newHeight, minHeight)
+
+    dialogElement.style.width = `${width}px`
+    dialogElement.style.height = `${height}px`
+
+    // 同时调整 el-dialog__body 的尺寸
+    const dialogBody = dialogElement.querySelector('.el-dialog__body')
+    if (dialogBody) {
+      // 计算头部和底部的高度（通常为固定值）
+      const dialogHeader = dialogElement.querySelector('.el-dialog__header')
+      const dialogFooter = dialogElement.querySelector('.el-dialog__footer')
+
+      let headerHeight = dialogHeader ? dialogHeader.offsetHeight : 56 // 默认头部高度
+      let footerHeight = dialogFooter ? dialogFooter.offsetHeight : 0 // 默认底部高度
+
+      const bodyHeight = height - headerHeight - footerHeight - 20 // 20px 为上下边距
+
+      dialogBody.style.height = `${bodyHeight}px`
+      dialogBody.style.width = 'calc(100% - 20px)' // 减去左右边距
+    }
+
+    if (resizing) {
+      resizing({ width, height })
+    }
+  }
+
+  document.onmouseup = (e) => {
+    // 恢复文本选择功能
+    document.body.style.userSelect = ''
+    document.onmousemove = null
+    document.onmouseup = null
+    if (resizeEnd) {
+      resizeEnd()
+    }
+  }
+}
 /**
 * @param value 将十进制转为度分秒
 * @returns { degrees: number, minutes: number, seconds: number } degrees:度 minutes:分 seconds:秒
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,7 +21,7 @@ const service = axios.create({
  // axios中请求配置有baseURL选项，表示请求URL公共部分
  baseURL: import.meta.env.VITE_APP_BASE_URL,
  // 超时
-  timeout: 10000
+  timeout: 20000
 })

 // request拦截器
@@ -102,7 +102,7 @@ service.interceptors.response.use(res => {
  } else if (code === 601) {
    ElMessage({ message: msg, type: 'warning' })
    return Promise.reject(new Error(msg))
-  } else if (code !== 200) {
+  } else if (code != 200) {
    ElNotification.error({ title: msg })
    return Promise.reject('error')
  }
--- a/src/views/business/alarm/device.vue
+++ b/src/views/business/alarm/device.vue
@@ -9,7 +9,7 @@ import useMapStore from '@/store/modules/map'

 const mapStore = useMapStore()
 const handle = (type) => {
-  mapStore.updateDialog(type)
+  mapStore.updateDialog({ visible: true, type })
 }
 </script>
 <style scoped lang="scss">
--- a/src/views/business/alarm/list.vue
+++ b/src/views/business/alarm/list.vue
@@ -111,7 +111,7 @@ const toggle = (index) => {
 const handle = (type, item) => {
  switch (type) {
    case 'more':
-      mapStore.updateDialog('alarm')
+      mapStore.updateDialog({ visible: true, type: 'alarm' })
      break
    default:
      break
--- a/src/views/business/alarm/monitor.vue
+++ b/src/views/business/alarm/monitor.vue
@@ -7,7 +7,6 @@
            @click="handle(index)">{{item}}</div>
    </div>
    <!-- <div class="flv-container"><FlvPlayerComponent :url="uavDialog.url"/></div> -->
-     <video class="flv-container" :src="getAssetsFile('alarm/mock2.mp4')" autoplay controls muted loop></video>
  </div>
 </template>
 <script setup>
--- a/src/views/business/drone/control.vue
+++ b/src/views/business/drone/control.vue
--- a/src/views/business/drone/device.vue
+++ b/src/views/business/drone/device.vue
@@ -1,389 +0,0 @@
-<template>
-  <div class="device-wrapper">
-
-    <div :class="['device-content', isFold ? 'fold' : '']">
-      <div class="tab-wrapper">
-        <div :class="['tab-button', current === index ? 'active' : '']" v-for="(item, index) in tabs" :key="index"
-          @click="toggleDevice(index)">{{ item.label }}</div>
-      </div>
-      <div class="list-wrapper">
-        <template v-if="current === 0">
-          <el-tree :data="tableData" ref="treeRef" :props="{ label: 'videoName', children: 'children' }" node-key="id"
-            @node-click="handleNodeClick">
-            <template v-slot="{ node }">
-              <img src="@/assets/images/livePreview/icon-monitor.png" alt="">
-              <span>{{ node.label }}</span>
-            </template>
-          </el-tree>
-        </template>
-        <template v-else>
-          <div class="list-item" v-for="item in tableData" :key="item.id" @click="handleDevice(item)">
-            <span>{{ item.videoName }}</span>
-          </div>
-        </template>
-      </div>
-
-    </div>
-    <div class="fold-button" @click="toggleFold">
-      <template v-if="isFold">
-        <span>展开</span>
-        <img src="@/assets/images/drone/icon-arrow-right.png" alt="">
-      </template>
-      <template v-else>
-        <span>收起</span>
-        <img src="@/assets/images/drone/icon-arrow-left.png" alt="">
-      </template>
-    </div>
-  </div>
-
-</template>
-
-<script setup>
-import { ref, reactive, watch } from 'vue'
-import { videoCameraFindPage, findUavPage, findEnvPage } from '@/api/device.js'
-import { Message } from '@element-plus/icons-vue'
-
-const preview = reactive({
-  visible: false,
-  codes: []
-})
-
-const current = ref(1)
-const isFold = ref(false)
-
-const tabs = [
-  {
-    label: '监控设备',
-    value: 'monitor'
-  },
-  {
-    label: '无人机设备',
-    value: 'plane'
-  },
-  {
-    label: '环境监测设备',
-    value: 'environment'
-  },
-  {
-    label: '感知设备',
-    value: 'AIS'
-  }
-]
-const tableData = ref([])
-
-const initMonitor = () => {
-  const params = new FormData()
-  params.append('pageNo', 1)
-  params.append('pageSize', 999)
-  videoCameraFindPage(params).then(res => {
-    if (res.success) {
-      const data = res.result.records
-      const groupedData = {}
-      data.forEach(item => {
-        const belong = item.videoBelong
-        if (!groupedData[belong]) {
-          groupedData[belong] = []
-        }
-        groupedData[belong].push(item)
-      })
-
-      // 转换为树形结构
-      const result = Object.keys(groupedData).map(belong => {
-        const children = groupedData[belong]
-        if (children.length === 1) {
-          // 只有一个子元素，直接返回该子元素
-          return children[0]
-        }
-        // 有多个子元素，返回分组节点
-        return {
-          videoName: belong,
-          children: children
-        }
-
-      })
-
-      tableData.value = result
-    } else {
-      Message.error(res.msg || '查询失败！')
-    }
-  })
-}
-const initPlane = () => {
-  const params = new FormData()
-  params.append('pageNo', 1)
-  params.append('pageSize', 999)
-  findUavPage(params).then(res => {
-    if (res.success) {
-      tableData.value = res.result.records
-    } else {
-      Message.error(res.msg || '查询失败！')
-    }
-  })
-}
-const initEnvironment = () => {
-  const params = new FormData()
-  params.append('pageNo', 1)
-  params.append('pageSize', 999)
-  params.append('videoType', '航道流速设备,气象观测站设备')
-  findEnvPage(params).then(res => {
-    if (res.success) {
-      tableData.value = res.result.records
-    } else {
-      Message.error(res.msg || '查询失败！')
-    }
-  })
-}
-const initAIS = () => {
-  const params = new FormData()
-  params.append('pageNo', 1)
-  params.append('pageSize', 999)
-  params.append('videoType', 'AIS基站设备')
-  findEnvPage(params).then(res => {
-    if (res.success) {
-      tableData.value = res.result.records
-    } else {
-      Message.error(res.msg || '查询失败！')
-    }
-  })
-}
-const initMap = {
-  'monitor': initMonitor,
-  'plane': initPlane,
-  'environment': initEnvironment,
-  'AIS': initAIS
-}
-
-const initData = () => {
-  tableData.value = []
-  const tabValue = tabs[current.value].value
-  const initFunction = initMap[tabValue]
-  if (initFunction) {
-    try {
-      initFunction()
-    } catch (error) {
-      console.error(error)
-    }
-  }
-}
-const toggleDevice = (index) => {
-  current.value = index
-}
-const handleDevice = (item) => {
-  preview.visible = true
-}
-const handleNodeClick = (node) => {
-  if (!node.children || node.children.length === 0) {
-    // 雷云一体机一个视频
-    if (node.videoName.indexOf('雷云') !== -1) {
-      preview.codes = ['0f69d447002a40629e15f8a251fc46fa']
-    } else {
-      preview.codes = ['b7f9fff8e3504e419cb2f5fad5b2845c', '9b49bdc8988e430baad9ca727fed545a', 'e0a42cd6cbf940a6a4fc0aa789d43a04']
-    }
-    preview.visible = true
-  }
-}
-
-const toggleFold = () => {
-  isFold.value = !isFold.value
-}
-
-watch(() => current.value, () => {
-  initData()
-}, { immediate: true })
-
-
-</script>
-
-<style lang="scss" scoped>
-.device-wrapper {
-  position: absolute;
-  left: 45px;
-  top: 89px;
-  bottom: 411px;
-
-  .device-content {
-    width: 401px;
-    height: 100%;
-    padding: 10px;
-    background: linear-gradient( 90deg, #0C1929 0%, rgba(12,25,41,0.6) 100%);
-    border-radius: 0px 0px 0px 0px;
-    border: 1px solid;
-    border-image: linear-gradient(270deg, rgba(42, 159, 255, 0.2), rgba(42, 159, 255, 0.8)) 1 1;
-    box-sizing: border-box;
-    display: flex;
-    gap: 6px;
-    opacity: 1;
-    visibility: visible;
-    transition: all 0.3s ease-in-out;
-
-    &.fold {
-      width: 0;
-      overflow: hidden;
-      opacity: 0;
-      visibility: hidden;
-    }
-
-    .tab-wrapper {
-      width: 28px;
-      height: 100%;
-
-      .tab-button {
-        position: relative;
-        width: 100%;
-        height: 25%;
-        // height: 130px;
-        color: #FFFFFF;
-        font-size: 12px;
-        text-align: center;
-        line-height: 28px;
-        writing-mode: vertical-rl;
-        text-orientation: upright;
-        background-color: #2061bd;
-        border-radius: 3px 0 0 28px;
-        cursor: pointer;
-        margin-bottom: -7px;
-        opacity: .6;
-
-        &:not(:first-of-type) {
-          border-radius: 0 28px 0 28px;
-
-          &::before {
-            content: '';
-            display: block;
-            width: 28px;
-            height: 28px;
-            position: absolute;
-            background: radial-gradient(circle at 28px 3px, transparent 28px, #2162bd 28px);
-            top: -24px;
-            left: 0;
-          }
-        }
-
-        &::after {
-          content: '';
-          display: block;
-          width: 28px;
-          height: 28px;
-          position: absolute;
-          background: radial-gradient(circle at 0px 25px, transparent 28px, #2061bd 28px);
-          bottom: -24px;
-          right: 0;
-        }
-
-        &.active {
-          background-color: #2061BD;
-          opacity: 1;
-        }
-      }
-    }
-
-    .list-wrapper {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      gap: 4px;
-      overflow: auto;
-      background: transparent;
-
-      .list-item {
-        width: 100%;
-        height: 44px;
-        padding-left: 20px;
-        background-color: rgba(24, 128, 254, 0.3);
-        border-radius: 3px 3px 3px 3px;
-        font-size: 14px;
-        color: #E1F1FAFF;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        border: 1px solid rgba(24, 128, 254, 0);
-        flex-shrink: 0;
-        cursor: pointer;
-
-        &::before {
-          content: '';
-          display: inline-block;
-          width: 16px;
-          height: 16px;
-          background-image: url('@/assets/images/livePreview/icon-monitor.png');
-          background-size: 100% 100%;
-          background-repeat: no-repeat;
-          margin-right: 10px;
-        }
-
-        &.active,
-        &:hover {
-          color: #0EF8F8FF;
-          background-color: rgba(24, 128, 254, 0.5);
-          border: 1px solid #5FA4FF;
-
-          &::before {
-            background-image: url('@/assets/images/livePreview/icon-monitor-active.png');
-          }
-        }
-      }
-
-      .el-tree {
-        background: transparent;
-      }
-
-      :deep(.el-tree-node) {
-        width: 100%;
-        margin-bottom: 4px;
-        background-color: rgba(24, 128, 254, 0.3);
-        border-radius: 3px 3px 3px 3px;
-        font-size: 14px;
-        align-items: center;
-        box-sizing: border-box;
-        border: 1px solid rgba(24, 128, 254, 0);
-        flex-shrink: 0;
-        cursor: pointer;
-
-        .el-tree-node__content {
-          height: 44px;
-          border: 1px solid transparent;
-          box-sizing: border-box;
-        }
-
-        img {
-          margin-right: 10px;
-        }
-
-        span {
-          color: #E1F1FAFF;
-        }
-
-        &:focus>.el-tree-node__content,
-        .el-tree-node__content:hover {
-          color: #0EF8F8FF;
-          background-color: rgba(24, 128, 254, 0.5);
-          border: 1px solid #5FA4FF;
-
-          &::before {
-            background-image: url('@/assets/images/livePreview/icon-monitor-active.png');
-          }
-        }
-      }
-    }
-
-  }
-  .fold-button {
-    position: absolute;
-    right: -17px;
-    top: 0;
-    width: 17px;
-    height: 82px;
-    background-image: url('@/assets/images/drone/subscript-background-vertical.png');
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    color: #FFFFFFCC;
-    font-size: 12px;
-    cursor: pointer;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    visibility: visible;
-  }
-}
-</style>
--- a/src/views/business/drone/index.vue
+++ b/src/views/business/drone/index.vue
@@ -1,16 +0,0 @@
-<template>
-  <div>
-    <DeviceComponent/>
-    <ControlComponent/>
-  </div>
-</template>
-
-<script setup>
-import DeviceComponent from './device.vue'
-import ControlComponent from './control.vue'
-
-</script>
-
-<style lang="scss" scoped>
-
-</style>
--- a/src/views/business/identification/alarm/index.vue
+++ b/src/views/business/identification/alarm/index.vue
@@ -90,7 +90,7 @@ import FilterCom from '@/components/Filter/index.vue'
 import { nextTick, onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from 'vue'
 import TableComponent from '@/components/Table/index2.vue'
 import TitleComponent from '@/components/Title/index.vue'
-// import { videoIdentificationPage, removeVideoIdentification } from '@/api/identification.js'
+import { videoIdentificationPage, removeVideoIdentification } from '@/api/identification.js'
 import HikPlayerBackCom from '@/components/Player/HikPlayer-back.vue'
 import { dayjs, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute } from 'vue-router'
@@ -337,20 +337,20 @@ const edit = reactive({

 const initData = () => {
  loading.value = true
-  const params = new FormData()
-  const obj = {
-    ...model,
-    // illegalType: illegalType.value.join(','),
-    illegalType: illegalType.value,
-    beginTime: model.time && model.time[0] ? model.time[0] : '',
-    endTime: model.time && model.time[1] ? model.time[1] : '',
-    pageNo: pagination.current,
-    pageSize: pagination.size
-  }
-  delete obj.time
-  Object.keys(obj).forEach((key) => {
-    params.append(key, obj[key])
-  })
+  // const params = new FormData()
+  // const obj = {
+  //   ...model,
+  //   // illegalType: illegalType.value.join(','),
+  //   illegalType: illegalType.value,
+  //   beginTime: model.time && model.time[0] ? model.time[0] : '',
+  //   endTime: model.time && model.time[1] ? model.time[1] : '',
+  //   pageNo: pagination.current,
+  //   pageSize: pagination.size
+  // }
+  // delete obj.time
+  // Object.keys(obj).forEach((key) => {
+  //   params.append(key, obj[key])
+  // })
  // videoIdentificationPage(params).then(res => {
  //   if (res.success) {
  //     tableData.value = res.result.records.map(i => {
@@ -368,7 +368,7 @@ const initData = () => {
  //     // 有识别记录数据，默认查看第一条详情
  //     handle('check', res.result.total > 0 ? tableData.value[0] : {})
  //   } else {
-  //     Message.error(res.msg || '查询失败！')
+  //     ElMessage.error(res.msg || '查询失败！')
  //   }
  // }).finally(() => {
    loading.value = false
@@ -464,7 +464,6 @@ const handle = (type, data) => {
    }
    case 'check': {
      closeVideo()
-      console.log(data, 'datatata')
      detail.data = [ { ...data,
        videoName: '',
        trackerPicPath: data.trackerPicPath.split(',')
@@ -497,10 +496,10 @@ const handle = (type, data) => {
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
-        // removeVideoIdentification({ id: data.id }).then(() => {
-        //   ElMessage.success('删除成功')
-        //   initData()
-        // })
+        removeVideoIdentification({ id: data.id }).then(() => {
+          ElMessage.success('删除成功')
+          initData()
+        })
      })
      break
    default:
@@ -538,6 +537,9 @@ onBeforeUnmount(() => {
  closeVideo()

 })
+defineExpose({
+  appPlayer
+})
 </script>
 <style scoped lang="scss">
 .content-container{
--- a/src/views/business/identification/index.vue
+++ b/src/views/business/identification/index.vue
@@ -1,25 +1,44 @@
 <template>
  <!-- 识别记录页面 -->
-  <DialogComponent :style="{ resize: 'both', overflow: 'auto' }" v-if="type === 'alarm'" title="识别记录" width="1800" :draggable="true" :modal="false" @close="close">
-     <AlarmCom/>
+  <DialogComponent @mousedown="drag" :style="{ resize: 'both', overflow: 'auto' }" title="识别记录" width="1800" :draggable="true" :modal="false" @close="close">
+     <AlarmCom ref="alarm"/>
  </DialogComponent>
 </template>
 <script setup>
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import DialogComponent from '@/components/Dialog/screen.vue'
 import AlarmCom from './alarm/index.vue'
 import { useRouter } from 'vue-router'
 import useMapStore from '@/store/modules/map'
+import { dragEvent, resizeEvent } from '@/utils/common'

 const mapStore = useMapStore()
 const router = useRouter()
-const type = computed(() => mapStore.dialogVisible.type)
-
+const alarm = ref(null)
 const close = () => {
-  mapStore.updateDialog('')
-  router.back()
+  mapStore.updateDialog(false)
 }
+/**
+ * 拖拽事件
+ * @param e
+ *
+ */
+ const drag = (e) => {
+  if(e.target.className.includes('el-dialog-title')) {
+     dragEvent(e, 'el-dialog-title', () => {
+      if(alarm.value.appPlayer) {
+        alarm.value.appPlayer[0].onResize(false)
+      }
+    })
+  }else{
+    resizeEvent(e, 'el-dialog', () => {
+      if(alarm.value?.appPlayer) {
+        alarm.value.appPlayer[0].onResize()
+      }
+    })
+  }

+}
 </script>
 <style scoped lang="scss">
 .el-tabs {
--- a/src/views/business/index.vue
+++ b/src/views/business/index.vue
@@ -7,8 +7,8 @@
    </div>
    <Alarm/>
    <LargeModelCom v-if="largeModel"/>
-    <IdentificationCom/>
-    <WallCom/>
+    <IdentificationCom v-if="visible && type === 'alarm'"/>
+    <WallCom v-if="visible && (type==='CCTV'|| type==='UAV')"/>
  </div>
 </template>
 <script setup>
@@ -25,6 +25,8 @@ const mapStore = useMapStore()
 const largeModel = computed(() => {
  return mapStore.largeModel
 })
+const visible = computed(() => mapStore.dialog.visible)
+const type = computed(() => mapStore.dialog.type)
 window.name = 'business_window'
 </script>

@@ -203,7 +205,7 @@ window.name = 'business_window'
      position: absolute;
      right: 7px;
      i:not(.el-select__clear) {
-        background: url("@/assets/images/common/icon_suffix.png") center center no-repeat;
+        // background: url("@/assets/images/common/icon_suffix.png") center center no-repeat;
        background-size: 8px 6px;
        width: 8px;
        height: 6px;
@@ -231,7 +233,7 @@ window.name = 'business_window'
      right: 7px;
      top: 13px;
      .el-input__suffix-inner{
-        background: url("@/assets/images/common/icon_suffix.png") center center no-repeat;
+        // background: url("@/assets/images/common/icon_suffix.png") center center no-repeat;
        background-size: 8px 6px;
        width: 8px;
        height: 6px;
--- a/src/views/business/largeModel/history.vue
+++ b/src/views/business/largeModel/history.vue
@@ -22,7 +22,7 @@

 <script setup>
 import { nextTick, onMounted, onUnmounted, ref } from 'vue'
-// import { getHistory } from '@/api/model'
+import { getHistory } from '@/api/model'
 import axios from 'axios'

 const emit = defineEmits([ 'changeDialog' ])
@@ -34,15 +34,15 @@ const show = ref(true)
 let resizeObserver = null

 const initList = () => {
-  // axios.get(getHistory, {}, {
-  //   headers: {
-  //     'Content-Type': 'application/json'
-  //   }
-  // }).then((res) => {
-  //   if(res.status === 200) {
-  //     list.value = res.data.reverse()
-  //   }
-  // })
+  axios.get(getHistory, {}, {
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  }).then((res) => {
+    if(res.status === 200) {
+      list.value = res.data.reverse()
+    }
+  })
 }
 const toggleExpand = () => {
  collapse.value = !collapse.value
--- a/src/views/business/largeModel/index.vue
+++ b/src/views/business/largeModel/index.vue
@@ -51,7 +51,7 @@ import { initResizeDetection, cleanupAndRestoreHik
 import HikPlayerComponent from '@/components/Player/HikPlayer.vue'
 import FlvPlayerComponent from '@/components/FlvPlayer/index.vue'
 import { dragEvent } from '@/utils/common'
-// import { getVideoStream, doStartOrStopUavAlgorithm } from '@/api/uav'
+import { getVideoStream, doStartOrStopUavAlgorithm } from '@/api/uav'
 import { ElMessage } from 'element-plus'
 import useMapStore from '@/store/modules/map'

@@ -123,13 +123,13 @@ const openUav = (data) => {
      sn: data.droneSn,
      enable_orc: false
    }
-    // getVideoStream(params).then(res => {
-    //   if(res.success) {
-    //     setTimeout(() => {
-    //       uavDialog.url = res.result.httpUrl
-    //     }, 10000)
-    //   }
-    // })
+    getVideoStream(params).then(res => {
+      if(res.success) {
+        setTimeout(() => {
+          uavDialog.url = res.result.httpUrl
+        }, 10000)
+      }
+    })
  }, 20000)
 }
 // 开启/关闭算法
@@ -150,14 +150,14 @@ const handleAlgorithm = () => {
      status: 'start',
      sn: uavData.value.droneSn
    }
-    // doStartOrStopUavAlgorithm(params).then(res => {
-    //   if(res.success) {
-    //     algorithmStatus.value = true
-    //     ElMessage.success('算法已开启')
-    //   }else {
-    //     ElMessage.error(res.result)
-    //   }
-    // })
+    doStartOrStopUavAlgorithm(params).then(res => {
+      if(res.success) {
+        algorithmStatus.value = true
+        ElMessage.success('算法已开启')
+      }else {
+        ElMessage.error(res.result)
+      }
+    })
  }
 }
 // 算法关闭
@@ -166,15 +166,15 @@ const closeAlgorithm = () => {
    status: 'stop',
    sn: uavData.value.droneSn
  }
-  // doStartOrStopUavAlgorithm(params).then(res => {
-  //   if(res.success) {
-  //     algorithmStatus.value = false
-  //     algorithmValue.value = []
-  //     ElMessage.success(res.result)
-  //   }else {
-  //     ElMessage.error(res.result)
-  //   }
-  // })
+  doStartOrStopUavAlgorithm(params).then(res => {
+    if(res.success) {
+      algorithmStatus.value = false
+      algorithmValue.value = []
+      ElMessage.success(res.result)
+    }else {
+      ElMessage.error(res.result)
+    }
+  })
 }
 /**
 * 拖拽事件
--- a/src/views/business/largeModel/realDialog.vue
+++ b/src/views/business/largeModel/realDialog.vue
@@ -41,10 +41,10 @@
 <script setup>
 import { nextTick, onMounted, onUnmounted, ref } from 'vue'
 import { marked } from 'marked'
-// import { useStore } from 'vuex'
-import GlobalMap from '@/components/map/js/GlobalMap.js'
+import GlobalMap from '@/components/Map/js/GlobalMap.js'
+import useMapStore from '@/store/modules/map'

-// const store = useStore()
+const mapStore = useMapStore()
 const emit = defineEmits([ 'openVideo', 'openUav' ])
 const videoArr = ref([])
 const uavArr = ref([])
@@ -193,29 +193,7 @@ return ''
 // 监控视频查看
 const openVideoHandler = (index) => {
  const data = videoArr.value[index]
-  // 雷云一体机一个视频
-  if(data.videoName.indexOf('雷云') !== -1) {
-    const videos = videoArr.value.filter(i => i.videoName.indexOf('雷云') !== -1).sort((a, b) => {
-          const index1 = a.videoName[a.videoName.length - 1]
-          const index2 = b.videoName[b.videoName.length - 1]
-          return index1 - index2
-        })
-
-      codes.value = [ videos[0].videoCode ]
-  }else{
-    if(data.videoName.indexOf('球机') !== -1) {
-      const videos = videoArr.value.filter(i => i.videoName.indexOf('球机') !== -1).sort((a, b) => {
-        const index1 = a.videoName[a.videoName.length - 1]
-        const index2 = b.videoName[b.videoName.length - 1]
-        return index1 - index2
-      })
-      codes.value = videos.map((i, index) => {
-          return i.previewUrl
-      })
-    }else{
  codes.value = [ data.videoCode ]
-    }
-  }
  nextTick(() => {
    setTimeout(() => {
      visible.value = true
@@ -235,17 +213,17 @@ const openImageHandle = (url) => {
 // 开启无人机控制
 const openUavHandler = (index) => {
  const data = uavArr.value[index]
-  // store.commit('mapStore/updateUavData', { ...data })
+  mapStore.updateUavData({ ...data })
  emit('openUav', { ...data })
 }
 // 渔船追踪
 const openTrawlerHandler = (index) => {
  const data = boatArr.value[index]
-  // store.commit('mapStore/updateWindowInfo', {
-  //   visible: true,
-  //   type: '_trawler_dynamic',
-  //   data: { ...data }
-  // })
+  mapStore.updateWindowInfo({
+    visible: true,
+    type: '_trawler_dynamic',
+    data: { ...data }
+  })
  GlobalMap.instance.map.animateTo(
    {
      zoom: 20,
--- a/src/views/business/wall/grid.vue
+++ b/src/views/business/wall/grid.vue
@@ -92,7 +92,8 @@ const handleNodeClick = (node) => {
 }
 changeGridType(4)
 defineExpose({
-    handleNodeClick
+    handleNodeClick,
+    videoPreview
 })
 onUnmounted(() => {
    if(videoPreview.value) {
@@ -105,7 +106,7 @@ onUnmounted(() => {

 <style lang="scss" scoped>
 .wall-wrapper {
-    height: 812px;
+    height: calc(100% - 36px);
    position: relative;
    width: 80%;
    .treeTool{
@@ -141,7 +142,7 @@ onUnmounted(() => {
        justify-content: flex-end;
    }
    .con_right{
-        height: 100%;
+        height: calc(100% - 36px);
        padding: 5px;
        width: 100%;
        display: flex;
--- a/src/views/business/wall/index.vue
+++ b/src/views/business/wall/index.vue
@@ -1,6 +1,6 @@
 <template>
  <!-- 电视墙页面 -->
-  <DialogComponent class="wall-dialog" :style="{ resize: 'both', overflow: 'auto' }" v-if="type==='CCTV'|| type==='UAV'" :title="title" width="1800" :draggable="true" :modal="false" @close="close">
+  <DialogComponent @mousedown="drag" class="wall-dialog" :style="{ resize: 'both', overflow: 'auto' }" :title="title" width="1800" :draggable="true" :modal="false" @close="close">
    <div class="wall-container">
        <TreeCom ref="Tree" @handle="handle"/>
        <GridCom ref="Grid"/>
@@ -14,10 +14,11 @@ import TreeCom from './tree.vue'
 import GridCom from './grid.vue'
 import { useRouter } from 'vue-router'
 import useMapStore from '@/store/modules/map'
+import { dragEvent, resizeEvent } from '@/utils/common'

 const mapStore = useMapStore()
 const router = useRouter()
-const type = computed(() => mapStore.dialogVisible.type)
+const type = computed(() => mapStore.dialog.type)
 const Tree = ref(null)
 const Grid = ref(null)

@@ -31,8 +32,7 @@ const handle = (node) => {
    Grid.value.handleNodeClick(node)
 }
 const close = () => {
-  mapStore.updateDialog('')
-  router.back()
+  mapStore.updateDialog(false)
 }
 watch(() => type.value, () => {
    if(type.value) {
@@ -41,10 +41,43 @@ watch(() => type.value, () => {
        })
    }

-})
+}, { immediate: true })
+/**
+ * 拖拽事件
+ * @param e
+ *
+ */
+ const drag = (e) => {
+  if(e.target.className.includes('el-dialog-title')) {
+     dragEvent(e, 'el-dialog-title', () => {
+      if(Grid.value.videoPreview) {
+        Grid.value.videoPreview.forEach(i => {
+            i.initResize(false)
+        })
+      }
+    })
+  }else{
+    resizeEvent(e, 'el-dialog', () => {
+      if(Grid.value?.videoPreview) {
+         Grid.value.videoPreview.forEach(i => {
+            i.initResize()
+        })
+      }
+    })
+  }
+
+}
 </script>
-<style scoped lang="scss">
+<style lang="scss">
+.wall-dialog{
+    height: 900px;
+    .el-dialog__body{
+        height: calc(100% - 56px) !important;
+    }
+}
+
 .wall-container{
    display: flex;
+    height: 100%;
 }
 </style>
--- a/src/views/business/wall/tree.vue
+++ b/src/views/business/wall/tree.vue
@@ -55,6 +55,9 @@ const refresh = (type) => {

 }
 const handleNodeClick = (data, node) => {
+  if(data.status && data.status === 'offline') {
+    return false
+  }
  if(!data.children || data.children.length === 0) {
    emit('handle', node.data)
  }
@@ -107,7 +110,7 @@ defineExpose({
          border: 1px solid #5FA4FF;

          &::before {
-            background-image: url('@/assets/images/livePreview/icon-monitor-active.png');
+            // background-image: url('@/assets/images/livePreview/icon-monitor-active.png');
          }
          &:has(.offline) {
            background-color: none;
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -146,10 +146,11 @@ getCode()
    color: #FFFFFF;
    line-height: 46px;
    letter-spacing: 8px;
-    text-align: left;
+    text-align: center;
    position:absolute;
    top: 108px;
    z-index: 10;
+    width: 766px;
  }
  .title-line{
    background-image: url('@/assets/images/login/icon-title-line.png');