5-13会议BUG提交

天气，告警状态改变
2025-05-13 10:45:52 +08:00 · 2025-05-12 09:07:46 +08:00
57 changed files with 2808 additions and 850 deletions
--- a/riis-web/.env.development
+++ b/riis-web/.env.development
@ -3,7 +3,7 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV='development'

-VITE_APP_TITLE = '变电站远程智能巡视系统'
+VITE_APP_TITLE = '配电网人工智能平台'
 VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/dev-api'
 VITE_APP_BASE_URL = 'http://192.168.1.20:18080'
--- a/riis-web/.env.production
+++ b/riis-web/.env.production
@ -1,7 +1,7 @@
 ## 生产环境
 NODE_ENV='production'

-VITE_APP_TITLE = '变电站远程智能巡视系统'
+VITE_APP_TITLE = '配电网人工智能平台'
 VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/prod-api'
 VITE_APP_BASE_URL = 'http://192.168.1.20:18080'
--- a/riis-web/.env.staging
+++ b/riis-web/.env.staging
@ -1,6 +1,6 @@
 ## 模拟环境
 NODE_ENV='staging'

-VITE_APP_TITLE = '变电站远程智能巡视系统'
+VITE_APP_TITLE = '配电网人工智能平台'
 VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/prod--api'
--- a/riis-web/index.html
+++ b/riis-web/index.html
@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="./static/css/iconfont.css">
    <script type="text/javascript" type="module" src="./static/js/jessibuca.js"></script>
    <script type="text/javascript" type="module" src="./webconfig.js"></script>
-    <title>变电站远程智能巡视系统</title>
+    <title>配电网人工智能平台</title>
  </head>
  <body>
    <div id="app"></div>
--- a/riis-web/src/assets/navigation/hjjc_sj2.png
+++ b/riis-web/src/assets/navigation/hjjc_sj2.png
--- a/riis-web/src/assets/navigation/hjjc_sj7.png
+++ b/riis-web/src/assets/navigation/hjjc_sj7.png
--- a/riis-web/src/assets/navigation/hjjc_sj5.png
+++ b/riis-web/src/assets/navigation/hjjc_sj5.png
--- a/riis-web/src/assets/navigation/hjjc_sj6.png
+++ b/riis-web/src/assets/navigation/hjjc_sj6.png
--- a/riis-web/src/assets/navigation/hjjc_sj8.png
+++ b/riis-web/src/assets/navigation/hjjc_sj8.png
--- a/riis-web/public/environment/temperature.png
+++ b/riis-web/public/environment/temperature.png
--- a/riis-web/public/environment/windDirection.png
+++ b/riis-web/public/environment/windDirection.png
--- a/riis-web/src/assets/navigation/hjjc_sj3.png
+++ b/riis-web/src/assets/navigation/hjjc_sj3.png
--- a/riis-web/public/webconfig.js
+++ b/riis-web/public/webconfig.js
@ -2,5 +2,6 @@ window.webConfig = {
  "webApiBaseUrl": "http://192.168.1.20:8090/",
  "wsApiBaseUrl": "ws://192.168.1.20:8090/",
  "webApiMonitorUrl": "http://192.168.1.20:18080",
+  "answeringUrl":"http://121.37.111.42:8083/ui/chat/431e83302d0bbfbe",
  "webSystemTitle":"标题"
 }
--- a/riis-web/src/api/alarmInfo/index.ts
+++ b/riis-web/src/api/alarmInfo/index.ts
@ -19,6 +19,14 @@ export function getAlarmLogPage(params:any){
      data:params
    });
  }
+    //辅控告警信息核查
+    export function setAlarmRecordStatus(params:any){
+      return request({
+        url: '/auxcontrol/device-alarm-record/setAlarmRecordStatus' ,
+        method: 'post',
+        data:params
+      });
+    }

  //告警信息批量核查
  export function setBatchAlarmLogStatus(params:any){
--- a/riis-web/src/api/alarminterval/index.ts
+++ b/riis-web/src/api/alarminterval/index.ts
@ -15,10 +15,19 @@ export function getSubstation (){
    });
  }
  //批量修改警告阈值
-export function updateAlarm(params:any){
+export function setAlgorithmModel(params:any){
    return request({
-      url: 'basedata/substation-device/updateAlarmThreshold' ,
+      url: '/basedata/alarm-threshold/setAlgorithmModel' ,
      method: 'post',
      data:params
    });
+    
  }
+    //批量修改警告阈值
+export function getAlgorithmModelById(params:any){
+  return request({
+    url: '/basedata/alarm-threshold/getAlgorithmModelById' ,
+    method: 'get',
+    params:params
+  });
+}
--- a/riis-web/src/api/device/index.ts
+++ b/riis-web/src/api/device/index.ts
@ -129,20 +129,29 @@ export function getDeviceByType(params: any) {
    params: params
  });
 }
+export function getDictionaryItems(params: any) {
+  return request({
+    url: '/system/dictionaryItems/getDictionaryItems',
+    method: 'get',
+    params: params
+  });
+}
 //根据条件获取部件(分页)
 export function getComponentByBayPage(params: any) {
  return request({
    url: '/basedata/substation-maindevice/getComponentByBayPage',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: params
+
  });
 }
 //根据条件获取主设备(分页)
 export function getMainDevicePage(params: any) {
  return request({
    url: '/basedata/substation-maindevice/getMainDevicePage',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: params
+
  });
 }
 // 保存模板图片
--- a/riis-web/src/api/environmentalMonitoring/index.ts
+++ b/riis-web/src/api/environmentalMonitoring/index.ts
@ -7,6 +7,13 @@ export function getWeatherLogPage(params:any){
    params:params
  });
 }
+export function getdeviceworkdata(params:any){
+  return request({
+    url: '/auxcontrol/device-work-data/page' ,
+    method: 'get',
+    params:params
+  });
+}
 //分页查看主辅设备监控数据
 export function getMainassistDeviceLogPage(params:any){
    return request({
--- a/riis-web/src/api/home/index.ts
+++ b/riis-web/src/api/home/index.ts
@ -24,6 +24,13 @@ export function getWeatherLogList(params:any){
    params:params
  });
 }
+export function getDeviceWorkData(params:any){
+  return request({
+    url: '/auxcontrol/device-work-data/getDeviceWorkData' ,
+    method: 'get',
+    params:params
+  });
+}

 // 查询报警信息
 export function getAlarmLogList(params:any){
--- a/riis-web/src/api/linksignal/index.ts
+++ b/riis-web/src/api/linksignal/index.ts
@ -74,7 +74,7 @@ export function getTreelist(params: any) {
 //获取变电站信息
 export function getTreeList(params:any){
  return request({
-    url: '/basedata/substation/getSubstationAreaNaviTree' ,
+    url: '/basedata/substation/getSubstationAreaTree' ,
    method: 'get',
    params:params
  });
--- a/riis-web/src/api/patroldetails/index.ts
+++ b/riis-web/src/api/patroldetails/index.ts
@ -10,7 +10,7 @@ export function getdata(params: any) {
 //根据任务执行情况ID查询点位查询
 export function getTableData(params: any) {
    return request({
-        url: '/patroltasks/task-todo/getTaskDevicePage',
+        url: '/patroltasks/task-todo/getTaskDeviceList',
        method: 'get',
        params: params
    });
--- a/riis-web/src/api/task/index.ts
+++ b/riis-web/src/api/task/index.ts
@ -29,7 +29,7 @@ export function getTaskToDo(params:any){
 //分页查询检修计划
 export function getTaskList(params:any){
  return request({
-    url: '/patroltasks/examine-plan/getExaminePlanPage' ,
+    url: '/patroltasks/examine-plan/getTaskList' ,
    method: 'get',
    params:params
  });
@ -81,7 +81,7 @@ export function setExaminePlanStatus(params:any){
 //获取区域下所有间隔
 export function getSubstationBayByArea(params: any) {
  return request({
-      url: '/basedata/substation/getSubstationBay',
+      url: '/basedata/substation/getSubstationBayByArea',
      method: 'get',
      params: params
  });
--- a/riis-web/src/assets/navigation/humidity.png
+++ b/riis-web/src/assets/navigation/humidity.png
--- a/riis-web/src/assets/navigation/oxygen.png
+++ b/riis-web/src/assets/navigation/oxygen.png
--- a/riis-web/src/assets/navigation/pressure.png
+++ b/riis-web/src/assets/navigation/pressure.png
--- a/riis-web/src/assets/navigation/rainfall.png
+++ b/riis-web/src/assets/navigation/rainfall.png
--- a/riis-web/src/assets/navigation/sf6.png
+++ b/riis-web/src/assets/navigation/sf6.png
--- a/riis-web/src/assets/navigation/temperature.png
+++ b/riis-web/src/assets/navigation/temperature.png
--- a/riis-web/src/assets/navigation/windDirection.png
+++ b/riis-web/src/assets/navigation/windDirection.png
--- a/riis-web/src/assets/navigation/windSpeed.png
+++ b/riis-web/src/assets/navigation/windSpeed.png
--- a/riis-web/src/components/wavEcharts/index.vue
+++ b/riis-web/src/components/wavEcharts/index.vue
@ -1,6 +1,6 @@
 <template>
    <div class="audio-spectrum">
-        <el-scrollbar height="700px">
+        <el-scrollbar height="680px">
            <!-- 分贝图表容器 -->
            <div ref="dbChartContainer" class="spectrum-chart-db"></div>
            <!-- 频率图表容器 -->
@ -452,7 +452,7 @@ watch(() => props.fileUrl, async () => {
 .spectrum-chart,
 .spectrum-chart-db {
    width: 100%;
-    height: 500px;
+    height: 320px;
    background: rgba(255, 255, 255, 0.144);
    border-radius: 8px;
    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
--- a/riis-web/src/lang/zh-cn.ts
+++ b/riis-web/src/lang/zh-cn.ts
@ -6,7 +6,7 @@ export default {
  },
  // 登录页面国际化
  login: {
-    title: '变电站远程智能巡视系统',
+    title: '配电网人工智能平台',
    username: '用户名',
    rulesUsername: '请输入用户名',
    password: '密码',
--- a/riis-web/src/settings.ts
+++ b/riis-web/src/settings.ts
@ -10,7 +10,7 @@ interface DefaultSettings {
 }

 const defaultSettings: DefaultSettings = {
-  title: '变电站远程智能巡视系统',
+  title: '配电网人工智能平台',
  showSettings: false,
  tagsView: true,
  fixedHeader: true,
--- a/riis-web/src/store/modules/user.ts
+++ b/riis-web/src/store/modules/user.ts
@ -41,6 +41,7 @@ export const useUserStore = defineStore('user', () => {
  const webApiMonitorUrl:any = process.env.NODE_ENV=='development'? import.meta.env.VITE_APP_BASE_URL:window.webConfig.webApiMonitorUrl
  const webApiBaseUrl:any = process.env.NODE_ENV=='development'? import.meta.env.VITE_APP_BASE_API:window.webConfig.webApiBaseUrl
  const wsApiBaseUrl:any = process.env.NODE_ENV=='development'? import.meta.env.VITE_APP_BASE_WS:window.webConfig.wsApiBaseUrl
+  const answeringUrl:any = window.webConfig.answeringUrl
  const promptTitle:any = ref('')
  // actions

@ -250,6 +251,7 @@ export const useUserStore = defineStore('user', () => {
    webApiMonitorUrl,
    webApiBaseUrl,
    wsApiBaseUrl,
+    answeringUrl
  };
 });

--- a/riis-web/src/styles/index.scss
+++ b/riis-web/src/styles/index.scss
@ -655,10 +655,7 @@ input {
  color: #fff !important;
 }

-.el-table .el-table__row.el-table__row--striped {
-  background: #17212e !important;
-  color: #fff !important;
-}
+

 .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
  background: transparent !important;
--- a/riis-web/src/views/basedata/3DModelSet/index.vue
+++ b/riis-web/src/views/basedata/3DModelSet/index.vue
@ -4981,7 +4981,7 @@ function getComponentPage() {
    bayId: pageInfo.value.bayId,
    componentName: componentName.value
  }
-  getComponentByBayPage(params).then(res => {
+  getComponentByBayPage(JSON.stringify(params)).then(res => {
    componentData.value = res.data.records
    pageInfo.value.size = res.data.size
    pageInfo.value.current = res.data.current
@ -5012,7 +5012,7 @@ function getmainDevicePage() {
  getSubstationBayByArea({ stationCode: userStore.stationCode }).then((res) => {
    bayIdType.value = res.data
  })
-  getMainDevicePage(params).then(res => {
+  getMainDevicePage(JSON.stringify(params)).then(res => {
    mainDeviceData.value = res.data.records
    pageInfo.value.size = res.data.size
    pageInfo.value.current = res.data.current
--- a/riis-web/src/views/basedata/alarminterval/index.vue
+++ b/riis-web/src/views/basedata/alarminterval/index.vue
@ -3,23 +3,19 @@ export default {
    name: "alarminterval",
 };
 </script>
-
-
-
 <script setup lang="ts">
-import { ref, onMounted, nextTick } from "vue";
-import { getAlarm, getSubstation, updateAlarm } from "@/api/alarminterval";
-
+import { ref, onMounted } from "vue";
+import { getAlarm, getSubstation, setAlgorithmModel, getAlgorithmModelById } from "@/api/alarminterval";
 import { getDeviceByType, getaccType, getMainEquipment } from "@/api/device";
 import { ElMessage } from "element-plus";
-import Page from '@/components/Pagination/page.vue'
 import Eldialog from '@/components/seccmsdialog/eldialog.vue';
+import Page from '@/components/Pagination/page.vue'
 // 右侧表格
 const tableData: any = ref()
 const loading = ref(false)
 const deviceName = ref()
 const params = ref({
-    size: 20,
+    size: 10,
    current: 1,
    stationId: '',
    areaId: '',
@ -45,7 +41,7 @@ function getData() {
    })
 }
 //获取变电站树
-const treeAll = ref()
+const treeAll = ref([])
 function notification() {
    getSubstation().then((res: any) => {
        treeAll.value = res.data
@ -103,6 +99,7 @@ function getCompont() {
 //识别类型&&表计类型
 const recognitionTypeList: any = ref([])
 const meterType: any = ref([])
+const EquipmentType: any = ref([])
 function getType() {
    const paramsall = {
        dictcode: 'recognition_type'
@ -116,6 +113,9 @@ function getType() {
    getDeviceByType(paramsid).then((res: any) => {
        meterType.value = res.data
    })
+    getDeviceByType({ dictcode: 'EquipmentType' }).then((res: any) => {
+        EquipmentType.value = res.data
+    })
 }
 //重置
 function resetting() {
@ -143,19 +143,22 @@ function handleSelectionChange(val: any) {
 const dialogVisible = ref(false)
 //表单数据
 const info: any = ref({
-    earlyMin: '',
-    earlyMax: '',
-    sameMin: '',
-    sameMax: '',
-    seriousMin: '',
-    seriousMax: '',
-    criticalMin: '',
-    criticalMax: ''
+    commonLower: '',
+    commonUpper: '',
+    seriousLower: '',
+    seriousUpper: '',
+    dangerLower: '',
+    dangerUpper: '',
+    alarmClass: '1',
+    isLastContrast: '1',
+    baseValue: '',
+    isenable: '1',
+    alarmType: '',
 })
 function isAllEqual(array: any) {
    let is = true
    for (let i = 0; i < array.length; i++) {
-        if (array.every((item: any) => item.unit === array[i].unit) === false) {
+        if (array.every((item: any) => item.recognitionTypeList === array[i].recognitionTypeList) === false) {
            is = false
            break
        }
@ -163,22 +166,33 @@ function isAllEqual(array: any) {
    }
    return is
 }
+const alarmTypeList: any = ref([])
 function setClick() {
    if (deviceInfos.value.length == 1) {
-        info.value = JSON.parse(JSON.stringify(deviceInfos.value[0]))
-        if (info.value.earlyMin == undefined || info.value.earlyMax == undefined || info.value.sameMin == undefined || info.value.sameMax == undefined || info.value.seriousMin == undefined || info.value.seriousMax == undefined || info.value.criticalMin == undefined || info.value.criticalMax == undefined) {
-            info.value = {
-                earlyMin: '',
-                earlyMax: '',
-                sameMin: '',
-                sameMax: '',
-                seriousMin: '',
-                seriousMax: '',
-                criticalMin: '',
-                criticalMax: '',
-                unit: deviceInfos.value[0].unit
+        getAlgorithmModelById({ id: deviceInfos.value[0].deviceId }).then((res: any) => {
+            if (res.data) {
+                info.value = res.data
+               
+            } else {
+                info.value = {
+                    commonLower: '',
+                    commonUpper: '',
+                    seriousLower: '',
+                    seriousUpper: '',
+                    dangerLower: '',
+                    dangerUpper: '',
+                    alarmClass: '1',
+                    isLastContrast: '1',
+                    baseValue: '',
+                    isenable: '1',
+                    alarmType: '',
+                    unit: deviceInfos.value[0].unit
+                }
            }
-        }
+
+
+        })
+
    } else {
        if (isAllEqual(deviceInfos.value) == false) {
            ElMessage({
@ -188,78 +202,256 @@ function setClick() {
            return
        }
        info.value = {
-            earlyMin: '',
-            earlyMax: '',
-            sameMin: '',
-            sameMax: '',
-            seriousMin: '',
-            seriousMax: '',
-            criticalMin: '',
-            criticalMax: '',
-            unit: ''
+            commonLower: '',
+            commonUpper: '',
+            seriousLower: '',
+            seriousUpper: '',
+            dangerLower: '',
+            dangerUpper: '',
+            unit: '',
+            alarmClass: '1',
+            isLastContrast: '1',
+            baseValue: '',
+            isenable: '1',
+            alarmType: '',
        }
    }
+    const paramsall = {
+        dictcode: 'AlarmType'
+    }
+    getDeviceByType(paramsall).then((res: any) => {
+        alarmTypeList.value = res.data
+    })
    dialogVisible.value = true
 }
 //弹窗
 function confirmClick() {
-    if (info.value.earlyMin === 0) {
-        info.value.earlyMin = '0'
-    }
-    if (info.value.earlyMin == '' || info.value.earlyMax == '' || info.value.sameMin == '' || info.value.sameMax == '' || info.value.seriousMin == '' || info.value.seriousMax == ''
-        || info.value.criticalMin == '' || info.value.criticalMax == '') {
+
+    if (((info.value.commonLower && info.value.commonUpper == '') || (info.value.commonUpper && info.value.commonLower == ''))) {
        ElMessage({
            type: "warning",
-            message: "区间数值不能为空",
+            message: "一般阈值下限和上限不能有一方为空！",
        });
+        return
+    }
+    if (((info.value.seriousLower && info.value.seriousUpper == '') || (info.value.seriousUpper && info.value.seriousLower == ''))) {
+        ElMessage({
+            type: "warning",
+            message: "严重阈值下限和上限不能有一方为空！",
+        });
+        return
+    }
+    if (((info.value.dangerLower && info.value.dangerUpper == '') || (info.value.dangerUpper && info.value.dangerLower == ''))) {
+        ElMessage({
+            type: "warning",
+            message: "危急阈值下限和上限不能有一方为空！",
+        });
+        return
+    }
+    if (info.value.commonLower) {
+        if (Number(info.value.commonLower) > Number(info.value.commonUpper)) {
+            ElMessage({
+                type: "warning",
+                message: "一般阈值下限不能大于上限！",
+            });
+            return
+        }
+    }
+    if (info.value.seriousLower) {
+        if (Number(info.value.seriousLower) > Number(info.value.seriousUpper)) {
+            ElMessage({
+                type: "warning",
+                message: "严重阈值下限不能大于上限！",
+            });
+            return
+        }
+    }
+    if (info.value.dangerLower) {
+        if (Number(info.value.dangerLower) > Number(info.value.dangerUpper)) {
+            ElMessage({
+                type: "warning",
+                message: "危急阈值下限不能大于上限！",
+            });
+            return
+        }
+    }
+    if (info.value.seriousLower && info.value.dangerLower) {
+        if (isRangeNotInOtherRange([Number(info.value.seriousLower), Number(info.value.seriousUpper)], [Number(info.value.dangerLower), Number(info.value.dangerUpper)]) == false) {
+            ElMessage({
+                type: "warning",
+                message: "阈值不能有交叉！",
+            });
+            return
+        }
+    }
+    if (info.value.commonLower && info.value.dangerLower) {
+        if (isRangeNotInOtherRange([Number(info.value.commonLower), Number(info.value.commonUpper)], [Number(info.value.dangerLower), Number(info.value.dangerUpper)]) == false) {
+            ElMessage({
+                type: "warning",
+                message: "阈值不能有交叉！",
+            });
+            return
+        }
+    }
+    if (info.value.commonLower && info.value.seriousLower) {
+        if (isRangeNotInOtherRange([Number(info.value.commonLower), Number(info.value.commonUpper)], [Number(info.value.seriousLower), Number(info.value.seriousUpper)]) == false) {
+            ElMessage({
+                type: "warning",
+                message: "阈值不能有交叉！",
+            });
+            return
+        }
    }

-    else if (isNaN(Number(info.value.earlyMin)) || isNaN(Number(info.value.earlyMax)) || isNaN(Number(info.value.sameMin)) ||
-        isNaN(Number(info.value.sameMax)) || isNaN(Number(info.value.seriousMin)) || isNaN(Number(info.value.seriousMax)) ||
-        isNaN(Number(info.value.criticalMin)) || isNaN(Number(info.value.criticalMax))) {
-        ElMessage({
-            type: "warning",
-            message: "只能输入数字和浮点数",
-        });
-    }
-    else if (Number(info.value.sameMin) < Number(info.value.earlyMax) || Number(info.value.seriousMin) < Number(info.value.sameMax) || Number(info.value.criticalMin) < Number(info.value.seriousMax)) {
-        ElMessage({
-            type: "warning",
-            message: "不得小于上一项的最大值",
-        });
-    } else if (Number(info.value.earlyMax) > Number(info.value.earlyMin) && Number(info.value.sameMax) > Number(info.value.sameMin) && Number(info.value.seriousMax) > Number(info.value.seriousMin) && Number(info.value.criticalMax) > Number(info.value.criticalMin)) {
-        const infoAll: any = ref({})
-        infoAll.value = JSON.parse(JSON.stringify(info.value))
-        infoAll.value.earlyMin = Number(infoAll.value.earlyMin).toFixed(2);
-        infoAll.value.earlyMax = Number(infoAll.value.earlyMax).toFixed(2);
-        infoAll.value.sameMin = Number(infoAll.value.sameMin).toFixed(2);
-        infoAll.value.sameMax = Number(infoAll.value.sameMax).toFixed(2);
-        infoAll.value.seriousMin = Number(infoAll.value.seriousMin).toFixed(2);
-        infoAll.value.seriousMax = Number(infoAll.value.seriousMax).toFixed(2);
-        infoAll.value.criticalMin = Number(infoAll.value.criticalMin).toFixed(2);
-        infoAll.value.criticalMax = Number(infoAll.value.criticalMax).toFixed(2);
-        const deviceId: any = ref([])
-        deviceInfos.value.forEach((element: any) => {
-            deviceId.value.push(element.deviceId)
-        });
-        infoAll.value['deviceId'] = deviceId.value.toString()
-        updateAlarm(infoAll.value).then((res: any) => {
-            if (res.code != 1) {
-                ElMessage({
-                    type: "success",
-                    message: "修改成功",
-                });
-                dialogVisible.value = false
-                getData()
+    const infoAll: any = ref({})
+    const infoAllList: any = ref([])
+    infoAll.value = JSON.parse(JSON.stringify(info.value))
+    if (infoAll.value.commonLower) infoAll.value.commonLower = Number(infoAll.value.commonLower).toFixed(2);
+    if (infoAll.value.commonUpper) infoAll.value.commonUpper = Number(infoAll.value.commonUpper).toFixed(2);
+    if (infoAll.value.seriousLower) infoAll.value.seriousLower = Number(infoAll.value.seriousLower).toFixed(2);
+    if (infoAll.value.seriousUpper) infoAll.value.seriousUpper = Number(infoAll.value.seriousUpper).toFixed(2);
+    if (infoAll.value.dangerLower) infoAll.value.dangerLower = Number(infoAll.value.dangerLower).toFixed(2);
+    if (infoAll.value.dangerUpper) infoAll.value.dangerUpper = Number(infoAll.value.dangerUpper).toFixed(2);
+   
+    deviceInfos.value.forEach((element: any) => {
+        const infoAllOne:any = ref({})
+        infoAllOne.value = JSON.parse(JSON.stringify(infoAll.value))
+        infoAllOne.value['stationName'] = element.stationName
+        infoAllOne.value['deviceName'] = element.deviceName
+        infoAllOne.value['stationCode'] = element.stationCode
+        infoAllOne.value.deviceId = element.deviceId
+        infoAllOne.value.alarmThresholdId = element.stationId + element.deviceId + JSON.parse(element.pictureAnalysisTypeList).PictureDefectAnalysisType + infoAll.value.alarmType
+        if (JSON.parse(element.pictureAnalysisTypeList).PictureDefectAnalysisType) {
+            infoAllOne.value['defectType'] = JSON.parse(element.pictureAnalysisTypeList).PictureDefectAnalysisType
+        }
+       
+        infoAllList.value.push(infoAllOne.value)
+
+    });
+    const infoList: any = ref([])
+    const newinfo: any = ref({
+        deviceId: '',
+        deviceName: '',
+        defectType: '',
+        stationCode: '',
+        stationName: '',
+        decideRule: '',
+        decisionValueClass: '',
+        alarmDesc: '',
+        alarmType: '',
+        baseValue: '',
+        alarmLevel: '',
+        alarmClass: '',
+        isenable: '',
+    })
+  
+    infoAllList.value.forEach((element: any) => {
+        newinfo.value.alarmClass = element.alarmClass
+        newinfo.value.isenable = element.isenable
+        newinfo.value.defectType = element.defectType
+        newinfo.value.stationCode = element.stationCode
+        newinfo.value.stationName = element.stationName
+        newinfo.value.alarmType = element.alarmType
+        newinfo.value.isLastContrast = element.isLastContrast
+        newinfo.value.baseValue = element.baseValue
+        if (element.alarmClass == 2) {
+            const inallList = JSON.parse(JSON.stringify(newinfo.value))
+            inallList.deviceId = element.deviceId
+            inallList.deviceName = element.deviceName
+            infoList.value.push(inallList)
+        } else {
+            if (element.commonLower) {
+                const inallList = JSON.parse(JSON.stringify(newinfo.value))
+                inallList.deviceId = element.deviceId
+                inallList.deviceName = element.deviceName
+                inallList.decideRule = '6'//判定规则
+                inallList.decisionValueClass = '1'
+                inallList.alarmDesc = ''//告警描述
+                inallList.baseLineValue = element.commonLower
+                inallList.alarmLevel = '2'
+                infoList.value.push(inallList)
            }
-        })
-    } else {
-        ElMessage({
-            type: "warning",
-            message: "区间最大值不能小于等于最小值",
-        });
-    }
+            if (element.commonUpper) {
+                const inallList = JSON.parse(JSON.stringify(newinfo.value))
+                inallList.deviceId = element.deviceId
+                inallList.deviceName = element.deviceName
+                inallList.decideRule = '7'//判定规则
+                inallList.decisionValueClass = '1'
+                inallList.alarmDesc = ''//告警描述
+                inallList.baseLineValue = element.commonUpper
+                inallList.alarmLevel = '2'
+                infoList.value.push(inallList)
+            }
+
+            if (element.seriousLower) {
+                const inallList = JSON.parse(JSON.stringify(newinfo.value))
+                inallList.deviceId = element.deviceId
+                inallList.deviceName = element.deviceName
+                inallList.decideRule = '6'//判定规则
+                inallList.decisionValueClass = '1'
+                inallList.alarmDesc = ''//告警描述
+                inallList.baseLineValue = element.seriousLower
+                inallList.alarmLevel = '3'
+                infoList.value.push(inallList)
+            }
+            if (element.seriousUpper) {
+                const inallList = JSON.parse(JSON.stringify(newinfo.value))
+                inallList.deviceId = element.deviceId
+                inallList.deviceName = element.deviceName
+                inallList.decideRule = '7'//判定规则
+                inallList.decisionValueClass = '1'
+                inallList.alarmDesc = ''//告警描述
+                inallList.baseLineValue = element.seriousUpper
+                inallList.alarmLevel = '3'
+                infoList.value.push(inallList)
+            }
+
+            if (element.dangerLower) {
+                const inallList = JSON.parse(JSON.stringify(newinfo.value))
+                inallList.deviceId = element.deviceId
+                inallList.deviceName = element.deviceName
+                inallList.decideRule = '6'//判定规则
+                inallList.decisionValueClass = '1'
+                inallList.alarmDesc = ''//告警描述
+                inallList.baseLineValue = element.dangerLower
+                inallList.alarmLevel = '4'
+                infoList.value.push(inallList)
+            }
+            if (element.dangerUpper) {
+                const inallList = JSON.parse(JSON.stringify(newinfo.value))
+                inallList.deviceId = element.deviceId
+                inallList.deviceName = element.deviceName
+                inallList.decideRule = '7'//判定规则
+                inallList.decisionValueClass = '1'
+                inallList.alarmDesc = ''//告警描述
+                inallList.baseLineValue = element.dangerUpper
+                inallList.alarmLevel = '4'
+                infoList.value.push(inallList)
+            }
+
+        }
+
+    })
+    setAlgorithmModel(JSON.stringify(infoList.value)).then((res: any) => {
+        if (res.code != 1) {
+            ElMessage({
+                type: "success",
+                message: "修改成功",
+            });
+            dialogVisible.value = false
+            getData()
+        }
+    })
+
 }
+// 判断1-2不在3-9内
+function isRangeNotInOtherRange([start1, end1]: any, [start2, end2]: any) {
+    // 解析两个范围  
+    // 检查范围1是否完全在范围2之外  
+    // 即，范围1的结束数字小于范围2的开始数字，或者范围1的开始数字大于范围2的结束数字  
+    return end1 <= start2 || start1 >= end2;
+}
+// 判断1-2不在3-9和9-12内
 //关闭弹窗
 function handleClose() {
    dialogVisible.value = false
@ -270,6 +462,7 @@ function handleClose() {
 //获取用户列表信息
 onMounted(() => {
    getData()
+    getType()
 });

 //表格多选样式
@ -288,19 +481,24 @@ const tableRowClassName = ({
    return ''
 }

+function currency(list: any, itemcode: any) {
+    let dictname = ''
+    list.forEach((element: any) => {
+        if (element.itemcode == itemcode) {
+            dictname = element.dictname
+        }
+    })
+    return dictname
+}
+function radiochange(row: any) {
+    if(row == 1){
+        info.value.baseValue = ''
+    }
+}
 </script>

 <template>
-    <div style="height: 10px;padding:0px 15px;"></div>
    <div class="faulttemplate-box">
-        <!-- 设置阈值弹窗 -->
-        <!-- <div class="custom2" v-if="dialogVisible == true">
-            <div class="custom2-back" v-drag>
-                <div class="custom2-close" @click="handleClose">x</div>
-                <div class="custom2-title">设置阈值</div>
-                
-            </div>
-        </div> -->
        <section class="silderRight">
            <div
                style="display: flex;display: -webkit-flex; justify-content: space-between; -webkit-justify-content: space-between;  margin:15px 0px">
@ -315,14 +513,16 @@ const tableRowClassName = ({
                    </el-select>
                    <el-select :disabled="params.stationId == ''" clearable v-model="params.areaId" placeholder="所属区域"
                        style="margin-right:5px ;width: 25%;" @visible-change="getStation" @change="getData()">
-                        <el-option v-for="item in areaAll" :key="item.areaId" :label="item.areaName" :value="item.areaId" />
+                        <el-option v-for="item in areaAll" :key="item.areaId" :label="item.areaName"
+                            :value="item.areaId" />
                    </el-select>
                    <el-select :disabled="params.areaId == ''" clearable v-model="params.bayId" placeholder="所属间隔"
                        style="margin-right:5px ;width: 25%;" @visible-change="getStation" @change="getData()">
                        <el-option v-for="item in bayAll" :key="item.bayId" :label="item.bayName" :value="item.bayId" />
                    </el-select>
-                    <el-select :disabled="params.bayId == ''" clearable v-model="params.mainDeviceId" placeholder="所属主设备"
-                        style="margin-right:5px ;width: 25%;" @visible-change="gatMain" @change="getData()">
+                    <el-select :disabled="params.bayId == ''" clearable v-model="params.mainDeviceId"
+                        placeholder="所属主设备" style="margin-right:5px ;width: 25%;" @visible-change="gatMain"
+                        @change="getData()">
                        <el-option v-for="item in Masterdata" :key="item.mainDeviceId" :label="item.mainDeviceName"
                            :value="item.mainDeviceId" />
                    </el-select>
@ -342,204 +542,159 @@ const tableRowClassName = ({
                        <el-option v-for="item in meterType" :key="item.itemcode" :label="item.dictname"
                            :value="item.itemcode" />
                    </el-select>
-                    <el-button class="searchButton" type="primary" @click="getData()">搜索</el-button>
-                    <el-button class="searchButton" @click="resetting()">重置</el-button>
+                    <el-button type="primary" @click="getData()">搜索</el-button>
+                    <el-button @click="resetting()">重置</el-button>
                </div>
                <div>
-                    <el-button class="searchButton" @click="setClick" :disabled="deviceInfos.length == 0"
+                    <el-button @click="setClick" :disabled="deviceInfos.length == 0"  v-hasPerm="['update:alarminterval']"
                        :type="deviceInfos.length > 0 ? 'primary' : ''">
-                       
+                        <img v-show="deviceInfos.length != 0" src="@/assets/MenuIcon/yvzhi1.png"
+                            style="margin-right:5px;" alt="">
+                        <img v-show="deviceInfos.length == 0" src="@/assets/MenuIcon/yvzhi2.png"
+                            style="margin-right:5px;" alt="">
                        设置阈值</el-button>
                </div>
            </div>
            <div class="draggable">
-                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(75vh);
-                overflow: auto;margin-bottom: 15px;" row-key="deviceId" @selection-change="handleSelectionChange"
-                    default-expand-all :row-class-name="tableRowClassName"
+               
+                 
+                   
+                    
+                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(100vh - 255px);
+                overflow: auto;margin-bottom: 15px;" row-key="deviceId" border
+                    @selection-change="handleSelectionChange" default-expand-all :row-class-name="tableRowClassName"
                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
-                    <el-table-column type="selection" width="30" align="center" />
-                    <el-table-column type="index" label="序号" width="50px" align="center" />
-                    <el-table-column label="巡视点位名称" prop="deviceName" width="140" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="所属变电站" prop="stationName" width="140" show-overflow-tooltip></el-table-column>
+                    <el-table-column type="selection" width="50" align="center" />
+                    <el-table-column type="index" label="序号" width="80px" align="center" />
+                    <el-table-column label="巡视点位名称" prop="deviceName" width="140"
+                        show-overflow-tooltip></el-table-column>
+                    <el-table-column label="所属变电站" prop="stationName" width="140"
+                        show-overflow-tooltip></el-table-column>
                    <el-table-column label="所属区域" prop="areaName" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column label="所属间隔" prop="bayName" width="110" show-overflow-tooltip></el-table-column>
                    <el-table-column label="所属主机设备" prop="mainDeviceName" width="140"
                        show-overflow-tooltip></el-table-column>
-                    <el-table-column label="主设备类型" prop="mainDeviceType" width="120"
-                        show-overflow-tooltip></el-table-column>
+                    <el-table-column label="主设备类型" prop="deviceType" width="120" show-overflow-tooltip>
+                        <template #default="scope">
+                            <span>{{ currency(EquipmentType, scope.row.deviceType) }}</span>
+                        </template>
+                    </el-table-column>
                    <el-table-column label="所属部件" prop="componentName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="表计类型" prop="meterType" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="识别类型" prop="recognitionTypeNameList" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="预警区间" width="110px">
+                    <el-table-column label="表计类型" prop="meterType" show-overflow-tooltip>
                        <template #default="scope">
-                            <span v-if="scope.row.sameMin != undefined">{{ scope.row.earlyMin + '~' +
-                                scope.row.earlyMax }}</span>
-                            <span v-else>--</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="一般区间" width="110px">
-                        <template #default="scope">
-                            <span v-if="scope.row.sameMin != undefined">{{ scope.row.sameMin + '~' +
-                                scope.row.sameMax }}</span>
-                            <span v-else>--</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="严重区间" width="110px">
-                        <template #default="scope">
-                            <span v-if="scope.row.seriousMin != undefined">{{ scope.row.seriousMin + '~' +
-                                scope.row.seriousMax }}</span>
-                            <span v-else>--</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="危急区间" width="110px">
-                        <template #default="scope">
-                            <span v-if="scope.row.criticalMin != undefined">{{ scope.row.criticalMin + '~' +
-                                scope.row.criticalMax }}</span>
-                            <span v-else>--</span>
+                            <span>{{ currency(meterType, scope.row.meterType) }}</span>
                        </template>
                    </el-table-column>
+                    <el-table-column label="识别类型" prop="recognitionTypeNameList"
+                        show-overflow-tooltip></el-table-column>
+
                    <el-table-column label="单位" prop="unit" show-overflow-tooltip></el-table-column>
                </el-table>
-                <Page :total="total" v-model:size="params.size" v-model:current="params.current" @pagination="getData()">
+                <Page :total="total" v-model:size="params.size" v-model:current="params.current"
+                    @pagination="getData()">
                </Page>
            </div>
        </section>
-        <Eldialog v-if="dialogVisible" :title="'设置阈值'" :zIndex="2000" :width="'600px'" :height="'600px'"
+        <Eldialog v-if="dialogVisible" :title="'设置阈值'" class="AngleBox" :zIndex="2000" :width="'800px'" 
            @before-close="handleClose">
            <template v-slot:PopFrameContent>
-                <div class="inputDiv" style="margin-top:15px;">
-                    <span>预警区间</span>
-                    <el-input class="input" v-model="info.earlyMin" placeholder="预警区间最小值" />
-                    <span>~</span>
-                    <el-input class="input" v-model="info.earlyMax" placeholder="预警区间最大值" />
-                    <span>{{ info.unit }}</span>
-                </div>
-                <div class="inputDiv">
-                    <span>一般区间</span>
-                    <el-input class="input" v-model="info.sameMin" placeholder="一般区间最小值" />
-                    <span>~</span> <el-input class="input" v-model="info.sameMax" placeholder="一般区间最大值" />
-                    <span>{{ info.unit }}</span>
-                </div>
-                <div class="inputDiv">
-                    <span>严重区间</span>
-                    <el-input class="input" v-model="info.seriousMin" placeholder="严重区间最小值" />
-                    <span>~</span>
-                    <el-input class="input" v-model="info.seriousMax" placeholder="严重区间最大值" />
-                    <span>{{ info.unit }}</span>
+                <div style="height:400px;" v-if="info">
+                <div>
+                    <span>规则类型：</span>
+                    <el-radio-group v-model="info.alarmClass">
+                        <el-radio :value="'1'" :label="'1'">阈值类</el-radio>
+                        <el-radio :value="'2'" :label="'2'">状态类</el-radio>
+                        <el-radio :value="'3'" :label="'3'">趋势类</el-radio>
+                    </el-radio-group>
                </div>

-                <div class="inputDiv">
-                    <span>危急区间</span>
-                    <el-input class="input" v-model="info.criticalMin" placeholder="危急区间最小值" />
-                    <span>~</span>
-                    <el-input class="input" v-model="info.criticalMax" placeholder="危急区间最大值" />
-                    <span>{{ info.unit }}</span>
+                <div style="margin-top: 10px;">
+                    <span>告警类型：</span>
+                    <el-select clearable v-model="info.alarmType" placeholder="请选择"
+                        style="margin-right:5px ;width:335px;">
+                        <el-option v-for="item in alarmTypeList" :key="item.itemcode" :label="item.dictname"
+                            :value="item.itemcode" />
+                    </el-select>
                </div>
-                <span class="dialog-footer"
-                    style="width: 100%;margin: auto; display: flex;display: -webkit-flex; justify-content: center;-webkit-justify-content: center;margin: 10px 0px;">
-                    <!-- <el-button @click="handleClose">取 消</el-button>
-                    <el-button type="primary" @click="confirmClick">保存</el-button> -->
-                    <div class="details-button" @click="handleClose">取消</div>
-                    <div class="details-button" @click="confirmClick">确定</div>
-                </span>
+                <div v-if="info.alarmClass == 2 || info.alarmClass == 3">
+                    <span>上次点位比较：</span>
+                    <el-radio-group v-model="info.isLastContrast" @change="radiochange">
+                        <el-radio value="1" :label="'1'" size="large">是</el-radio>
+                        <el-radio value="0" :label="'0'" size="large">否</el-radio>
+                    </el-radio-group>
+                </div>
+                <div style="margin-top: 10px;" v-if="info.alarmClass == 2 || info.alarmClass == 3">
+                    <span v-if="info.alarmClass == 3">基准值A0：</span>
+                    <span v-if="info.alarmClass == 2">基准值：</span>
+                    <el-input v-model="info.baseValue" clearable placeholder="请输入基准值A0"
+                        :disabled="info.isLastContrast == '1'" style="margin-right:5px ;width: 335px;" />
+                    <span style="color: red;" v-if="info.alarmClass == 3">偏差率 = (A1-A0)/A0*100%</span>
+                </div>
+
+                <div v-if="info.alarmClass == 1 || info.alarmClass == 3" style="margin-top: 10px;">
+                    <span>阈值范围：</span>
+                    <div class="inputDiv">
+                        <span>一般区间</span>
+                        <el-input class="input" v-model="info.commonLower" placeholder="一般区间最小值" />
+                        <span>~</span> <el-input class="input" v-model="info.commonUpper" placeholder="一般区间最大值" />
+                        <span>{{ info.unit }}</span>
+                    </div>
+                    <div class="inputDiv">
+                        <span>严重区间</span>
+                        <el-input class="input" v-model="info.seriousLower" placeholder="严重区间最小值" />
+                        <span>~</span>
+                        <el-input class="input" v-model="info.seriousUpper" placeholder="严重区间最大值" />
+                        <span>{{ info.unit }}</span>
+                    </div>
+
+                    <div class="inputDiv">
+                        <span>危急区间</span>
+                        <el-input class="input" v-model="info.dangerLower" placeholder="危急区间最小值" />
+                        <span>~</span>
+                        <el-input class="input" v-model="info.dangerUpper" placeholder="危急区间最大值" />
+                        <span>{{ info.unit }}</span>
+                    </div>
+                </div>
+                <div>
+                    <span>是否启用：</span>
+                    <el-radio-group v-model="info.isenable">
+                        <el-radio value="1" :label="'1'" size="large">启用</el-radio>
+                        <el-radio value="0" :label="'0'" size="large">禁用</el-radio>
+                    </el-radio-group>
+                </div>
+            </div>
+
+
+            <span class="dialog-footer"
+                style="width: 100%;margin: auto; display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;margin-top: 20px;">
+                <el-button @click="handleClose">取 消</el-button>
+                <el-button type="primary" @click="confirmClick">保存</el-button>
+            </span>
            </template>
        </Eldialog>
-        <!-- <el-dialog v-model="dialogVisible" :close-on-click-modal="false" :before-close="handleClose" title="设置阈值"
-            append-to-body width="600px" draggable>
       
-        </el-dialog> -->
    </div>
 </template>

 <style scoped lang="scss">
-.custom2 {
-    color: #fff;
-
-    .custom2-back {
-        width: 600px;
-        max-height: 360px;
-        background: url(@/assets/newimg/jcpz_xz.png);
-        background-size: 100% 100%;
-        position: absolute;
-        z-index: 2023;
-        top: 0px;
-        left: 0px;
-        bottom: 0px;
-        right: 0px;
-        margin: auto;
-        padding: 70px 20px 0px 0px;
-
-        .custom2-title {
-            position: absolute;
-            color: #fff;
-            top: 3px;
-            left: 265px;
-            font-size: 16px;
-        }
-
-        .custom2-close {
-            position: absolute;
-            color: #fff;
-            top: 30px;
-            right: 20px;
-            font-size: 18px;
-            cursor: pointer;
-        }
-    }
-}
-
-.faulttemplate-box {
-    padding: 5px 15px;
-}
-
 .silderRight {
    width: 100%;
-    height: calc(100vh - 160px);
+    height: calc(100vh - 135px);
    overflow: auto;
-    background-color: #17212e;
+    background-color: rgba(255, 255, 255, 1);
    border-radius: 3px;
    padding: 0px 15px 15px 15px;
    padding-bottom: 0px;
    box-sizing: border-box;
-    background: url(@/assets/newimg/cjrw_1890.png);
-    background-size: 100% 100%;
 }

 .inputDiv {
    text-align: center;
+    margin-left: 40px;

    .input {
        width: 35%;
        margin: 10px;
    }
 }
-
-:deep(.el-table:not(.el-table--border) .el-table__cell) {
-    border: none;
-}
-
-// :deep(.el-tree-node.is-current > .el-tree-node__content) {
-//     background:none !important;
-//     background-image: url(@/assets/images/u324.png) !important;
-//     background-size: 100% 100%;
-//     color: #009bff !important;
-//     background-repeat: no-repeat !important;
-// }
-
-
-
-
-:deep(.el-input__wrapper) {
-    background-color: rgba(19, 26, 37, 0);
-}
-
-:deep(.el-select:hover:not(.el-select--disabled) .el-input__wrapper) {
-    box-shadow: 0 0 0 1px #009bff inset;
-}
-
-:deep(.el-select) {
-    --el-select-input-focus-border-color: #009bff !important;
-}
 </style>
-
-
--- a/riis-web/src/views/basedata/device/index.vue
+++ b/riis-web/src/views/basedata/device/index.vue
@ -36,6 +36,7 @@ import Measurement_2 from '@/components/Measurement_2/index.vue'
 import { useUserStore } from '@/store/modules/user';
 import { downloadFile } from '@/utils/index';
 import Eldialog from '@/components/seccmsdialog/eldialog.vue';
+import { getdata } from "@/api/voiceprint";
 const userStore = useUserStore();
 const url = userStore.webApiBaseUrl;
 //左侧树形控件
@ -268,7 +269,7 @@ function delClick() {
 }
 //表格多选
 const deviceInfos: any = ref([])
-function handleSelectionChange(val: any) {
+function handleSelectionChange1(val: any) {
    deviceInfos.value = val
 }
 const tableRowClassName = ({
@ -456,6 +457,7 @@ function addClick() {
        isAlarm: '0',
        deviceInfo: '',
        identifyMaterialId: '0',
+        labelAttri: '0',
        lowerValue: '',
        upperValue: '',
        phase: '',
@ -474,9 +476,10 @@ function addClick() {
        pictureAnalysisTypeList: '',
        PictureAnalysisType: '',
        PictureDefectAnalysisType: '',
+        voiceAnalysisTypeList: [],
        PictureDiscriminateAnalysisType: '',
        outsideFeature: '',
-        deviceClass: '',
+        pointType: '',
        patroldeviceJson: {
            device_name: '',
            device_code: '',
@ -496,10 +499,16 @@ function addClick() {
            alertvalue: '',
        }
    ]
+    vicode.value = [{
+        patroldevice_name: '',
+        patroldevice_code: '',
+    }]
+    duration.value = ''

    imgUrl.value = ''
    deviceIdText.value = ''
    device.value = ''
+    arrdata.value.length = 0
    title.value = "新增巡视点位";
    dialogVisible.value = true;
    beforehandPosition.value = 1
@ -651,12 +660,13 @@ function mainChange(row: any) {
 const deviceIdText = ref()
 const miannDeviceId = ref()
 function handleEdit(row: any) {
+    duration.value = row.duration
    threshold.value = ''
    beforName.value = ''
    tabs.value = 1
    miannDeviceId.value = row.mainDeviceId
    deviceIdText.value = row.deviceId
-
+    arrdata.value.length = 0
    device.value = ''
    title.value = "修改巡视点位";
    dialogVisible.value = true;
@ -672,50 +682,70 @@ function handleEdit(row: any) {
            effective_region: ''
        }
    ]
-    if (row.patroldeviceJson) {
-        if (typeof row.patroldeviceJson != 'object') {
-            row.patroldeviceJson = JSON.parse(row.patroldeviceJson)
-        }
+    vicode.value = [{
+        patroldevice_name: '',
+        patroldevice_code: '',
+    }]
+    if (row.recognitionTypeList == "5") {
+        if (row.patroldeviceJson) {
+            if (typeof row.patroldeviceJson != 'object') {
+                row.patroldeviceJson = JSON.parse(row.patroldeviceJson)

-        if (row.patroldeviceJson.length == 0) {
-            index.value = [
-                {
+            }
+
+            if (row.patroldeviceJson[0].patroldevice_name && row.patroldeviceJson[0].patroldevice_code) {
+                vicode.value = row.patroldeviceJson
+
+
+            } else {
+                vicode.value = [{
                    patroldevice_name: '',
                    patroldevice_code: '',
-                    patroldevice_channelcode: '',
-                    patroldevice_pos: '',
-                    pos_name: '',
-                    baseimage: '',
-                    alertvalue: '',
-                    effective_region: ''
-                }
-            ]
-        } else {
-            index.value = row.patroldeviceJson
+                }]
+            }

-            // channelId.value 
-            getCamera()
        }
+    } else {
+        if (row.patroldeviceJson) {
+            if (typeof row.patroldeviceJson != 'object') {
+                row.patroldeviceJson = JSON.parse(row.patroldeviceJson)
+            }

+            if (row.patroldeviceJson.length == 0) {
+                index.value = [
+                    {
+                        patroldevice_name: '',
+                        patroldevice_code: '',
+                        patroldevice_channelcode: '',
+                        patroldevice_pos: '',
+                        pos_name: '',
+                        baseimage: '',
+                        alertvalue: '',
+                        effective_region: ''
+                    }
+                ]
+            } else {
+                index.value = row.patroldeviceJson
+                getCamera()
+            }
+
+        }
    }

+
    const infoall = JSON.parse(JSON.stringify(row))
    if (infoall.outsideAngle) {
+        // debugger
        if (infoall.recognitionTypeList == "4") {
            droPoint.value = JSON.parse(infoall.outsideAngle)
+        } else if (infoall.recognitionTypeList == "5") {
+            infoall.decibel = JSON.parse(infoall.outsideAngle).decibel
+            infoall.frequency =  JSON.parse(infoall.outsideAngle).frequency
        } else {
            arrdata.value = JSON.parse(infoall.outsideAngle)
        }

    }
-    if (infoall.videoPos) {
-        infoall.videoPos = JSON.parse(infoall.videoPos)
-        infoall.device_code = infoall.videoPos.device_code
-        infoall.device_pos = infoall.videoPos.device_pos
-        infoall.robot_code = infoall.videoPos.robot_code
-        infoall.robot_pos = infoall.videoPos.robot_pos
-        infoall.uav_code = infoall.videoPos.uav_code
-    }
    if (infoall.pictureAnalysisTypeList) {
        infoall.pictureAnalysisTypeList = JSON.parse(infoall.pictureAnalysisTypeList)
        infoall.PictureAnalysisType = infoall.pictureAnalysisTypeList.PictureAnalysisType
@ -727,16 +757,20 @@ function handleEdit(row: any) {
    if (infoall.PictureDefectAnalysisType == undefined || infoall.PictureDefectAnalysisType[0] == '') {
        infoall.PictureDefectAnalysisType = []
    }
+    if (infoall.voiceAnalysisTypeList) {
+        infoall.voiceAnalysisTypeList = infoall.voiceAnalysisTypeList.split(",")
+    }
+
    info.value = infoall
-
-    // info.value.componentId = infoall.componentName
-
-    // beforehandPosition.value = info.value.device_pos
    notification()

 }
 //新增弹窗-基本信息-确定
 function confirmClick(formEl: any) {
+    if (info.value.PictureAnalysisType == undefined && info.value.PictureDefectAnalysisType.length == 0 && info.value.PictureDiscriminateAnalysisType == undefined) {
+        ElMessage.error('请在状态分析类型， 缺陷分析类型，判别分析类型中最少选择一项')
+        return
+    }
    tabs.value = 1
    formEl.validate((valid: any) => {
        if (valid) {
@ -749,13 +783,7 @@ function confirmClick(formEl: any) {
                newObjOne.appearanceType = newObjOne.appearanceType.toString()
            }

-            let newObjThree = {
-                device_code: info.value.device_code,
-                device_pos: info.value.device_pos,
-                robot_code: info.value.robot_code,
-                robot_pos: info.value.robot_pos,
-                uav_code: info.value.uav_code,
-            }
+
            let newObjFour: any = {
                PictureAnalysisType: info.value.PictureAnalysisType,
                PictureDefectAnalysisType: info.value.PictureDefectAnalysisType.toString(),
@ -770,23 +798,42 @@ function confirmClick(formEl: any) {
            newObjOne.PictureDefectAnalysisType = newObjOne.PictureDefectAnalysisType.toString()
            if (info.value.recognitionTypeList == "4") {
                newObjOne.outsideAngle = JSON.stringify(droPoint.value)
+            } else if (info.value.recognitionTypeList == "5") {
+                let pinyv = {
+                    decibel: info.value.decibel,//分贝
+                    frequency: info.value.frequency,//频率
+                }
+                newObjOne.outsideAngle = JSON.stringify(pinyv)
            } else {
                newObjOne.outsideAngle = JSON.stringify(arrdata.value)
            }
-            if (newObjThree.device_code != undefined) {
-                newObjOne.videoPos = JSON.stringify(newObjThree)
-            } else {
-                newObjOne.videoPos = null
+            if (index.value.length > 0) {
+                const videoposlist: any = []
+                index.value.forEach((res: any) => {
+                    videoposlist.push({ device_code: res.patroldevice_code, device_pos: res.patroldevice_pos })
+                })
+                newObjOne.videoPos = JSON.stringify(videoposlist)
+            }
+            newObjOne.pictureAnalysisTypeList = JSON.stringify(tempObjFour)
+            newObjOne.duration = duration.value
+            if (newObjOne.voiceAnalysisTypeList) {
+                newObjOne.voiceAnalysisTypeList = newObjOne.voiceAnalysisTypeList.toString()
            }


-            newObjOne.pictureAnalysisTypeList = JSON.stringify(tempObjFour)
-            if (index.value.length > 0) {
+            if (info.value.recognitionTypeList == 5) {
                if (typeof index.value == 'object') {
-                    newObjOne.patroldeviceJson = JSON.stringify(index.value)
+                    newObjOne.patroldeviceJson = JSON.stringify(vicode.value)
+                }
+            } else {
+                if (index.value.length > 0) {
+                    if (typeof index.value == 'object') {
+                        newObjOne.patroldeviceJson = JSON.stringify(index.value)
+                    }
                }
            }

+
            if (info.value.deviceId) {
                editPosition(newObjOne).then((res: any) => {
                    if (res != undefined && res.code == 0) {
@ -816,6 +863,7 @@ function confirmClick(formEl: any) {
 const allCamera = ref([])
 //获取摄像头数据
 const patroldeviceName = ref()
+const manufacturerList: any = ref([])
 //获取用户列表信息
 onMounted(() => {
    getSelect();
@ -823,6 +871,11 @@ onMounted(() => {
    getDeviceByType({ dictcode: 'DeviceClass' }).then((res: any) => {
        DeviceClass.value = res.data
    })
+    getDeviceByType({ dictcode: 'ManuFacturer' }).then((res: any) => {
+        if (res.data != undefined) {
+            manufacturerList.value = res.data
+        }
+    })
 });
 // function checkSelectable(row: any) {
 //     return row.datastatus == 0
@ -1291,10 +1344,64 @@ const vMove = {
 }
 const activeName = ref('first')
 const handleClick1 = (tab: TabsPaneContext, event: Event) => {
-   
+  console.log(tab.props.name, event);
+  if(tab.props.name == 'three'){
+    getData1()
+  }
 }

 const isGaoliang: any = ref("")
+// 声纹数据获取
+const duration: any = ref('')
+const paramstable1: any = ref({
+    size: 10,
+    current: 1,
+    stationId: '',
+    type: 14,
+    patrolDeviceName: '',
+    deviceModel: '',
+    manufacturer: '',
+})
+const vicode = ref([{
+    patroldevice_name: '',
+    patroldevice_code: '',
+}])
+const total1 = ref()
+const tableData1: any = ref()
+function getData1() {
+    loading.value = true
+    paramstable1.value.stationId = value.value
+    getdata(JSON.stringify(paramstable1.value)).then((res: any) => {
+        loading.value = false
+        tableData1.value = res.data.records
+        total1.value = res.data.total
+        paramstable1.value.size = res.data.size
+        paramstable1.value.current = res.data.current
+        loading.value = false
+        tableData1.value.forEach((item: any) => {
+
+            if (item.patroldeviceCode == vicode.value[0].patroldevice_code) {
+                setTimeout(() => {
+                    multipleTableRef.value!.toggleRowSelection(item, undefined)
+                }, 1000); // 延迟1秒  
+
+            }
+        })
+
+    })
+}
+const multipleTableRef = ref()
+function handleSelectionChange(val: any) {
+    if (val.length > 1) {
+        val.pop()
+        multipleTableRef.value!.toggleRowSelection(val[0], undefined)
+    }
+    if (val[0]) {
+        vicode.value[0].patroldevice_name = val[0].patroldeviceName
+        vicode.value[0].patroldevice_code = val[0].patroldeviceCode
+    }
+
+}
 </script>

 <template>
@ -1316,8 +1423,8 @@ const isGaoliang: any = ref("")
                                    placeholder="请输入巡视点位名称"></el-input>
                            </el-form-item>
                            <el-form-item label="点位分类" style="width:50%" prop="deviceClass">
-                                <el-select v-model="info.deviceClass" placeholder="请选择" style="width: 90%;margin-left: 8px;"
-                                    @visible-change="notification">
+                                <el-select v-model="info.deviceClass" placeholder="请选择"
+                                    style="width: 90%;margin-left: 8px;" @visible-change="notification">
                                    <el-option v-for="item in DeviceClass" :key="item.id" :label="item.dictname"
                                        :value="item.itemcode" />
                                </el-select>
@ -1334,8 +1441,9 @@ const isGaoliang: any = ref("")
                                    placeholder="请输入主设备类型"></el-input>
                            </el-form-item>
                            <el-form-item label="所属部件" style="width:50%" prop="componentId">
-                                <el-select :disabled="info.mainDeviceId == ''" v-model="info.componentId" placeholder="请选择"
-                                    style="width: 90%;margin-left: 8px;" @visible-change="notification">
+                                <el-select :disabled="info.mainDeviceId == ''" v-model="info.componentId"
+                                    placeholder="请选择" style="width: 90%;margin-left: 8px;"
+                                    @visible-change="notification">
                                    <el-option v-for="item in getacaType" :key="item.componentId"
                                        :label="item.componentName" :value="item.componentId" />
                                </el-select>
@ -1348,8 +1456,8 @@ const isGaoliang: any = ref("")
                                </el-select>
                            </el-form-item>
                            <el-form-item label="数据来源" style="width:50%">
-                                <el-select v-model="info.dataType" placeholder="请选择" style="width: 90%;margin-left: 8px;"
-                                    clearable>
+                                <el-select v-model="info.dataType" placeholder="请选择"
+                                    style="width: 90%;margin-left: 8px;" clearable>
                                    <el-option v-for="item in dataType" :key="item.id" :label="item.dictname"
                                        :value="item.itemcode" />
                                </el-select>
@ -1419,16 +1527,21 @@ const isGaoliang: any = ref("")
                                <el-input v-model="info.upperValue" style="width: 90%;;margin-left: 8px;"
                                    placeholder="请输入正常范围上限"></el-input>
                            </el-form-item>
+                            <el-form-item v-if="info.recognitionTypeList == 5" label="频域范围" prop="frequency"
+                                style="width:50%">
+                                <el-input v-model="info.frequency" style="width: 90%;margin-left: 8px;"
+                                    placeholder="例如:20@20000"></el-input>
+                            </el-form-item>
+                            <el-form-item v-if="info.recognitionTypeList == 5" label="分贝区间" prop="decibel"
+                                style="width:50%">
+                                <el-input v-model="info.decibel" style="width: 90%;;margin-left: 8px;"
+                                    placeholder="例如:40@70"></el-input>
+                            </el-form-item>
                            <el-form-item label="计量单位" style="width:50%" prop="unit">
                                <el-input v-model="info.unit" style="width: 90%;;margin-left: 8px;"
                                    placeholder=""></el-input>
                            </el-form-item>
-                            <el-form-item label="相位" style="width:50%;">
-                                <el-select v-model="info.phase" style="width:90%;margin-left: 7px" clearable>
-                                    <el-option v-for="item in DevicePhase" :key="item.id" :label="item.dictname"
-                                        :value="item.itemcode" />
-                                </el-select>
-                            </el-form-item>
+
                            <el-form-item label="是否告警" style="width:50%">
                                <el-radio-group v-model="info.isAlarm" style="margin-left: 10px;">
                                    <el-radio :label="'1'">是</el-radio>
@ -1441,10 +1554,17 @@ const isGaoliang: any = ref("")
                                    <el-radio :label="'0'">否</el-radio>
                                </el-radio-group>
                            </el-form-item>
+                            <el-form-item label="人工关注" style="width:50%">
+                                <el-radio-group v-model="info.labelAttri" style="margin-left: 10px;">
+                                    <el-radio :label="'1'">是</el-radio>
+                                    <el-radio :label="'0'">否</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
                            <el-form-item label="备注信息" prop="deviceInfo"
                                style="width:100%;margin-left: 8px;display:flex;align-items:flex-start !important;">
-                                <el-input type="textarea" v-model="info.deviceInfo" :autosize="{ minRows: 2, maxRows: 8 }"
-                                    style="width: 96% ;" placeholder="请输入备注信息"></el-input>
+                                <el-input type="textarea" v-model="info.deviceInfo"
+                                    :autosize="{ minRows: 2, maxRows: 8 }" style="width: 96% ;"
+                                    placeholder="请输入备注信息"></el-input>
                            </el-form-item>
                            <div style="width:90%;display:flex;">

@ -1460,7 +1580,8 @@ const isGaoliang: any = ref("")
                            <div class="details-button" @click="confirmClick(infoForm)">确定</div>
                        </span>
                    </el-tab-pane>
-                    <el-tab-pane label="摄像机设置" name="second">
+
+                    <el-tab-pane label="摄像机设置" name="second" v-if="info.recognitionTypeList != 5">
                        <el-scrollbar height="645px">
                            <div style="display: flex;align-items: center;margin-top: 20px;">
                                <div style="width: 5px;height: 15px;background: #409eff;"></div>
@ -1499,7 +1620,8 @@ const isGaoliang: any = ref("")
                            </div>
                            <div style="margin-top:10px;">

-                                <el-table :data="arrdata" style="width: 100%;margin-top:10px;height: 418px; overflow: auto;"
+                                <el-table :data="arrdata"
+                                    style="width: 100%;margin-top:10px;height: 418px; overflow: auto;"
                                    v-if="info.recognitionTypeList == 1"
                                    :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
                                    <el-table-column prop="index" label="序号" width="100" align="center" />
@ -1535,6 +1657,48 @@ const isGaoliang: any = ref("")
                            </div>
                        </el-scrollbar>
                    </el-tab-pane>
+                    <el-tab-pane label="声纹设置" name="three" v-if="info.recognitionTypeList == 5">
+                        <div style="display:flex;align-items:center;"><span>录制时长:</span> <el-input v-model="duration"
+                                placeholder=" " clearable style="width:250px;margin-left:15px;">
+                                <template #append>秒</template>
+                            </el-input></div>
+                        <el-table v-loading="loading" :data="tableData1" style="width: 100%;height: calc(40vh);margin-top:15px;
+                        overflow: auto;;margin-bottom: 15px;" row-key="id" border
+                            @selection-change="handleSelectionChange" default-expand-all
+                            :row-class-name="tableRowClassName" ref="multipleTableRef"
+                            :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px' }">
+                            <el-table-column type="selection" width="50" align="center" />
+                            <el-table-column type="index" label="序号" width="70px" align="center" />
+                            <el-table-column label="设备编码" prop="patroldeviceCode"></el-table-column>
+                            <el-table-column label="设备名称" prop="patroldeviceName"></el-table-column>
+                            <el-table-column label="设备型号" prop="deviceModel" width="100"></el-table-column>
+                            <el-table-column label="设备来源" prop="deviceSource" width="110"></el-table-column>
+                            <el-table-column label="生产厂家" prop="manufacturer" width="110">
+                                <template #default="scope">
+                                    {{ currency(manufacturerList, scope.row.manufacturer) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="安装位置" prop="place"></el-table-column>
+                            <el-table-column label="实时状态" width="100" prop="datastatus">
+                                <template #default="scope">
+                                    <span v-if="scope.row.datastatus == 1" style="color:#409F84"><img
+                                            src="@/assets/MenuIcon/u495.png" alt=""
+                                            style="display: inline-block; margin: 0px 5px; "> 在线</span>
+                                    <span v-else style="color:#F24444"> <img src="@/assets/MenuIcon/u499.png" alt=""
+                                            style="display: inline-block; margin: 0px 5px; ">离线</span>
+                                </template>
+                            </el-table-column>
+
+                        </el-table>
+                        <Page :total="total1" v-model:size="paramstable1.size" v-model:current="paramstable1.current"
+                            @pagination="getData1()"></Page>
+                        <span class="dialog-footer"
+                            style="width: 100%;margin: auto; display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;margin-top: 20px;">
+                            <el-button @click="handleClose">取 消</el-button>
+                            <el-button type="primary" @click="confirmClick(infoForm)"
+                                style="margin-right: 15px;">保存</el-button>
+                        </span>
+                    </el-tab-pane>
                </el-tabs>
            </template>
        </Eldialog>
@ -1550,7 +1714,8 @@ const isGaoliang: any = ref("")
                    :value="item.stationId" style="width:100%" />
            </el-select>
            <el-scrollbar height="calc(78vh)" style="width:99%">
-                <el-tree ref="treeRef" :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
+                <el-tree ref="treeRef"
+                    :class="useAppStore().size === 'default' ? 'silderLeft-large' : 'silderLeft-default'"
                    node-key="bayId" :data="treedata" :current-node-key="currentNodeKey" :highlight-current="true"
                    :props="defaultProps" v-loading="treeloading" @node-click="handleNodeClick">
                    <template #default="{ node }">
@ -1571,13 +1736,13 @@ const isGaoliang: any = ref("")

                    <el-input v-model="deviceName" placeholder="请输入巡视点位名称" @clear="getData()" @keyup.enter="getData()"
                        style="margin-right:15px ;width: 185px;" clearable />
-                    <el-select clearable v-model="paramstable.mainDeviceId" placeholder="所属主设备" style="margin-right:15px ;"
-                        @visible-change="notification" @change="getData()">
+                    <el-select clearable v-model="paramstable.mainDeviceId" placeholder="所属主设备"
+                        style="margin-right:15px ;" @visible-change="notification" @change="getData()">
                        <el-option v-for="item in mainEquipment" :key="item.mainDeviceId" :label="item.mainDeviceName"
                            :value="item.mainDeviceId" />
                    </el-select>
-                    <el-select clearable v-model="paramstable.componentId" placeholder="所属部件" style="margin-right:15px ;"
-                        @visible-change="notification" @change="getData()">
+                    <el-select clearable v-model="paramstable.componentId" placeholder="所属部件"
+                        style="margin-right:15px ;" @visible-change="notification" @change="getData()">
                        <el-option v-for="item in getacaTypeBayId" :key="item.componentId" :label="item.componentName"
                            :value="item.componentId" />
                    </el-select>
@ -1593,14 +1758,15 @@ const isGaoliang: any = ref("")
                    <el-button class="searchButton" v-hasPerm="['add:device']" type="primary" @click="addClick"
                        :disabled="treedata.length == 0"> 新增</el-button>
                    <el-button class="searchButton" v-hasPerm="['del:device']" @click="delClick"
-                        :disabled="deviceInfos.length == 0" :type="deviceInfos.length > 0 ? 'primary' : ''"> 删除</el-button>
+                        :disabled="deviceInfos.length == 0" :type="deviceInfos.length > 0 ? 'primary' : ''">
+                        删除</el-button>
                </div>
            </div>
            <div class="draggable">
                <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(78vh);
-                overflow: auto;;margin-bottom: 15px;" row-key="id" @selection-change="handleSelectionChange"
+                overflow: auto;;margin-bottom: 15px;" row-key="id" @selection-change="handleSelectionChange1"
                    default-expand-all :row-class-name="tableRowClassName"
-                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px'}">
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px' }">
                    <el-table-column type="selection" width="30" align="center" />
                    <el-table-column type="index" label="序号" width="50px" align="center" />
                    <el-table-column label="巡视点位编号" prop="deviceCode" width="140"></el-table-column>
@ -1641,8 +1807,8 @@ const isGaoliang: any = ref("")
                                <img v-hasPerm="['del:device']" src="@/assets/newimg/ht_sc.png" alt=""
                                    v-if="scope.row.datastatus == 0" title="删除" @click="handleDelete(scope.row)"
                                    style="cursor: pointer; ">
-                                <img v-hasPerm="['del:device']" src="@/assets/newimg/ht_sc1.png" alt="" v-else title="删除"
-                                    style="cursor: pointer; ">
+                                <img v-hasPerm="['del:device']" src="@/assets/newimg/ht_sc1.png" alt="" v-else
+                                    title="删除" style="cursor: pointer; ">
                            </span>
                        </template>
                    </el-table-column>
@ -1695,8 +1861,9 @@ const isGaoliang: any = ref("")
                                        <span v-if="node.level == 1"
                                            :style="{ color: node.data.online == '1' ? '#409eff' : 'red' }">
                                            <svg t="1686725618148" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                                                style="margin-right: 5px;" xmlns="http://www.w3.org/2000/svg" p-id="2814"
-                                                xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18">
+                                                style="margin-right: 5px;" xmlns="http://www.w3.org/2000/svg"
+                                                p-id="2814" xmlns:xlink="http://www.w3.org/1999/xlink" width="18"
+                                                height="18">
                                                <path fill="currentColor"
                                                    d="M954.88 590.72a432.64 432.64 0 0 0-409.6-457.6V0H151.04v64h263.04v76.8c-201.6 38.4-344.96 203.52-344.96 448-1.28 0.64 887.04 4.48 885.76 1.92zM197.76 661.12C198.4 860.16 311.68 1024 512 1024s314.24-161.92 314.24-360.96H197.76zM512 912A85.76 85.76 0 0 1 420.48 832 86.4 86.4 0 0 1 512 752.64 86.4 86.4 0 0 1 603.52 832 85.76 85.76 0 0 1 512 912z"
                                                    p-id="2815"></path>
@ -1715,29 +1882,34 @@ const isGaoliang: any = ref("")
                        <div class="Camera-left">
                            <div class="Camera-img">
                                <JessibucaPlayer v-if="dialogMonitor" :_uid="33" ref="jessibuca" :visible.sync="true"
-                                    :videoUrl="urls" :videofmp4="videofmp4" height="100px" :hasAudio="true" fluent autoplay
-                                    live></JessibucaPlayer>
+                                    :videoUrl="urls" :videofmp4="videofmp4" height="100px" :hasAudio="true" fluent
+                                    autoplay live></JessibucaPlayer>
                            </div>
                            <div class="Camera-left-bottom">
                                <div class="Camera-buttons-box">
                                    <div class="Camera-left-button1" @mousedown="ptzCamera('up')"
                                        @mouseup="ptzCamera('stop')"></div>
                                    <div class="Camera-left-button2" @mousedown="ptzCamera('upright')"
-                                        @mouseup="ptzCamera('stop')"></div>
+                                        @mouseup="ptzCamera('stop')">
+                                    </div>
                                    <div class="Camera-left-button3" @mousedown="ptzCamera('right')"
                                        @mouseup="ptzCamera('stop')"></div>
                                    <div class="Camera-left-button4" @mousedown="ptzCamera('downright')"
-                                        @mouseup="ptzCamera('stop')"></div>
+                                        @mouseup="ptzCamera('stop')">
+                                    </div>
                                    <div class="Camera-left-button5" @mousedown="ptzCamera('down')"
                                        @mouseup="ptzCamera('stop')"></div>
                                    <div class="Camera-left-button6" @mousedown="ptzCamera('downleft')"
-                                        @mouseup="ptzCamera('stop')"></div>
+                                        @mouseup="ptzCamera('stop')">
+                                    </div>
                                    <div class="Camera-left-button7" @mousedown="ptzCamera('left')"
                                        @mouseup="ptzCamera('stop')"></div>
                                    <div class="Camera-left-button8" @mousedown="ptzCamera('upleft')"
-                                        @mouseup="ptzCamera('stop')"></div>
+                                        @mouseup="ptzCamera('stop')">
+                                    </div>
                                    <div class="Camera-left-button9" @click="presetPosition(130, beforehandPosition)"
-                                        title="回到初始位置"></div>
+                                        title="回到初始位置">
+                                    </div>
                                </div>

                                <div class="Camera-left-buttons">
@ -1750,24 +1922,27 @@ const isGaoliang: any = ref("")
                                        </div>
                                        <div class="videoOperationstext">缩放</div>
                                        <div class="videoOperations" style="border-radius:0 4px 4px 0;"
-                                            :class="{ 'gaolaing': isGaoliang == 'zoomin' }" @mousedown="ptzCamera('zoomin')"
-                                            @mouseup="ptzCamera('stop')"><el-icon>
+                                            :class="{ 'gaolaing': isGaoliang == 'zoomin' }"
+                                            @mousedown="ptzCamera('zoomin')" @mouseup="ptzCamera('stop')"><el-icon>
                                                <Plus />
                                            </el-icon></div>
                                    </div>
                                    <div style="display: flex;margin-top:15px;">
                                        <div class="videoOperations" @mouseup="quxiao"
-                                            :class="{ 'gaolaing': isGaoliang == '66' }" @mousedown="condensationChang('减')">
+                                            :class="{ 'gaolaing': isGaoliang == '66' }"
+                                            @mousedown="condensationChang('减')">
                                            <el-icon>
                                                <Minus />
                                            </el-icon>
                                        </div>
                                        <div class="videoOperationstext">光聚</div>
                                        <div class="videoOperations" @mouseup="quxiao"
-                                            :class="{ 'gaolaing': isGaoliang == '65' }" style="border-radius:0 4px 4px 0;"
-                                            @mousedown="condensationChang('加')"><el-icon>
+                                            :class="{ 'gaolaing': isGaoliang == '65' }"
+                                            style="border-radius:0 4px 4px 0;" @mousedown="condensationChang('加')">
+                                            <el-icon>
                                                <Plus />
-                                            </el-icon></div>
+                                            </el-icon>
+                                        </div>
                                    </div>
                                    <div style="display: flex;margin-top:15px;">
                                        <div class="videoOperations" @mouseup="quxiao"
@ -1778,8 +1953,8 @@ const isGaoliang: any = ref("")
                                        </div>
                                        <div class="videoOperationstext">光圈</div>
                                        <div class="videoOperations" @mouseup="quxiao"
-                                            :class="{ 'gaolaing': isGaoliang == '70' }" style="border-radius:0 4px 4px 0;"
-                                            @mousedown="apertureChang('加')">
+                                            :class="{ 'gaolaing': isGaoliang == '70' }"
+                                            style="border-radius:0 4px 4px 0;" @mousedown="apertureChang('加')">
                                            <el-icon>
                                                <Plus />
                                            </el-icon>
@ -1803,9 +1978,9 @@ const isGaoliang: any = ref("")
                                        </div>
                                        <div style="display: flex;"><span
                                                style="display: block;;padding-left:15px;display: inline-block;width: 50px;">雨刷</span>
-                                            <el-switch class="nei" style="display: block;margin-left:0px" v-model="isWiper"
-                                                inline-prompt active-text="开" inactive-text="关" @change="WiperClick"
-                                                active-value="1" inactive-value="0" />
+                                            <el-switch class="nei" style="display: block;margin-left:0px"
+                                                v-model="isWiper" inline-prompt active-text="开" inactive-text="关"
+                                                @change="WiperClick" active-value="1" inactive-value="0" />
                                        </div>

                                    </div>
@ -1833,7 +2008,8 @@ const isGaoliang: any = ref("")
                                        <div v-if="indexRow % 2 == 1" style="width: 60px;margin-left: 20px;"><el-input
                                                v-model="threshold"></el-input></div>
                                        <div v-if="indexRow % 2 == 0" style="margin-left: 100px;"></div>
-                                        <el-button class="searchButton" type="primary" style="width:90px;margin-left: 15px;"
+                                        <el-button class="searchButton" type="primary"
+                                            style="width:90px;margin-left: 15px;"
                                            @click="maintenanceArea">有效区域设置</el-button>
                                        <el-button class="searchButton" type="primary" style="width:90px;"
                                            @click="importclick()">保存基准图</el-button>
@ -1886,20 +2062,20 @@ const isGaoliang: any = ref("")
        <Eldialog v-if="isMaintenanceArea" class="AngleBox" :title="'维护生效区域'" :zIndex="2000" :width="'1280px'"
            :height="'600px'" @before-close="closeMaintenanceArea">
            <template v-slot:PopFrameContent>
-                <MaintenanceArea v-if="isMaintenanceArea" :AngleUrl="AngleUrl" :Custom3="Custom3" style="margin-top: 15px;"
-                    @closeMaintenanceArea="closeMaintenanceArea" />
+                <MaintenanceArea v-if="isMaintenanceArea" :AngleUrl="AngleUrl" :Custom3="Custom3"
+                    style="margin-top: 15px;" @closeMaintenanceArea="closeMaintenanceArea" />
            </template>
        </Eldialog>
-        <Eldialog v-if="isMeasurement" class="AngleBox" :title="'测温设置'" :zIndex="2000" :width="'1320px'" :height="'600px'"
-            @before-close="closeMeasurement">
+        <Eldialog v-if="isMeasurement" class="AngleBox" :title="'测温设置'" :zIndex="2000" :width="'1320px'"
+            :height="'600px'" @before-close="closeMeasurement">
            <template v-slot:PopFrameContent>
                <!-- <el-scrollbar height="720px"> -->
-                    <!-- <el-scrollbar> -->
-                        <div  style=" width:1280px;height:720px;overflow-y: auto;overflow-x: auto;margin-top:10px;">
-                            <Measurement v-if="isMeasurement" :AngleUrl="AngleUrl" :droPoint="droPoint" :imgWidth='imgWidth'
-                                style="margin-top: 15px;" :imgHeight='imgHeight' @closeMeasurement="closeMeasurement" />
-                        </div>
-                    <!-- </el-scrollbar> -->
+                <!-- <el-scrollbar> -->
+                <div style=" width:1280px;height:720px;overflow-y: auto;overflow-x: auto;margin-top:10px;">
+                    <Measurement v-if="isMeasurement" :AngleUrl="AngleUrl" :droPoint="droPoint" :imgWidth='imgWidth'
+                        style="margin-top: 15px;" :imgHeight='imgHeight' @closeMeasurement="closeMeasurement" />
+                </div>
+                <!-- </el-scrollbar> -->

                <!-- </el-scrollbar> -->

@ -2502,6 +2678,5 @@ const isGaoliang: any = ref("")

 .gaolaing {
    background: rgba(50, 177, 245, 0.4)
-}</style>
-
-
+}
+</style>
--- a/riis-web/src/views/basedata/maintenancePlan/index.vue
+++ b/riis-web/src/views/basedata/maintenancePlan/index.vue
@ -22,7 +22,7 @@ import {
  getComponentByBayId,
  getBindExamineDevice
 } from '@/api/task';
-import { getRobotAndUavList, getSubstationNaviTree } from '@/api/makeTask';
+import { getRobotAndUavList, getBayTree } from '@/api/makeTask';
 import { getdevicedata } from '@/api/device';
 import { getTreeList } from '@/api/linksignal';
 import { getDeviceByType, getaccType, getMainEquipment } from '@/api/device';
@ -574,7 +574,7 @@ function getTree(val: any) {
    stationId: val
  };
  publicRelevanceData.value = [];
-  getSubstationNaviTree(params)
+  getBayTree(params)
    .then((res: any) => {

      treedata.value = res.data;
@ -1055,20 +1055,19 @@ function currency(list: any, itemcode: any) {
  return dictname;
 }
 const tableRowClassName = ({
-  row,
-  rowIndex
+    row,
+    rowIndex,
 }: {
-  row: any;
-  rowIndex: number;
+    row: any
+    rowIndex: number
 }) => {
-  row.row_index = rowIndex;
-  for (let i = 0; i < deviceInfos.value.length; i++) {
-    if (deviceInfos.value[i].row_index === rowIndex) {
-      return 'success-row';
+    if (rowIndex % 2 === 0) {
+        return 'warning-row'
+    } else if (rowIndex % 2 === 1) {
+        return 'success-row'
    }
-  }
-  return '';
-};
+    return ''
+}
 onMounted(() => {
  getData();
  getDict();
@ -1138,7 +1137,7 @@ function getrobotUAV() {
        </div>
      </div>
      <div class="draggable">
-        <el-table stripe :header-cell-style="tableBg" v-loading="planLoading" :data="tableData" style="
+        <el-table stripe :header-cell-style="tableBg" v-loading="planLoading" :data="tableData"  :row-class-name="tableRowClassName" style="
            width: 100%;
            height: calc(75vh);
            overflow: auto;
@ -1284,7 +1283,7 @@ function getrobotUAV() {
            <div class="publicline"></div>
            <div class="publictitle" style="color:#ffffff;">关联结果</div>
          </div>
-          <el-table v-if="resultData.length != 0" :data="resultData" style="width: 100%" row-key="id"
+          <el-table v-if="resultData.length != 0" :data="resultData" style="width: 100%" row-key="id" :row-class-name="tableRowClassName"
            :header-cell-style="tableBg" stripe :height="'calc(100vh - 400px)'">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column v-if="examineInfo.deviceLevel == '' ||
@ -1397,7 +1396,7 @@ function getrobotUAV() {
              <el-button class="searchButton" type="primary" @click="addPublic()">添加</el-button>
            </div>
            <div class="draggable">
-              <el-table :header-cell-style="tableBg" stripe :row-key="rowRelevanceKey" ref="multipleTableRef"
+              <el-table :header-cell-style="tableBg" stripe :row-key="rowRelevanceKey" ref="multipleTableRef" :row-class-name="tableRowClassName"
                v-loading="loading3" :data="publicRelevanceData" style="width: 100%"
                @selection-change="publicSelectionChange" :height="'calc(100vh - 360px)'">
                <el-table-column type="selection" width="50" align="center" />
@ -1430,7 +1429,7 @@ function getrobotUAV() {
    <Eldialog v-model="noneShow" :close-on-click-modal="false" @before-close="deviceClose" :title="'屏蔽的巡视点位'"
      append-to-body width="1100px" draggable>
      <template v-slot:PopFrameContent>
-        <el-table :header-cell-style="tableBg" stripe :row-key="rowRelevanceKey" ref="multipleTableRef"
+        <el-table :header-cell-style="tableBg" stripe :row-key="rowRelevanceKey" ref="multipleTableRef" :row-class-name="tableRowClassName"
          v-loading="loading4" :data="deviceData" style="width: 100%;margin-top:10px"
          @selection-change="publicSelectionChange" :height="'calc(100vh - 260px)'">
          <el-table-column type="index" label="序号" width="50" align="center" />
@ -1463,7 +1462,7 @@ function getrobotUAV() {
  padding: 5px 0px 10px;
  box-sizing: border-box;
  // background: #fff; 
-  background-image: url(@/assets/newimg/jcpz_260.png);
+  background-image: url(@/assets/navigation/sanwei.png);
  background-size: 100% 100%;
  border-radius: 3px;
  position: relative;
@ -1474,7 +1473,7 @@ function getrobotUAV() {
 .silderBox {
  width: 100%;
  height: calc(89vh);
-  background-color: #131a25;
+  // background-color: #131a25;
  border: none;
  border-radius: 3px;
  padding: 5px 20px 0px;
@ -1487,9 +1486,8 @@ function getrobotUAV() {
 .silderRight {
  flex: 1;
  width: 100%;
-  height: calc(100vh - 290px);
+  height: calc(100vh - 290px) !important;
  overflow: auto;
-  // background-color: rgba(255, 255, 255, 1);
  border-radius: 3px;
  padding-bottom: 0px;
  box-sizing: border-box;
--- a/riis-web/src/views/basedata/substation/index.vue
+++ b/riis-web/src/views/basedata/substation/index.vue
@ -857,7 +857,7 @@ const tableRowClassName = ({
    width: 100%;
    height: calc(89vh);
    // overflow: auto;
-    background-color: #131a25;
+    // background-color: #131a25;
    border: none;
    border-radius: 3px;
    padding: 5px 20px 0px;
--- a/riis-web/src/views/collectmonitor/datasurvey/index.vue
+++ b/riis-web/src/views/collectmonitor/datasurvey/index.vue
@ -279,13 +279,13 @@ onMounted(() => {
                    </div>
                    <div class="cont_bottom">
                        <el-table v-loading="loading" :data="tableData" style="width: 100%;height: calc(30vh);
-                overflow: auto;;margin-bottom: 15px;" row-key="id" default-expand-all
+                            overflow: auto;;margin-bottom: 15px;" row-key="id" default-expand-all
                            :row-class-name="tableRowClassName"
                            :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px' }">
                            <el-table-column type="index" label="序号" width="50px" align="center" />
+                            <el-table-column label="采集时间" prop="startTime" width="120"></el-table-column>
                            <el-table-column label="监测数值" prop="value"></el-table-column>
                            <el-table-column label="单位" prop="unit"></el-table-column>
-                            <el-table-column label="采集时间" prop="startTime" width="120"></el-table-column>
                        </el-table>
                        <Page :total="total" v-model:size="tableform.size" v-model:current="tableform.current"
                            @pagination="gettabledata()">
--- a/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue
+++ b/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue
@ -8,8 +8,8 @@ export default {
 import { ref, onMounted, onBeforeUnmount, } from 'vue'
 import Page from '@/components/Pagination/page.vue'
 import { useUserStore } from '@/store/modules/user';
-import {  getWeatherLogList } from "@/api/home";
-import {  getWeatherLogPage} from "@/api/environmentalMonitoring";
+import {  getWeatherLogList,getDeviceWorkData } from "@/api/home";
+import {  getWeatherLogPage,getdeviceworkdata} from "@/api/environmentalMonitoring";
 import { getDeviceByType } from "@/api/device";
 const userStore = useUserStore();
 const tableData = ref([])
@ -52,7 +52,7 @@ function getEnvironment() {
        environment_params.value.startDate = ''
        environment_params.value.endDate = ''
    }
-    getWeatherLogPage(environment_params.value).then((res: any) => {
+    getdeviceworkdata(environment_params.value).then((res: any) => {
        environment_data.value = res.data.records
        environment_params.value.size = res.data.size
        environment_params.value.current = res.data.current
@ -69,101 +69,70 @@ function environmentReset(){

 // 环境WebSocket
 const environment = ref()
-const environmentInfo:any = ref({
-  temperature: "",
-  humidity: "",
-  rainfall: "",
-  windSpeed: "",
-  windDirection: "",
-  pressure: ""
-})
-const ws1 = new WebSocket(userStore.wsApiBaseUrl + '/websocket/vibe_run_data_' + userStore.userId);
-function setupWebSocket() {
+const environmentInfo:any = ref([])
+// const ws1 = new WebSocket(userStore.wsApiBaseUrl + '/websocket/vibe_run_data_' + userStore.userId);
+// function setupWebSocket() {

-ws1.onopen = () => {
+// ws1.onopen = () => {

-};
-ws1.onerror = (error: any) => {
-};
-ws1.onmessage = (e: any) => {
+// };
+// ws1.onerror = (error: any) => {
+// };
+// ws1.onmessage = (e: any) => {
  
-  if (e.data != 0) {
-    environment.value = JSON.parse(e.data)
-    if (environment.value.type == 1) {
-      environmentInfo.value.temperature = environment.value.value
-    }
-    if (environment.value.type == 2) {
-      environmentInfo.value.humidity = environment.value.value
-    }
-    if (environment.value.type == 3) {
-      environmentInfo.value.windSpeed = environment.value.value
-    }
-    if (environment.value.type == 4) {
-      environmentInfo.value.rainfall = environment.value.value
-    }
-    if (environment.value.type == 5) {
-      environmentInfo.value.windDirection = environment.value.value
-    }
-    if (environment.value.type == 6) {
-      environmentInfo.value.pressure = environment.value.value
-    }
-    if (environment.value.type == 7) {
-      environmentInfo.value.oxygen = environment.value.value
-    }
-    if (environment.value.type == 8) {
-      environmentInfo.value.sf6 = environment.value.value
-    }
-  }
-}
-ws1.onclose = () => {
-};
+//   if (e.data != 0) {
+//     environment.value = JSON.parse(e.data)
+//     if (environment.value.type == 1) {
+//       environmentInfo.value.temperature = environment.value.value
+//     }
+//     if (environment.value.type == 2) {
+//       environmentInfo.value.humidity = environment.value.value
+//     }
+//     if (environment.value.type == 3) {
+//       environmentInfo.value.windSpeed = environment.value.value
+//     }
+//     if (environment.value.type == 4) {
+//       environmentInfo.value.rainfall = environment.value.value
+//     }
+//     if (environment.value.type == 5) {
+//       environmentInfo.value.windDirection = environment.value.value
+//     }
+//     if (environment.value.type == 6) {
+//       environmentInfo.value.pressure = environment.value.value
+//     }
+//     if (environment.value.type == 7) {
+//       environmentInfo.value.oxygen = environment.value.value
+//     }
+//     if (environment.value.type == 8) {
+//       environmentInfo.value.sf6 = environment.value.value
+//     }
+//   }
+// }
+// ws1.onclose = () => {
+// };

-}
+// }
 function getInit() {
  let params = {
    stationId: userStore.stationId
  }
-  getWeatherLogList(params).then((res: any) => {
+  getDeviceWorkData(params).then((res: any) => {

    environmentInfo.value = res.data
-    if (!res.data.temperature ) {
-      environmentInfo.value.temperature = "无"
-    }
-    if (!res.data.humidity ) {
-      environmentInfo.value.humidity = "无"
-    }
-    if (!res.data.rainfall ) {
-      environmentInfo.value.rainfall = "无"
-    }
-    if (!res.data.windSpeed ) {
-      environmentInfo.value.windSpeed = "无"
-    }
-    if (!res.data.windDirection ) {
-      environmentInfo.value.windDirection = "无"
-    }
-    if (!res.data.pressure) {
-      environmentInfo.value.pressure = "无"
-    }
-    if (!res.data.oxygen) {
-      environmentInfo.value.oxygen = "无"
-    }
-    if (!res.data.sf6) {
-      environmentInfo.value.sf6  = "无"
-    }
  })
 
 }
 onMounted(() => { 
  getInit()
-  setupWebSocket()
+//setupWebSocket()
  getEnvironment()
  gettype()
 });
-onBeforeUnmount(() => {
-  if (ws1 != null) {
-    ws1.close()
-  }
-})
+// onBeforeUnmount(() => {
+//   if (ws1 != null) {
+//     ws1.close()
+//   }
+// })
 function currency(list: any, itemcode: any) {
    let dictname = ''
    list.forEach((element: any) => {
@ -173,75 +142,25 @@ function currency(list: any, itemcode: any) {
    })
    return dictname
 }
-const EquipmentType= ref([])
+const EquipmentType:any= ref([])
 function gettype(){
-    getDeviceByType({ dictcode: 'EnvironmentType' }).then((res: any) => {
+    getDeviceByType({ dictcode: 'system' }).then((res: any) => {
        EquipmentType.value = res.data
    })
 }
-
 </script>

 <template>
    <div class="all_box">
                <div class="img_box">
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj1.png" alt=""></div> 
+                    <div class="img_box_one" v-for="(item,index) in environmentInfo">
+                        <div><img :src="`/environment/${item.itemcode}.png`" alt=""></div> 
                        <div class="img_box_nei">
-                            <div class="img_text1">空气温度</div>
-                            <div class="img_text2">{{ environmentInfo.temperature }}<span class="img_unit"> ℃</span></div>
+                            <div class="img_text1">{{ item.dictname }}</div>
+                            <div v-if="item.value != '无'" class="img_text2">{{item.dictname == '风向'? item.value: Number(item.value).toFixed(2)}}<span class="img_unit"> {{ item.unit }}</span></div>
+                            <div v-else class="img_text2">{{item.value}}</div>
                        </div>
                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj2.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">空气湿度</div>
-                            <div class="img_text2">{{ environmentInfo.humidity }} <span class="img_unit"> RH</span></div>
-                        </div>
-                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj3.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">降雨量</div>
-                            <div class="img_text2">{{ environmentInfo.rainfall }} <span class="img_unit"> mm</span></div>
-                        </div>
-                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj4.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">风速</div>
-                            <div class="img_text2">{{ environmentInfo.windSpeed }} <span class="img_unit"> 级</span></div>
-                        </div>
-                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj5.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">风向</div>
-                            <div class="img_text2">{{ environmentInfo.windDirection }} </div>
-                        </div>
-                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj6.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">气压</div>
-                            <div class="img_text2">{{ environmentInfo.pressure }} <span class="img_unit"> hpa</span></div>
-                        </div>
-                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj7.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">氧气</div>
-                            <div class="img_text2">{{ environmentInfo.oxygen }} <span class="img_unit"> %</span></div>
-                        </div>
-                    </div>
-                    <div class="img_box_one">
-                        <div><img src="@/assets/navigation/hjjc_sj8.png" alt=""></div> 
-                        <div class="img_box_nei">
-                            <div class="img_text1">SF6</div>
-                            <div class="img_text2">{{ environmentInfo.sf6  }} <span class="img_unit"> %</span></div>
-                        </div>
-                    </div>
-
                </div>
                <div class="environment_table">
                    <div class="table-title">
@ -263,19 +182,19 @@ function gettype(){
                        style="width: 100%;margin:auto;position: relative;margin-top: 15px; height:calc(56vh); overflow: auto "
                        :header-cell-style="{ background: '#253b51', color: '#b5d7ff', height: '50px' }">
                        <el-table-column type="index" label="序号" width="80px" align="center" />
-                        <el-table-column property="patroldeviceCode" label="设备编号" align="center"  />
-                        <el-table-column property="patroldeviceName" label="设备名称" align="center"  />
-                        <el-table-column property="type" label="环境 类型" align="center">
+                        <el-table-column property="deviceName" label="监控设备名称" align="center"  />
+                        <el-table-column property="signalName" label="监控信号名称" align="center"  />
+                        <el-table-column property="systemcode" label="所属系统" align="center" width="100px">
                            <template #default="scope">
-                                <span>{{ currency(EquipmentType, scope.row.type) }}</span>
+                                <span>{{ currency(EquipmentType, scope.row.systemcode) }}</span>
                            </template>
                        </el-table-column>
-                        <el-table-column property="taskName" label="监测数值" align="center">
+                        <el-table-column property="taskName" label="监测数值" align="center" width="100px">
                            <template #default="scope">
                            <div v-if="scope.row.value">{{ scope.row.value }}{{scope.row.unit}}</div>
                            </template>
                        </el-table-column>
-                        <el-table-column property="time" label="监测时间" align="center"  />
+                        <el-table-column property="startTime" label="采集时间" align="center" width="160px"  />
                    </el-table>
                    <div style="width:100%;display:flex;align-items:center;margin-top:10px;">
                        <Page style="margin:0 auto ;" :total="hutotal" v-model:size="environment_params.size" :jumper="'hide'"
@ -326,7 +245,7 @@ function gettype(){
            .img_text2 {
                font-family: '钉钉进步体 Bold', '钉钉进步体';
                font-weight: 700;
-                font-size: 36px;
+                font-size: 24px;
                color: #00ffff;

                .img_unit {
--- a/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue
+++ b/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue
@ -372,7 +372,7 @@ function open(row: any) {
    }

    .videomonitor_right {
-        width: 100%;
+        width: 85%;
        height: calc(90vh);
        margin-left: 20px;
        display: flex;
--- a/riis-web/src/views/dashboard/index.vue
+++ b/riis-web/src/views/dashboard/index.vue
@ -9,7 +9,7 @@
          position: fixed;
          top: 60px;
          ">
-          <Modelset v-if="isModelset" :isautoRotate="isautoRotate" />
+          <!-- <Modelset v-if="isModelset" :isautoRotate="isautoRotate" /> -->
        </div>
        <div class="three_button" @click="autoRotateClick">
          <span v-if="isautoRotate == true">暂停</span>
@ -115,7 +115,8 @@
                <div class="two_text">
                  <div class="two_text_one">
                    <span class="one_one">摄像头</span>
-                    <span class="one_two">{{ patrolInfo.camera.online }}<span class="one_three">/{{ patrolInfo.camera.allCount }}</span></span>
+                    <span class="one_two">{{ patrolInfo.camera.online }}<span class="one_three">/{{
+                        patrolInfo.camera.allCount }}</span></span>
                  </div>
                  <div class="two_text_two">
                    <span class="two_one">在线率:</span>
@ -127,13 +128,14 @@
                </div>
              </div>
            </div>
-            <div class="two_box_all"  v-if="patrolInfo.voice">
+            <div class="two_box_all" v-if="patrolInfo.voice">
              <div class="two_img"><img src="@/assets/sytlechange/two-left-2.svg" alt=""></div>
              <div class="two_body">
                <div class="two_text">
                  <div class="two_text_one">
                    <span class="one_one">声纹设备</span>
-                    <span class="one_two">{{ patrolInfo.voice.online }}<span class="one_three">/{{ patrolInfo.voice.allCount }}</span></span>
+                    <span class="one_two">{{ patrolInfo.voice.online }}<span class="one_three">/{{
+                        patrolInfo.voice.allCount }}</span></span>
                  </div>
                  <div class="two_text_two">
                    <span class="two_one">在线率:</span>
@ -145,13 +147,14 @@
                </div>
              </div>
            </div>
-            <div class="two_box_all"  v-if="patrolInfo.gateway">
+            <div class="two_box_all" v-if="patrolInfo.gateway">
              <div class="two_img"><img src="@/assets/sytlechange/two-left-3.svg" alt=""></div>
              <div class="two_body">
                <div class="two_text">
                  <div class="two_text_one">
                    <span class="one_one">网关机</span>
-                    <span class="one_two">{{ patrolInfo.gateway.online }}<span class="one_three">/{{ patrolInfo.gateway.allCount }}</span></span>
+                    <span class="one_two">{{ patrolInfo.gateway.online }}<span class="one_three">/{{
+                      patrolInfo.gateway.allCount }}</span></span>
                  </div>
                  <div class="two_text_two">
                    <span class="two_one">在线率:</span>
@ -176,7 +179,8 @@
                <div class="three_top_right"><img src="@/assets/sytlechange/three1.svg" alt=""></div>
              </div>
              <div class="three_bottom">
-                <span class="three_bottom_one">{{ environmentInfo.temperature }}</span>
+                <span class="three_bottom_one">{{ environmentInfo.temperature == '无' ? environmentInfo.temperature :
+                  Number(environmentInfo.temperature).toFixed(2) }}</span>
                <span class="three_bottom_two">℃</span>
              </div>
            </div>
@ -186,7 +190,8 @@
                <div class="three_top_right"><img src="@/assets/sytlechange/three2.svg" alt=""></div>
              </div>
              <div class="three_bottom">
-                <span class="three_bottom_one">{{ environmentInfo.humidity }}</span>
+                <span class="three_bottom_one">{{ environmentInfo.humidity == '无' ? environmentInfo.humidity : Number(
+                  environmentInfo.humidity).toFixed(2) }}</span>
                <span class="three_bottom_two">RH</span>
              </div>
            </div>
@ -196,7 +201,9 @@
                <div class="three_top_right"><img src="@/assets/sytlechange/three3.svg" alt=""></div>
              </div>
              <div class="three_bottom">
-                <span class="three_bottom_one">{{ environmentInfo.windSpeed }}</span>
+                <span
+                  class="three_bottom_one">{{ environmentInfo.windSpeed == '无' ? environmentInfo.windSpeed : Number(environmentInfo.windSpeed).toFixed(2)
+                  }}</span>
                <span class="three_bottom_two">级</span>
              </div>
            </div>
@ -206,7 +213,7 @@
                <div class="three_top_right"><img src="@/assets/sytlechange/three4.svg" alt=""></div>
              </div>
              <div class="three_bottom">
-                <span class="three_bottom_one">{{ environmentInfo.windDirection}}</span>
+                <span class="three_bottom_one">{{ environmentInfo.windDirection }}</span>
                <span class="three_bottom_two">SW</span>
              </div>
            </div>
@ -216,7 +223,9 @@
                <div class="three_top_right"><img src="@/assets/sytlechange/three5.svg" alt=""></div>
              </div>
              <div class="three_bottom">
-                <span class="three_bottom_one">{{ environmentInfo.pressure }}</span>
+                <span class="three_bottom_one">{{
+                  environmentInfo.pressure == '无' ? environmentInfo.pressure : Number(environmentInfo.pressure).toFixed(2)
+                  }}</span>
                <span class="three_bottom_two">HPA</span>
              </div>
            </div>
@ -226,7 +235,9 @@
                <div class="three_top_right"><img src="@/assets/sytlechange/three6.svg" alt=""></div>
              </div>
              <div class="three_bottom">
-                <span class="three_bottom_one">{{ environmentInfo.rainfall }}</span>
+                <span class="three_bottom_one">{{
+                  environmentInfo.rainfall == '无' ? environmentInfo.rainfall : Number(environmentInfo.rainfall).toFixed(2)
+                  }}</span>
                <span class="three_bottom_two">MM</span>
              </div>
            </div>
@ -265,20 +276,20 @@
          <div class="right2_body" v-if="rate">
            <div class="right2_box">
              <div class="box_text">
-                <div class="box_text_one">{{rate.confirmationRate || 0}}%</div>
+                <div class="box_text_one">{{ rate.confirmationRate || 0 }}%</div>
                <div class="box_text_two">报警准确率</div>
              </div>
            </div>
            <div class="right2_box_left">
              <div class="box_text">
-                <div class="box_text1">告警总数</div>
+                <div class="box_text1">核查总数</div>
                <div class="box_text3"> <img src="@/assets/navigation/sysy_gjl2.png" alt=""></div>
-                <div class="box_text2">{{rate.totalAlarms || 0}} <span class="span">件</span></div>
+                <div class="box_text2">{{ rate.totalAlarms || 0 }} <span class="span">条</span></div>
              </div>
              <div class="box_text" style="margin-top: 30px;">
-                <div class="box_text1">告警总数</div>
+                <div class="box_text1">确认告警总数</div>
                <div class="box_text3"> <img src="@/assets/navigation/sysy_gjl2.png" alt=""></div>
-                <div class="box_text2">{{rate.confirmedCount || 0}} <span class="span">件</span></div>
+                <div class="box_text2">{{ rate.confirmedCount || 0 }} <span class="span">条</span></div>
              </div>
            </div>
          </div>
@ -294,7 +305,7 @@
              <span :class="tabs == 4 ? 'span1' : ''" @click="tourTaskInit(4)">日</span>
            </div>
          </div>
-          <div class="right_three_body" v-loading ="loading2">
+          <div class="right_three_body" v-loading="loading2">
            <div class="three_left">
              <div class="three_left_top">{{ tourTaskInfo.executeRate }}%</div>
              <div class="three_left_bottom">任务执行率</div>
@ -324,7 +335,7 @@ import Alarminformation from "@/views/monitorsystem/alarminformation.vue";
 import { getNotCheckAlarmCount } from '@/api/home';
 import { CountTo as BaseCountTo } from 'vue3-count-to'
 import { ref, onMounted, onBeforeUnmount, nextTick, reactive, watch } from "vue";
-import { getMainDeviceNumber, getPatrolDeviceOnLine, getWeatherLogList, getAlarmLogList, getExceptionEventStat, getTaskTodoStat,getConfirmationRate } from "@/api/home";
+import { getMainDeviceNumber, getPatrolDeviceOnLine, getWeatherLogList, getAlarmLogList, getExceptionEventStat, getTaskTodoStat, getConfirmationRate } from "@/api/home";
 import Modelset from './3DModelSet.vue';
 import { getTaskTodoStatByMonth } from "@/api/areaboard";
 import { useUserStore } from '@/store/modules/user';
@ -416,24 +427,6 @@ function getInit() {
  }
  getWeatherLogList(params).then((res: any) => {
    environmentInfo.value = res.data
-    if (res.data.temperature == "") {
-      environmentInfo.value.temperature = "无"
-    }
-    if (res.data.humidity == "") {
-      environmentInfo.value.humidity = "无"
-    }
-    if (res.data.rainfall == "") {
-      environmentInfo.value.rainfall = "无"
-    }
-    if (res.data.windSpeed == "") {
-      environmentInfo.value.windSpeed = "无"
-    }
-    if (res.data.windDirection == "") {
-      environmentInfo.value.windDirection = "无"
-    }
-    if (res.data.pressure == "") {
-      environmentInfo.value.pressure = "无"
-    }
  })
  //获取巡视设备在线率
  getPatrolDeviceOnLine(params).then((res: any) => {
@ -448,42 +441,42 @@ function getInit() {
 const tourTaskInfo: any = ref({})
 // 天气
 const url = userStore.webApiBaseUrl;
-const ws1 = new WebSocket(userStore.wsApiBaseUrl + '/websocket/vibe_run_data_' + userStore.userId);
-// var source = new EventSource(url + "/sse/connect/vibe_run_data_" + userStore.userId,)
-function setupWebSocket() {
+// const ws1 = new WebSocket(userStore.wsApiBaseUrl + '/websocket/vibe_run_data_' + userStore.userId);
+// // var source = new EventSource(url + "/sse/connect/vibe_run_data_" + userStore.userId,)
+// function setupWebSocket() {

-  ws1.onopen = () => {
-    console.log('WebSocket连接成功');
-  };
-  ws1.onerror = (error: any) => {
-  };
-  ws1.onmessage = (e: any) => {
+//   ws1.onopen = () => {
+//     console.log('WebSocket连接成功');
+//   };
+//   ws1.onerror = (error: any) => {
+//   };
+//   ws1.onmessage = (e: any) => {

-    if (e.data != 0) {
-      environment.value = JSON.parse(e.data)
-      if (environment.value.type == 1) {
-        environmentInfo.value.temperature = environment.value.value
-      }
-      if (environment.value.type == 2) {
-        environmentInfo.value.humidity = environment.value.value
-      }
-      if (environment.value.type == 3) {
-        environmentInfo.value.windSpeed = environment.value.value
-      }
-      if (environment.value.type == 4) {
-        environmentInfo.value.rainfall = environment.value.value
-      }
-      if (environment.value.type == 5) {
-        environmentInfo.value.windDirection = environment.value.value
-      }
-      if (environment.value.type == 6) {
-        environmentInfo.value.pressure = environment.value.value
-      }
-    }
-  };
-  ws1.onclose = () => {
-  };
-}
+//     if (e.data != 0) {
+//       environment.value = JSON.parse(e.data)
+//       if (environment.value.type == 1) {
+//         environmentInfo.value.temperature = environment.value.value
+//       }
+//       if (environment.value.type == 2) {
+//         environmentInfo.value.humidity = environment.value.value
+//       }
+//       if (environment.value.type == 3) {
+//         environmentInfo.value.windSpeed = environment.value.value
+//       }
+//       if (environment.value.type == 4) {
+//         environmentInfo.value.rainfall = environment.value.value
+//       }
+//       if (environment.value.type == 5) {
+//         environmentInfo.value.windDirection = environment.value.value
+//       }
+//       if (environment.value.type == 6) {
+//         environmentInfo.value.pressure = environment.value.value
+//       }
+//     }
+//   };
+//   ws1.onclose = () => {
+//   };
+// }

 const environmentInfo = ref({
  temperature: "",
@ -494,9 +487,9 @@ const environmentInfo = ref({
  pressure: ""
 })
 const environment = ref()
-const rate:any = ref()
-function getgetConfirmationRate(){
-  getConfirmationRate({stationId:userStore.stationId}).then((res:any)=>{
+const rate: any = ref()
+function getgetConfirmationRate() {
+  getConfirmationRate({ stationId: userStore.stationId }).then((res: any) => {
    rate.value = res.data
  })
 }
@ -509,16 +502,16 @@ onMounted(() => {
  bsGetProductProcess()
  getInit()
  tourTaskInit('1')
-  setupWebSocket()
+  // setupWebSocket()
  getEquipment()
  getgetConfirmationRate()

  alarmCount.value = userStore.alarmCount
 });
 onBeforeUnmount(() => {
-  if (ws1 != null) {
-    ws1.close()
-  }
+  // if (ws1 != null) {
+  //   ws1.close()
+  // }
  clearInterval(tableTimer)
 })
 const isautoRotate = ref(true)
@ -701,7 +694,7 @@ const tabs = ref(1)
  top: 16px;
  left: 15px;
  width: 450px;
-  height: 458px;
+  height: 400px;
  background: url(@/assets/navigation/sy_zsb.png);
  background-size: 100% 100%;
  background-color: #001f59d7;
@ -721,7 +714,7 @@ const tabs = ref(1)
      background-image: url(@/assets/sytlechange/one.svg);
      position: relative;
      padding-left: 20px;
-      margin-bottom: 30px;
+      margin: 17px 0px;

      .all_img {
        width: 23px;
@ -766,10 +759,10 @@ const tabs = ref(1)

 .stationboard-left2 {
  position: absolute;
-  top: 490px;
+  top: 430px;
  left: 15px;
  width: 450px;
-  height: 247px;
+  height: 290px;
  background: url(@/assets/navigation/sy_zz.png);
  background-size: 100% 100%;
  background-color: #001f59d7;
@ -789,7 +782,7 @@ const tabs = ref(1)
      display: flex;
      align-items: center;
      justify-content: space-between;
-      margin-bottom: 25px;
+      margin-bottom: 40px;

      .two_img {
        width: 36px;
@ -863,10 +856,10 @@ const tabs = ref(1)

 .stationboard-left3 {
  position: absolute;
-  top: 750px;
+  top: 730px;
  left: 15px;
  width: 450px;
-  height: 253px;
+  height: 273px;
  background: url(@/assets/navigation/sy_gj.png);
  background-size: 100% 100%;
  background-color: #001f59d7;
@ -889,7 +882,7 @@ const tabs = ref(1)
      display: flex;
      flex-direction: column;
      justify-content: space-between;
-      margin-bottom: 10px;
+      margin-bottom: 20px;

      .three_top {
        width: 100%;
@ -916,6 +909,7 @@ const tabs = ref(1)
          font-size: 24px;
          color: #00FFFF;
          line-height: 23px;
+          margin-right: 10px;
        }

        .three_bottom_two {
@ -1108,6 +1102,7 @@ const tabs = ref(1)
          font-size: 20px;
          color: #00FFFF;
        }
+
        .spanc2 {
          font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
          font-weight: 700;
@ -1115,6 +1110,7 @@ const tabs = ref(1)
          font-size: 20px;
          color: #009933;
        }
+
        .spanc3 {
          font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
          font-weight: 700;
@ -1149,13 +1145,15 @@ const tabs = ref(1)
  display: flex;
  align-items: center;
  justify-content: space-between;
-  .img_txt{
+
+  .img_txt {
    display: flex;
    align-items: center;
    color: #fff !important;
    font-size: 16px;
    font-weight: bold;
-    img{
+
+    img {
      margin-right: 10px;

    }
--- a/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue
+++ b/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue
@ -65,9 +65,9 @@ const initlist = ref({
    convert_urls: false,
    branding: false,
 })
-let isDark: any = useDark().value == true ? '1' : '2'
+let isDark: any = '1'
 watch(useDark(), () => {
-    isDark = useDark().value == true ? '1' : '2'
+    isDark = '1'
    if (useDark().value == true) {
        initlist.value.skin_url = produrl.value + '/tinymce/skins/ui/oxide-dark'
        contentstyleval.value = 'body { background-color: #282828;color:#fff;border:none;}'
--- a/riis-web/src/views/monitorsystem/alarminformation.vue
+++ b/riis-web/src/views/monitorsystem/alarminformation.vue
@ -20,6 +20,7 @@ function getInit() {
  getAlarmLogById(params).then((res: any) => {
    res.data.checkResult = '1'
    examinationInfo.value = res.data
+    examinationInfo.value
  })

 }
@ -98,7 +99,7 @@ const num = ref(0)
  <div>
    <div class="public-overlay">
      <div class="newexamination">
-        <div class="public-examination" :style="examinationInfo.systemType == '02'?'' : 'height: 520px;'" >
+        <div class="public-examination">
          <img v-if="examinationInfo.checkFlag == 1" style="position:absolute;top: 0px;left: 0px;"
            src="@/assets/giveanalarm/hecha.png" alt="">
          <img style="position:absolute;top: 15px;right: 20px;cursor:pointer;" src="@/assets/giveanalarm/x.png" alt=""
@ -109,32 +110,24 @@ const num = ref(0)
              <div class="public-details-title">告警信息{{ examinationInfo.status }}</div>
            </div>
            <div style="display: flex;">
-              <div :style="examinationInfo.systemType == '02'?'width:370px;height: 250px;' : 'width:370px;height: 150px;'">
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'">
+              <div style="width:370px;height: 250px;">
+                <div class="public-details-conent" >
                  <div class="public-details-name">点位名称：</div>
                  <div>{{ examinationInfo.bayName }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '01'">
-                  <div class="public-details-name">信号名称：</div>
-                  <div>{{ examinationInfo.signalName }}</div>
-                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'" >
+                <div class="public-details-conent" >
                  <div class="public-details-name">设备名称：</div>
                  <div>{{ examinationInfo.patroldeviceName }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '01'" >
-                  <div class="public-details-name">主设备名称：</div>
-                  <div>{{ examinationInfo.mainDeviceName }}</div>
-                </div>
                <div class="public-details-conent">
                  <div class="public-details-name">部件名称：</div>
                  <div>{{ examinationInfo.componentName }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'">
-                  <div class="public-details-name">告警来源：</div>
+                <div class="public-details-conent">
+                  <div v-if="examinationInfo.alarmSourceType == 1" class="public-details-name">告警来源：</div>
                  <div>{{ currency(AlarmSourceList, examinationInfo.taskAlarmType) }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'">
+                <div class="public-details-conent">
                  <div class="public-details-name">告警阈值：</div>
                  <span style="display:block;" >
                    <span style="display: inline-block;width: 50%;text-align: left;"><span>预警：</span><span>{{
@ -154,11 +147,10 @@ const num = ref(0)
                
                <div class="public-details-conent">
                  <div class="public-details-name">告警时间：</div>
-                  <div v-if="examinationInfo.systemType == '02'" >{{ examinationInfo.alarmDate }}</div>
-                  <div v-if="examinationInfo.systemType == '01'" >{{ examinationInfo.alarmTime }}</div>
+                  <div  >{{ examinationInfo.alarmDate }}</div>
                </div>
              </div>
-              <div v-if="examinationInfo.systemType == '02'" style="width:290px;height: 200px;">
+              <div v-if="examinationInfo.alarmSourceType == 1"  style="width:290px;height: 200px;">
                <div style="width:100%;height:100%; position: relative;">
                  <div title="查看图片" style="position: absolute;
                  right: 5px;
@ -197,14 +189,11 @@ const num = ref(0)
            </div>
            <div class="public-details-conent">
                  <div class="public-details-name">告警描述：</div>
-                  <div  v-if="examinationInfo.systemType == '02'" :title="examinationInfo.content" style="height:63px;width: 560px;display: -webkit-box;
+                  <div   :title="examinationInfo.content" style="height:63px;width: 560px;display: -webkit-box;
                    -webkit-box-orient: vertical;
                    -webkit-line-clamp: 3;
                    overflow: hidden;">{{ examinationInfo.content }}</div>
-                    <div  v-if="examinationInfo.systemType == '01'" :title="examinationInfo.alarmMessage" style="height:63px;width: 560px;display: -webkit-box;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 3;
-                    overflow: hidden;">{{ examinationInfo.alarmMessage }}</div>
+                   
            </div>

            <div style="display:flex;align-items: center;">
--- a/riis-web/src/views/monitorsystem/giveanalarm.vue
+++ b/riis-web/src/views/monitorsystem/giveanalarm.vue
@ -162,7 +162,7 @@ const handleChange = (value: any) => {
          <img src="@/assets/giveanalarm/jg_wz.png" alt="" style="width:180px ;">
          <div style="font-size: 60px; color: red;">[{{ examinationData.length }}]</div>
        </div>
-        <div class="public-examination" :style="examinationInfo.systemType == '02'?'' : 'height: 560px;'">
+        <div class="public-examination">
          <img v-if="examinationInfo.checkFlag == 1" style="position:absolute;top: 0px;left: 0px;"
            src="@/assets/giveanalarm/hecha.png" alt="">
          <img style="position:absolute;top: 15px;right: 20px;cursor:pointer;" src="@/assets/giveanalarm/x.png" alt=""
@ -195,32 +195,24 @@ const handleChange = (value: any) => {
              <div class="public-details-title">告警信息{{ examinationInfo.status }}</div>
            </div>
            <div style="display: flex;">
-              <div :style="examinationInfo.systemType == '02'?'width:370px;height: 250px;' : 'width:370px;height: 150px;'">
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'">
+              <div style="width:370px;height: 250px;">
+                <div class="public-details-conent">
                  <div class="public-details-name">点位名称：</div>
                  <div>{{ examinationInfo.bayName }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '01'">
-                  <div class="public-details-name">信号名称：</div>
-                  <div>{{ examinationInfo.signalName }}</div>
-                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'" >
+                <div class="public-details-conent">
                  <div class="public-details-name">设备名称：</div>
                  <div>{{ examinationInfo.patroldeviceName }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '01'" >
-                  <div class="public-details-name">主设备名称：</div>
-                  <div>{{ examinationInfo.mainDeviceName }}</div>
-                </div>
                <div class="public-details-conent">
                  <div class="public-details-name">部件名称：</div>
                  <div>{{ examinationInfo.componentName }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'">
+                <div class="public-details-conent" v-if="examinationInfo.alarmSourceType == 1">
                  <div class="public-details-name">告警来源：</div>
                  <div>{{ currency(AlarmSourceList, examinationInfo.taskAlarmType) }}</div>
                </div>
-                <div class="public-details-conent" v-if="examinationInfo.systemType == '02'">
+                <div class="public-details-conent">
                  <div class="public-details-name">告警阈值：</div>
                  <span style="display:block;" >
                    <span style="display: inline-block;width: 50%;text-align: left;"><span>预警：</span><span>{{
@ -241,11 +233,10 @@ const handleChange = (value: any) => {

                <div class="public-details-conent">
                  <div class="public-details-name">告警时间：</div>
-                  <div v-if="examinationInfo.systemType == '02'" >{{ examinationInfo.alarmDate }}</div>
-                  <div v-if="examinationInfo.systemType == '01'" >{{ examinationInfo.alarmTime }}</div>
+                  <div>{{ examinationInfo.alarmDate }}</div>
                </div>
              </div>
-              <div style="width:290px;height: 200px;" v-if="examinationInfo.systemType == '02'">
+              <div  v-if="examinationInfo.alarmSourceType == 1" style="width:290px;height: 200px;">
                <div style="width:100%;height:100%; position: relative;">
                  <div title="查看图片" style="position: absolute;
                  right: 5px;
@ -282,15 +273,11 @@ const handleChange = (value: any) => {
              </div>
            </div>
            <div class="public-details-conent">
-                  <div class="public-details-name">告警描述：</div>
-                  <div  v-if="examinationInfo.systemType == '02'" :title="examinationInfo.content" style="height:63px;width: 560px;display: -webkit-box;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 3;
-                    overflow: hidden;">{{ examinationInfo.content }}</div>
-                    <div  v-if="examinationInfo.systemType == '01'" :title="examinationInfo.alarmMessage" style="height:63px;width: 560px;display: -webkit-box;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 3;
-                    overflow: hidden;">{{ examinationInfo.alarmMessage }}</div>
+              <div class="public-details-name">告警描述：</div>
+              <div :title="examinationInfo.content" style="height:63px;width: 560px;display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 3;
+                overflow: hidden;">{{ examinationInfo.content }}</div>
            </div>
            <div style="display:flex;align-items: center;">
              <div class="public-details-line"></div>
--- a/riis-web/src/views/monitorsystem/header/header.vue
+++ b/riis-web/src/views/monitorsystem/header/header.vue
@ -549,7 +549,7 @@ function leadingOut() {
      <img src="@/assets/monitorsystem/top_bj.png" alt="" class="header-img-box">
      <div class="header-left">
        <img src="@/assets/monitorsystem/top_logo.png" alt="">
-        <div class="header-left-title">变电站远程智能巡视系统
+        <div class="header-left-title">配电网人工智能平台
          <span  style="position: relative; display: inline-block; font-size: 18px;font-family: 'Arial Normal', 'Arial';
          font-weight: 400;
          font-style: normal;
@ -607,7 +607,7 @@ function leadingOut() {
        <div class="header-information">
          <img src="@/assets/monitorsystem/header/u385.png" alt="" style="width:16px;height: 16px;">
          <div class="stationintroducebox">
-            <div class="introduceboxtext1">变电站远程智能巡视系统</div>
+            <div class="introduceboxtext1">配电网人工智能平台</div>
            <div class="introduceboxtext2">{{ systemInfo.version }}</div>
            <div style="display: flex;align-items: center;padding-bottom: 8px;">
              <div class="introduceboxline"></div>
--- a/riis-web/src/views/question/answering/index.vue
+++ b/riis-web/src/views/question/answering/index.vue
@ -0,0 +1,16 @@
+<script lang="ts">
+export default {
+    name: 'answering' // 智能问答
+};
+</script>
+
+<script setup lang="ts">
+import { useUserStore } from '@/store/modules/user';
+const userStore = useUserStore();
+// answeringUrl answeringUrl
+</script>  
+<template>
+    <iframe :src="userStore.answeringUrl" style="width:100%; height:calc(90vh);margin-top: 10px;" frameborder="0" allow="microphone" >
+    </iframe>
+</template>
+<style scoped lang="scss"></style>
--- a/riis-web/src/views/system/TaskSetting/index.vue
+++ b/riis-web/src/views/system/TaskSetting/index.vue
@ -1337,7 +1337,7 @@ onMounted(() => {
    border: 1px solid #131a25;
    border-top: 0px;
    padding: 0px 10px 20px 10px;
-    background-color: #131a25;
+    // background-color: #131a25;
    box-sizing: border-box;
    border-radius: 0px 5px 5px 5px;
 }
--- a/riis-web/src/views/task/alarmInfo/editvideo.vue
+++ b/riis-web/src/views/task/alarmInfo/editvideo.vue
@ -0,0 +1,504 @@
+<script lang="ts">
+export default {
+    name: 'editvideo' //控制摄像机
+};
+</script>
+
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { ElMessageBox, ElMessage } from "element-plus";
+import axios from 'axios';
+import JessibucaPlayer from '@/components/jessibuca/index1.vue'
+import { useUserStore } from '@/store/modules/user';
+const userStore = useUserStore();
+const videoUrl = ref("")
+const props = defineProps({
+    rowInfo: {
+        required: false,
+        type: Object,
+        default: false
+    },
+    online: {
+        required: false,
+        type: String,
+        default: false
+    },
+
+});
+const controSpeed = ref(100) // 摄像头转动速度默认值 30
+function ptzCamera(command: any) { // 监控视频控制方法
+    isGaoliang.value = command
+    if (props.online != "1") {
+        return
+    }
+    if (channelId.value == "" || channelId.value == undefined) {
+        ElMessage({
+            type: 'error',
+            message: '暂时无法调试，请先检查视频监控是否正常！',
+        })
+        return
+    }
+    axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => {
+        if (res.data.data == "0") {
+            axios.post(userStore.webApiMonitorUrl + '/api/ptz/control/' + deviceId.value + '/' + channelId.value + '?command=' + command +
+                '&horizonSpeed=' + controSpeed.value + '&verticalSpeed=' + controSpeed.value + '&zoomSpeed=' + controSpeed.value, {}).then((res: any) => { })
+        }
+    })
+
+}
+function condensationChang(command: any) { // 光聚方法  
+    if (props.online != "1") {
+        return
+    }
+    if (channelId.value == "" || channelId.value == undefined) {
+        ElMessage({
+            type: 'error',
+            message: '暂时无法调试，请先检查视频监控是否正常！',
+        })
+        return
+    }
+    // 近（42H ）    66    远（41H） 65
+    const cmdCode = ref()
+    if (command == '加') {
+        cmdCode.value = 65
+        isGaoliang.value = '65'
+    } else if (command == '减') {
+        cmdCode.value = 66
+        isGaoliang.value = '66'
+    }
+    axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => {
+        if (res.data.data == "0") {
+            axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '&parameter1=80&parameter2=0&combindCode2=0', {}).then((res: any) => { })
+        }
+    })
+
+}
+function apertureChang(command: any) { // 光圈方法
+    if (props.online != "1") {
+        return
+    }
+    if (channelId.value == "" || channelId.value == undefined) {
+        ElMessage({
+            type: 'error',
+            message: '暂时无法调试，请先检查视频监控是否正常！',
+        })
+        return
+    }
+    // 缩小（48H ）    72    放大（44H） 70
+    const cmdCode = ref(72)
+    if (command == '加') {
+        cmdCode.value = 70
+        isGaoliang.value = '70'
+    } else if (command == '减') {
+        cmdCode.value = 72
+        isGaoliang.value = '72'
+    }
+    axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => {
+        if (res.data.data == "0") {
+            axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '&parameter1=0&parameter2=80&combindCode2=0', {}).then((res: any) => { })
+        }
+    })
+}
+function videoRefresh() {
+    videoUrl.value = videoUrl.value + '?Math=' + Math.random()
+}
+const deviceId = ref("")
+const channelId = ref("")
+const videofmp4 = ref('')
+onMounted(() => {
+    if (props.rowInfo.deviceId == undefined) {
+        deviceId.value = props.rowInfo.deviceid
+        channelId.value = props.rowInfo.channelid
+    } else {
+        deviceId.value = props.rowInfo.deviceId
+        channelId.value = props.rowInfo.channelId
+    }
+    axios.get(userStore.webApiMonitorUrl + '/api/play/start/' + deviceId.value + '/' + channelId.value, {}).then((ress: any) => {
+        if (ress.data.data != undefined) {
+            videoUrl.value = ress.data.data.ws_flv
+            videofmp4.value = ress.data.data.fmp4
+        }
+    }).catch(function (error: any) {
+    })
+})
+const isGaoliang: any = ref("")
+function quxiao() {
+    isGaoliang.value = ''
+}
+</script>
+<template>
+    <div class="editvideo-box">
+        <div style="width: 98%; height: 650px;  margin: auto;">
+            <JessibucaPlayer :isClose="false" :_uid="'editvideo1'" :visible.sync="true" :videoUrl="videoUrl"
+                :videofmp4="videofmp4" :hasAudio="true" fluent autoplay live></JessibucaPlayer>
+        </div>
+        <div class="Camera-buttons-box1">
+            <div class="Camera-buttons-box">
+                <div class="Camera-left-button1" @mousedown="ptzCamera('up')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button2" @mousedown="ptzCamera('upright')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button3" @mousedown="ptzCamera('right')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button4" @mousedown="ptzCamera('downright')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button5" @mousedown="ptzCamera('down')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button6" @mousedown="ptzCamera('downleft')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button7" @mousedown="ptzCamera('left')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button8" @mousedown="ptzCamera('upleft')" @mouseup="ptzCamera('stop')"></div>
+                <div class="Camera-left-button9" @click="videoRefresh"></div>
+            </div>
+            <div>
+                <div class="focallengthbox">
+                    <div class="focallength1" :class="{ 'gaolaing': isGaoliang == 'zoomout' }"
+                        @mousedown="ptzCamera('zoomout')" @mouseup="ptzCamera('stop')">
+                        <img src="@/assets/videoimg/left.png" style="width:8px;height:12px" alt="">
+                    </div>
+                    <div class="focallength2">缩放</div>
+                    <div class="focallength1" :class="{ 'gaolaing': isGaoliang == 'zoomin' }"
+                        @mousedown="ptzCamera('zoomin')" @mouseup="ptzCamera('stop')">
+                        <img src="@/assets/videoimg/right.png" style="width:8px;height:12px" alt="">
+                    </div>
+                </div>
+                <div class="focallengthbox">
+                    <div class="focallength1" :class="{ 'gaolaing': isGaoliang == '66' }"
+                        @mousedown="condensationChang('减')" @mouseup="quxiao">
+                        <img src="@/assets/videoimg/left.png" style="width:8px;height:12px" alt="">
+                    </div>
+                    <div class="focallength2">光聚</div>
+                    <div class="focallength1" :class="{ 'gaolaing': isGaoliang == '65' }"
+                        @mousedown="condensationChang('加')" @mouseup="quxiao">
+                        <img src="@/assets/videoimg/right.png" style="width:8px;height:12px" alt="">
+                    </div>
+                </div>
+                <div class="focallengthbox">
+                    <div class="focallength1" :class="{ 'gaolaing': isGaoliang == '72' }"
+                        @mousedown="apertureChang('减')" @mouseup="quxiao">
+                        <img src="@/assets/videoimg/left.png" style="width:8px;height:12px" alt="">
+                    </div>
+                    <div class="focallength2">光圈</div>
+                    <div class="focallength1" :class="{ 'gaolaing': isGaoliang == '70' }"
+                        @mousedown="apertureChang('加')" @mouseup="quxiao">
+                        <img src="@/assets/videoimg/right.png" style="width:8px;height:12px" alt="">
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</template>
+<style scoped lang="scss">
+.Camera-buttons-box1 {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.Camera-buttons-box {
+    position: relative;
+    width: 180px;
+    height: 165px;
+    // margin-top: 20px;
+    // margin-left: 50px;
+    // margin-bottom: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    // justify-content: center;
+}
+
+.Camera-left-button1 { 
+    cursor: pointer;
+    position: absolute;
+    top: 29px;
+    left: 65px;
+    width: 44px;
+    height: 35px;
+    background: url(@/assets/navigation/sxj_01.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button2 {
+    cursor: pointer;
+    position: absolute;
+    top: 33px;
+    left: 100px;
+    width: 44px;
+    height: 44px; 
+    background: url(@/assets/navigation/sxj_02.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button3 {
+    cursor: pointer;
+    position: absolute;
+    top: 65px;
+    left: 116px;
+    width: 34px;
+    height: 44px; 
+    background: url(@/assets/navigation/sxj_03.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button4 { 
+    cursor: pointer;
+    position: absolute;
+    top: 100px;
+    left: 103px;
+    width: 44px;
+    height: 44px;
+    background: url(@/assets/navigation/sxj_04.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button5 {
+    cursor: pointer;
+    position: absolute;
+    top: 117px;
+    left: 70px;
+    width: 44px;
+    height: 34px;
+    background: url(@/assets/navigation/sxj_05.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button6 {
+    cursor: pointer;
+    position: absolute;
+    top: 103px;
+    left: 35px;
+    width: 43px;
+    height: 44px;
+    background: url(@/assets/navigation/sxj_06.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button7 {
+    cursor: pointer;
+    position: absolute;
+    top: 69px;
+    left: 28px;
+    width: 35px;
+    height: 44px; 
+    background: url(@/assets/navigation/sxj_07.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button8 {
+    cursor: pointer;
+    position: absolute;
+    top: 35px;
+    left: 33px;
+    width: 43px;
+    height: 43px;
+    background: url(@/assets/navigation/sxj_08.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button9 {
+    cursor: pointer;
+    position: absolute;
+    top: 63px;
+    left: 63px;
+    width: 54px;
+    height: 54px;
+    background: url(@/assets/navigation/sxj_09.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button1:hover {
+    background: url(@/assets/navigation/sxj_01.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_011.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button2:hover {
+    background: url(@/assets/navigation/sxj_02.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_022.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button3:hover {
+    background: url(@/assets/navigation/sxj_03.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_033.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button4:hover {
+    background: url(@/assets/navigation/sxj_04.png) no-repeat center center;
+    background:url(@/assets/navigation/sxj_044.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button5:hover {
+    background: url(@/assets/navigation/sxj_05.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_055.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button6:hover {
+    background: url(@/assets/navigation/sxj_06.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_066.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button7:hover {
+    background: url(@/assets/navigation/sxj_07.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_077.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button8:hover {
+    background: url(@/assets/navigation/sxj_08.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_088.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.Camera-left-button9:hover {
+    background: url(@/assets/navigation/sxj_09.png) no-repeat center center;
+    background: url(@/assets/navigation/sxj_099.png) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.gaolaing {
+    background: rgba(50, 177, 245, 0.4)
+}
+
+.focallengthbox {
+    display: flex;
+    // padding-left: 40px;
+    padding-top: 5px;
+
+    .focallength1 {
+        border: 1px solid rgba(50, 177, 245, 0.4);
+        width: 30px;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+    }
+
+    .focallength2 {
+        pointer-events: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        border-top: 1px solid rgba(50, 177, 245, 0.4);
+        border-bottom: 1px solid rgba(50, 177, 245, 0.4);
+        width: 120px;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 14px;
+        color: #B5D7FF;
+    }
+}
+
+.Camera-left-buttons {
+    position: relative;
+    width: 156px;
+    height: 156px;
+    margin-right: 10px;
+
+    .Camera-left-input {
+        width: 130px;
+        height: 36px;
+    }
+
+    .Camera-left-button {
+        position: absolute;
+        width: 44px;
+        height: 44px;
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+
+        .img {
+            width: 12px;
+            height: 12px;
+        }
+    }
+
+    .Camera1 {
+        top: 16px;
+        left: 16px;
+    }
+
+    .Camera2 {
+        top: 0px;
+        left: 54px;
+    }
+
+    .Camera3 {
+        top: 16px;
+        right: 16px;
+    }
+
+    .Camera4 {
+        top: 54px;
+        left: 0px;
+    }
+
+    .Camera5 {
+        top: 54px;
+        left: 54px;
+    }
+
+    .Camera6 {
+        top: 54px;
+        right: 0px;
+    }
+
+    .Camera7 {
+        bottom: 16px;
+        left: 16px;
+    }
+
+    .Camera8 {
+        bottom: 0px;
+        left: 54px;
+    }
+
+    .Camera9 {
+        bottom: 16px;
+        right: 16px;
+    }
+
+    .Camera-left-button:hover {
+        // background-color: rgba(33, 191, 149, 0.2);
+    }
+}
+
+.Camera-right-buttons {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    width: 102px;
+    height: 156px;
+
+    .buttonurl-box {
+        width: 100%;
+        height: 48px;
+        // background-color: rgba(53, 222, 176,0.4);
+        border: 1px solid rgba(0, 249, 162, 1);
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+
+        .buttonurl-imgbox {
+            width: 50%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .buttonurl-imgbox:hover {
+            background-color: rgba(33, 191, 149, 0.2);
+        }
+    }
+}
+</style>
--- a/riis-web/src/views/task/alarmInfo/index.vue
+++ b/riis-web/src/views/task/alarmInfo/index.vue
--- a/riis-web/src/views/task/makeTask/index.vue
+++ b/riis-web/src/views/task/makeTask/index.vue
@ -14,7 +14,7 @@ import {
  editTask,
  delTask,
  getelect,
-  getSubstationNaviTree,
+  getBayTree,
  getmaintype,
  getmaindata,
  QueryTour,
@ -713,7 +713,7 @@ function getbaytree() {
  const params = {
    stationId: info.value.stationAll
  }
-  getSubstationNaviTree(params).then((res: any) => {
+  getBayTree(params).then((res: any) => {
    if (res.data.length == 0) {
      MainvalData.value = []
      componentData.value = []
@ -1449,18 +1449,18 @@ function delTour(row: any) {
 }
 //控制行变色
 const tableRowClassName = ({
-  row,
-  rowIndex,
+    row,
+    rowIndex,
 }: {
-  row: any
-  rowIndex: number
+    row: any
+    rowIndex: number
 }) => {
-  if (rowIndex % 2 === 0) {
-    return 'warning-row'
-  } else if (rowIndex % 2 === 1) {
-    return 'success-row'
-  }
-  return ''
+    if (rowIndex % 2 === 0) {
+        return 'warning-row'
+    } else if (rowIndex % 2 === 1) {
+        return 'success-row'
+    }
+    return ''
 }
 // //控制行变色
 // const tableRowClassName = ({
@ -2165,8 +2165,8 @@ const open = () => {
      </div>
      <div>
        <el-table ref="multipleTableRef" :data="tableDataList" style="width: 100%;margin-bottom: 10px;height: calc(70vh);
-                  overflow: auto;" :header-cell-style="tableBg" stripe @selection-change="handleSelectionChange" v-loading="treeloading"
-                  >
+                  overflow: auto;" :header-cell-style="tableBg" stripe @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
+          v-loading="treeloading">
          <el-table-column type="selection" width="30" align="center" />
          <el-table-column type="index" label="序号" width="50px" align="center" />
          <el-table-column property="stationName" label="变电站名称">
@ -2887,8 +2887,8 @@ const open = () => {
  width: 300px;
  padding: 5px 0px 10px;
  box-sizing: border-box;
-  // background: #fff;
-  background-image: url(@/assets/newimg/jcpz_260.png);
+  // background: #fff; riis-web/src/assets/navigation/ty_260x988.png
+  background-image: url(@/assets/navigation/ty_260x988.png);
  background-size: 100% 100%;
  border-radius: 3px;
  position: relative;
@ -2909,7 +2909,7 @@ const open = () => {
  width: 100%;
  height: calc(100vh - 160px);
  overflow: auto;
-  background-color: #131a25;
+  // background-color: #131a25;
  border: none;
  border-radius: 3px;
  padding: 5px 20px 0px;
@ -2928,11 +2928,11 @@ const open = () => {
  width: 100%;
  height: calc(100vh - 290px);
  overflow: auto;
-  // background-color: rgba(255, 255, 255, 1);
+  // background-color: rgba(255, 255, 255, 1); navigation/ty_260x988.png riis-web/src/assets/navigation/ty_1614x988.png
  border-radius: 3px;
  box-sizing: border-box;
  margin-left: 15px;
-  background: url(@/assets/newimg/cjrw_1890.png);
+  background: url(@/assets/navigation/ty_1614x988.png);
  background-size: 100% 100%;
  padding: 10px;
 }
--- a/riis-web/src/views/task/patrolDetails/index.vue
+++ b/riis-web/src/views/task/patrolDetails/index.vue
@ -606,14 +606,15 @@ function retrunClick() {
            <div class="all-left">
                <div class="details">
                    <div class="details-left">
-                        <img class="details-left-imgbg" src="@/assets/patrolmonitor/xsjk_1235.png" alt="">
+                        <img class="details-left-imgbg" src="@/assets/navigation/sw.png" alt="">
                        <div class="details-content">
                            <div class="details-content-left">
                                <div style="display: flex;">
                                    <div style="margin: 20px 20px 0px 20px;">
                                        <div class="details-left-two">任务名称： {{ tableData.taskName }}</div>
-                                        <div style="margin-top: 20px;" class="details-left-two">开始时间：{{ tableData.startTime
-                                        }}</div>
+                                        <div style="margin-top: 20px;" class="details-left-two">开始时间：{{
+                                            tableData.startTime
+                                            }}</div>
                                    </div>
                                    <div style="margin: 20px 20px 0px 20px;">
                                        <div class="details-left-two">任务类型：
@ -622,8 +623,9 @@ function retrunClick() {
                                            <span v-if="tableData.type == 3">专项巡视</span>
                                            <span v-if="tableData.type == 4">自定义巡视</span>
                                        </div>
-                                        <div style="margin-top: 20px;" class="details-left-two">结束时间： {{ tableData.endTime
-                                        }}</div>
+                                        <div style="margin-top: 20px;" class="details-left-two">结束时间： {{
+                                            tableData.endTime
+                                            }}</div>
                                    </div>
                                    <div style="margin: 20px 20px 0px 20px;">
                                        <div class="details-left-two">计划时间：{{ tableData.planStartTime }}</div>
@ -649,28 +651,33 @@ function retrunClick() {
                                        <div>已巡视</div>
                                    </div>
                                    <div class="details-content-number">
-                                        <div class="details-top-number" style="color:#00F9A2 ;">{{ tableData.successCount }}
+                                        <div class="details-top-number" style="color:#00F9A2 ;">{{
+                                            tableData.successCount }}
                                        </div>
                                        <div style="color:#00F9A2 ;">成功</div>
                                    </div>
                                    <div class="details-content-number">
-                                        <div style="color:#FFBD00 ;" class="details-top-number">{{ tableData.failCount }}
+                                        <div style="color:#FFBD00 ;" class="details-top-number">{{ tableData.failCount
+                                            }}
                                        </div>
                                        <div style="color:#FFBD00 ;">失败</div>
                                    </div>
                                    <div class="details-content-number">
-                                        <div style="color:#00F9A2 ;" class="details-top-number">{{ tableData.normalCount }}
+                                        <div style="color:#00F9A2 ;" class="details-top-number">{{ tableData.normalCount
+                                            }}
                                        </div>
                                        <div style="color:#00F9A2 ;">正常</div>
                                    </div>
                                    <div class="details-content-number">
-                                        <div style="color:#FF3300 ;" class="details-top-number">{{ tableData.abnormalCount
-                                        }}
+                                        <div style="color:#FF3300 ;" class="details-top-number">{{
+                                            tableData.abnormalCount
+                                            }}
                                        </div>
                                        <div style="color:#FF3300 ;">异常</div>
                                    </div>
                                    <div class="details-content-number">
-                                        <div style="color:#0099FF ;" class="details-top-number">{{ tableData.serviceCount }}
+                                        <div style="color:#0099FF ;" class="details-top-number">{{
+                                            tableData.serviceCount }}
                                        </div>
                                        <div style="color:#0099FF ;">设备检修</div>
                                    </div>
@ -681,7 +688,8 @@ function retrunClick() {
                                    <el-progress type="circle" :percentage="tableData.taskProgress" :stroke-width="8"
                                        :color="'rgba(255,156,42,1)'" style="position:absolute;top:10px;left:10px">
                                        <template #default="{ percentage }">
-                                            <div style="font-size: 26px;color: #fff;padding-bottom: 5px;">{{ percentage }}%
+                                            <div style="font-size: 26px;color: #fff;padding-bottom: 5px;">{{ percentage
+                                                }}%
                                            </div>
                                            <div style="padding-top: 5px;font-size: 14px;color: #fff;">巡视总进度</div>
                                        </template>
@ -724,10 +732,11 @@ function retrunClick() {
                    </div>
                </div>
                <div class="contont" id="clickonresize">
-                    <img class="contont-img" src="@/assets/patrolmonitor/xsjk_1235_700.png" alt="">
+                    <img class="contont-img" src="@/assets/navigation/sw1.png" alt="">
                    <div style="position: relative;z-index: 1;    height: 100%;">
                        <div class="contont-title">
-                            <span style="color: #ffffff;font-size: 16px;font-weight:700 ;" class="fontFamily">巡视点位</span>
+                            <span style="color: #ffffff;font-size: 16px;font-weight:700 ;"
+                                class="fontFamily">巡视点位</span>
                        </div>
                        <div class="contont-contont">
                            <div
@ -751,7 +760,7 @@ function retrunClick() {

                            <el-table :data="gettable" stripe :header-cell-style="tableBg" @row-click="selectRow"
                                v-loading="treeloading" highlight-current-row @cell-mouse-enter="hoverTableEnter"
-                                @cell-mouse-leave="hoverTableLeave"
+                                @cell-mouse-leave="hoverTableLeave" :row-class-name="tableRowClassName"
                                style="width: 98%;margin:auto;position: relative;margin: 15px 10px;height:calc(100%); ">
                                <el-table-column type="index" align="center" label="序号" width="60px" />
                                <el-table-column prop="mainDeviceName" label="设备名称" />
@ -786,7 +795,7 @@ function retrunClick() {
                                <el-table-column prop="desc" label="识别类型" width="140px">
                                    <template #default="scope">
                                        <span v-if="scope.row.desc != null && scope.row.desc != ''">{{ scope.row.desc
-                                        }}</span>
+                                            }}</span>
                                        <span v-else>--</span>
                                    </template>
                                </el-table-column>
@ -795,13 +804,15 @@ function retrunClick() {
                                        <span
                                            v-if="scope.row.valueType == 'meter' || scope.row.valueType == 'infrared' || scope.row.valueType == 'sound'">
                                            <span v-if="scope.row.analysisResult == '异常'"
-                                                style="color: red;font-size: 16px;font-weight: bold;"> {{ scope.row.value }}
+                                                style="color: red;font-size: 16px;font-weight: bold;"> {{
+                                                scope.row.value }}
                                                {{ scope.row.unit }}</span>
                                            <span v-else> {{ scope.row.value }} {{ scope.row.unit }}</span>
                                        </span>
                                        <span v-else>
-                                            <span v-if="scope.row.conf != null && scope.row.conf != ''">{{ scope.row.conf
-                                            }}</span>
+                                            <span v-if="scope.row.conf != null && scope.row.conf != ''">{{
+                                                scope.row.conf
+                                                }}</span>
                                            <span v-else>--</span>
                                        </span>
                                    </template>
@ -838,8 +849,10 @@ function retrunClick() {
                                <el-table-column label="操作" width="100px" align="center">
                                    <template #default="scope">
                                        <div style="display: flex;justify-content: space-around;">
-                                            <img style="cursor:pointer ;" src="@/assets/tableIcon/patrolmonitor/u3303.png"
-                                                v-if="tableData.examineFlag != 1" @click="correct(scope.row)" title="修正">
+                                            <img style="cursor:pointer ;"
+                                                src="@/assets/tableIcon/patrolmonitor/u3303.png"
+                                                v-if="tableData.examineFlag != 1" @click="correct(scope.row)"
+                                                title="修正">
                                            <img src="@/assets/tableIcon/patrolmonitor/u3303_disabled.png" v-else
                                                title="修正">
                                            <!-- <div class="button-style"  v-if="tableData.examineFlag != 1" @click="correct(scope.row)">修正</div>
@ -853,7 +866,8 @@ function retrunClick() {
                                        style="display: inline-block;margin-left: 15px;">{{ tableDataHover.areaName
                                        }}</span></div>
                                <div style="margin-top: 10px;"><span>间隔名称 :</span><span
-                                        style="display: inline-block;margin-left: 15px;">{{ tableDataHover.bayName }}</span>
+                                        style="display: inline-block;margin-left: 15px;">{{ tableDataHover.bayName
+                                        }}</span>
                                </div>
                                <div style="margin-top: 10px;"><span>点位名称 :</span><span
                                        style="display: inline-block;margin-left: 15px;">{{ tableDataHover.deviceName
@ -861,15 +875,18 @@ function retrunClick() {
                                <div style="margin-top: 10px;"><span style="display: inline-block;">识别类型 :</span><span
                                        style="display: inline-block;margin-left: 15px;"
                                        v-if="tableDataHover.desc != null && tableDataHover.desc != ''">{{
-                                            tableDataHover.desc }}</span><span style="display: inline-block;margin-left: 15px;"
-                                        v-else>--</span></div>
+                                            tableDataHover.desc }}</span><span
+                                        style="display: inline-block;margin-left: 15px;" v-else>--</span></div>
                                <div style="margin-top: 10px;"><span>巡视时间 :</span><span
-                                        style="display: inline-block;margin-left: 15px;">{{ tableDataHover.time }}</span>
+                                        style="display: inline-block;margin-left: 15px;">{{ tableDataHover.time
+                                        }}</span>
                                </div>
-                                <div style="margin-top: 10px;"><span style="display: inline-block;margin-left: 17px;">实物id
+                                <div style="margin-top: 10px;"><span
+                                        style="display: inline-block;margin-left: 17px;">实物id
                                        :</span><span style="display: inline-block;margin-left: 15px;"
                                        v-if="tableDataHover.materialId">{{ tableDataHover.materialId }}</span><span
-                                        style="display: inline-block;margin-left: 15px;width: 70%;" v-else>--</span></div>
+                                        style="display: inline-block;margin-left: 15px;width: 70%;" v-else>--</span>
+                                </div>
                                <div style="margin-top: 10px;">
                                    <span style="display: block;margin-left: 33px;">阈值 :</span>
                                    <span style="display:block;margin-left:80px;margin-top: -23px;"
@ -882,10 +899,12 @@ function retrunClick() {
                                                tableDataHover.sameMin }}-{{ tableDataHover.sameMax }}</span></span>
                                        <span
                                            style="display: inline-block;width: 50%;text-align: left;"><span>严重：</span><span>{{
-                                                tableDataHover.seriousMin }}-{{ tableDataHover.seriousMax }}</span></span>
+                                                tableDataHover.seriousMin }}-{{ tableDataHover.seriousMax
+                                                }}</span></span>
                                        <span
                                            style="display: inline-block;width: 50%;text-align: left;"><span>危急：</span><span>{{
-                                                tableDataHover.criticalMin }}-{{ tableDataHover.criticalMax }}</span></span>
+                                                tableDataHover.criticalMin }}-{{ tableDataHover.criticalMax
+                                                }}</span></span>
                                    </span>
                                    <span v-else style="display:block;margin-left:88px;margin-top: -23px;">
                                        --
@ -902,7 +921,7 @@ function retrunClick() {
                </div>
            </div>
            <div class="all-right">
-                <div style="width: 100%; height: 49%;">
+                <div class="alarmInfo-visitation">
                    <div style="display:flex;align-items: center;">
                        <div class="alarmInfo-line"></div>
                        <div class="alarmInfo-title "> <span class="fontFamily">实时视频</span></div>
@ -918,8 +937,8 @@ function retrunClick() {
                                text-align: center;
                                padding-top: 10px;">暂无视频</div>
                        </div>
-                        <JessibucaPlayer v-if="alarmInfo.patroldeviceCode != undefined" ref="recordVideoPlayer" :_uid="101"
-                            :devicechannelInfo="devicechannelInfo" :visible.sync="true" :videoUrl="videoUrl"
+                        <JessibucaPlayer v-if="alarmInfo.patroldeviceCode != undefined" ref="recordVideoPlayer"
+                            :_uid="101" :devicechannelInfo="devicechannelInfo" :visible.sync="true" :videoUrl="videoUrl"
                            :videofmp4="videofmp4" :hasAudio="false" fluent autoplay live @closeVideo="closeVideo">
                        </JessibucaPlayer>
                    </div>
@ -928,7 +947,9 @@ function retrunClick() {
                <div class="alarmInfo-visitation">
                    <div style="display: flex;align-items: center;justify-content: space-between;">
                        <div style="display:flex;align-items: center;height: 40px;padding-left: 10px;">
-                            <div class="alarmInfo-title"> <span class="fontFamily" style="color:#ffffff">巡视结果</span> </div>
+                            <div class="alarmInfo-line"></div>
+                            <div class="alarmInfo-title"> <span class="fontFamily" style="color:#0099ff">巡视结果</span>
+                            </div>
                        </div>
                        <div style="display: flex;font-size: 14px;padding-right:15px">
                            <div :class="tabs == 1 ? 'historical' : 'change'" @click="tabsClick(2)">
@ -996,8 +1017,8 @@ function retrunClick() {
            </div>
        </div>
        <!-- 修正弹窗 -->
-        <Eldialog v-if="Explicit == 1 && conclusion == 1" :title="'修正'" :zIndex="2000" :width="'600px'" :height="'600px'"
-            @before-close="handleClose">
+        <Eldialog v-if="Explicit == 1 && conclusion == 1" :title="'修正'" :zIndex="2000" :width="'600px'"
+            :height="'600px'" @before-close="handleClose">
            <template v-slot:PopFrameContent>
                <div v-if="conclusion == 1">
                    <!-- <div class="notification-title">修正</div> -->
@ -1010,14 +1031,15 @@ function retrunClick() {
                                </div>
                                <div style="color: #fff;margin-top:10px;"><span>点位名称&nbsp:&nbsp&nbsp{{
                                    notificationText.deviceName
-                                }}</span></div>
+                                        }}</span></div>
                                <div style="color: #fff;margin-top:10px;"><span>巡视结果&nbsp:&nbsp&nbsp
                                        <span
                                            v-if="notificationText.valueType == 'meter' || notificationText.valueType == 'infrared'">
                                            <span v-if="notificationText.analysisResult == '异常'"
                                                style="color: red;font-size: 16px;font-weight: bold;"> {{
                                                    notificationText.value }} {{ notificationText.unit }}</span>
-                                            <span v-else> {{ notificationText.value }} {{ notificationText.unit }}</span>
+                                            <span v-else> {{ notificationText.value }} {{ notificationText.unit
+                                                }}</span>
                                        </span>
                                        <span v-else>
                                            <span v-if="notificationText.conf != null && notificationText.conf != ''">{{
@ -1054,8 +1076,9 @@ function retrunClick() {
                                        </el-input>
                                    </span>
                                </div>
-                                <div style="color: #fff;margin-top:20px;"><span class="large">修正结论&nbsp&nbsp<el-radio-group
-                                            v-model="form.reviseValid" class="ml-4">
+                                <div style="color: #fff;margin-top:20px;"><span
+                                        class="large">修正结论&nbsp&nbsp<el-radio-group v-model="form.reviseValid"
+                                            class="ml-4">
                                            <el-radio label="0" size="large">正常</el-radio>
                                            <el-radio label="1" size="large">异常</el-radio>
                                        </el-radio-group></span>
@ -1077,8 +1100,8 @@ function retrunClick() {
        </Eldialog>

        <!-- 审核弹窗 -->
-        <Eldialog v-if="Explicit == 1 && conclusion == 2" :title="'审核结论'" :zIndex="2000" :width="'540px'" :height="'600px'"
-            @before-close="handleClose">
+        <Eldialog v-if="Explicit == 1 && conclusion == 2" :title="'审核结论'" :zIndex="2000" :width="'540px'"
+            :height="'600px'" @before-close="handleClose">
            <template v-slot:PopFrameContent>
                <div class="notification-body">
                    <div style="height: 190px;padding: 0px 40px;font-size: 14px;color: #00F9A2;">
@ -1195,7 +1218,7 @@ function retrunClick() {
    font-weight: 700;
    font-style: normal;
    font-size: 16px;
-    color: #fff;
+    color: #0099ff;
 }

 .video-box {
@ -1209,11 +1232,13 @@ function retrunClick() {
 }

 .alarmInfo-visitation {
-    padding-top: 5px;
    width: 100%;
-    height: 50%;
-    background: url(@/assets/patrolmonitor/xsjk_640.png);
+    height: 49%;
+    // riis-web/src/assets/navigation/sy_zsb.png
+    background: url(@/assets/navigation/sy_zsb.png);
    background-size: 100% 100%;
+    box-sizing: border-box;
+    padding: 10px;
 }

 .alarmimg {
@ -1463,5 +1488,3 @@ function retrunClick() {
    display: none;
 }
 </style>
-
-
--- a/riis-web/src/views/task/patrolmonitor/index.vue
+++ b/riis-web/src/views/task/patrolmonitor/index.vue
@ -63,20 +63,18 @@ function getNowFormatDate() {
 }
 //控制行变色
 const tableRowClassName = ({
-  row,
-  rowIndex,
+    row,
+    rowIndex,
 }: {
-  row: any
-  rowIndex: number
+    row: any
+    rowIndex: number
 }) => {
-  if (row.lastItem == 'Now') {
-    return 'lastItem-row'
-  } else if (rowIndex % 2 === 0) {
-    // return 'warning-row'
-  } else if (rowIndex % 2 === 1) {
-    // return 'success-row'
-  }
-  return ''
+    if (rowIndex % 2 === 0) {
+        return 'warning-row'
+    } else if (rowIndex % 2 === 1) {
+        return 'success-row'
+    }
+    return ''
 }

 //获取表格数据
@ -346,6 +344,12 @@ function handleClose(){
 function retrunClick(){
  isPatrolDetails.value = true;
 }
+function removePercentSign(str:any) {
+    if (str.includes("%")) {
+        str = str.replace("%", "");
+    }
+    return str;
+}
 </script>
 <template>
  <div>
@ -467,10 +471,10 @@ function retrunClick(){
        </div>
        <!-- <img src="@/assets/MenuIcon/xsri_lb1.png" alt="" style="width:100%;position: absolute;"> -->
        <!-- <div style="position: relative;"> -->
-        <el-table :data="tableData" class="PatrolMonitoring" 
+        <el-table :data="tableData" class="PatrolMonitoring"  :row-class-name="tableRowClassName"
          style="width: 99%;margin:auto;position: relative; height:calc(79vh); overflow: auto;margin-top: 10px; "
          stripe :header-cell-style="tableBg">
-          <el-table-column type="index" align="center" label="序号" width="50px" />
+          <el-table-column type="index" align="center" label="序号" width="60px" />
          <el-table-column prop="taskName" label="任务名称" min-width="140px" align="left" />
          <el-table-column prop="taskType" label="任务类型" width="100px" align="center">
            <template #default="scope">
@ -493,7 +497,7 @@ function retrunClick(){
          </el-table-column>
          <el-table-column prop="taskProgress" label="进度" align="center" width="100px">
            <template #default="scope">
-              <el-progress :text-inside="true" :stroke-width="18" :percentage="scope.row.taskProgress" status="success" />
+              <el-progress :text-inside="true" :stroke-width="18" :percentage="Number(removePercentSign(scope.row.taskProgress))" status="success" />
            </template>
          </el-table-column>
          <el-table-column prop="taskState" label="状态" align="center" width="100px">
@ -510,45 +514,31 @@ function retrunClick(){
          </el-table-column>
          <el-table-column prop="description" label="巡视结果" width="140px" align="center">
            <template #default="scope">
-              <span>成功：{{ scope.row.result.successCount }}；</span><span>失败：{{ scope.row.result.failCount }}</span><br />
-              <span>正常：{{ scope.row.result.normalCount }}；</span><span style="color: #FF3300;">异常：{{
-                scope.row.result.abnormalCount }}</span>
+              <span>成功：{{ scope.row.deviceDeforeNum - scope.row.deviceFailureNum }}；</span><span>失败：{{ scope.row.deviceFailureNum }}</span><br />
+              <span>正常：{{ scope.row.deviceDeforeNum - scope.row.deviceFailureNum - scope.row.deviceUnusualnum }}；</span><span style="color: #FF3300;">异常：{{scope.row.deviceUnusualnum }}</span>
            </template>

          </el-table-column>
-          <el-table-column label="操作" align="center" width="140px">
+          <el-table-column label="操作" align="center" width="240px">
            <template #default="scope">
-              <div style="display: flex; justify-content: space-between;align-items: center;">
-                <img src="@/assets/tableIcon/patrolmonitor/u2219.png" alt="" title="立即执行" class="cursorpointer"
-                  v-hasPerm="['task:runnow']" v-if="scope.row.taskState == 0"
-                  @click="Operate(scope.row, 'runNow')">
-                 <img src="@/assets/tableIcon/patrolmonitor/u2219_disabled.png" alt="" title="立即执行"
-                  v-hasPerm="['task:runnow']" v-else>
+              <div style="display: flex; justify-content: center;">
+                <div v-hasPerm="['task:runnow']" v-if="scope.row.taskState == 0" class="button-style"
+                  @click="Operate(scope.row, 'runNow')">立即执行</div>
+                <div v-hasPerm="['task:suspend']" v-if="scope.row.taskState == 3" class="button-style"
+                  @click="Operate(scope.row, 'resume')">恢复</div>
+                <div v-hasPerm="['task:suspend']" v-if="scope.row.taskState == 2 || scope.row.taskState == 0"
+                  class="button-style" @click="Operate(scope.row, 'pause')">暂停</div>

-
-
-
-                <img class="cursorpointer" src="@/assets/tableIcon/patrolmonitor/u2225.png" v-hasPerm="['task:suspend']" v-if="scope.row.taskState == 2 || scope.row.taskState == 0"
-                  title="暂停" @click="Operate(scope.row, 'pause')">
-                <img v-else src="@/assets/tableIcon/patrolmonitor/u2225_disabled.png"  v-hasPerm="['task:suspend']"
-                  title="暂停">
-                <img class="cursorpointer" src="@/assets/tableIcon/patrolmonitor/u2228.png"  v-hasPerm="['task:suspend']" v-if="scope.row.taskState == 3" title="恢复"
-                  @click="Operate(scope.row, 'resume')">
-
-                <img v-else src="@/assets/tableIcon/patrolmonitor/u2228_disabled.png"  v-hasPerm="['task:suspend']" title="恢复">
-
-                <img class="cursorpointer" src="@/assets/tableIcon/patrolmonitor/u2231.png"
-                  v-hasPerm="['task:shutdown']"
-                  v-if="scope.row.taskState == 0 || scope.row.taskState == 3 "
-                  @click="Operate(scope.row, 'stop')"
-                  title="终止" >
-                <img v-else src="@/assets/tableIcon/patrolmonitor/u2231_disabled.png"
-                  v-hasPerm="['task:shutdown']"
-                  title="终止" >
-
-                  <img class="cursorpointer" src="@/assets/tableIcon/patrolmonitor/u2222.png"
-                    @click="detailed(scope.row)"
-                  title="详情" >
+                <div v-hasPerm="['task:shutdown']" v-if="scope.row.taskState == 0 || scope.row.taskState == 3"
+                  class="button-style" @click="Operate(scope.row, 'stop')">终止</div>
+                <div @click="detailed(scope.row)" class="button-style"><router-link :to="{
+                  path: '/patrolDetails',
+                  query: {
+                    taskTodoId: scope.row.taskTodoId,
+                    isStationFlag: scope.row.isStationFlag
+                  }
+                }" style="color:#0099ff ;">详情</router-link>
+                </div>
              </div>
            </template>
          </el-table-column>
--- a/riis-web/src/views/task/patrolreport/index.vue
+++ b/riis-web/src/views/task/patrolreport/index.vue
@ -352,7 +352,7 @@ onMounted(() => {
 .rightNav {
  width: 100%;
  height: calc(89vh);
-  background-color: #131a25;
+  // background-color: #131a25;
  border: none;
  border-radius: 3px;
  padding: 10px 15px 0px;
--- a/riis-web/src/views/threevisitation/3DModelSet/index.vue
+++ b/riis-web/src/views/threevisitation/3DModelSet/index.vue
@ -4984,7 +4984,7 @@ function getComponentPage() {
    bayId: pageInfo.value.bayId,
    componentName: componentName.value
  }
-  getComponentByBayPage(params).then(res => {
+  getComponentByBayPage(JSON.stringify(params)).then(res => {
    componentData.value = res.data.records
    pageInfo.value.size = res.data.size
    pageInfo.value.current = res.data.current
@ -5015,7 +5015,7 @@ function getmainDevicePage() {
  getSubstationBayByArea({ stationCode: userStore.stationCode }).then((res) => {
    bayIdType.value = res.data
  })
-  getMainDevicePage(params).then(res => {
+  getMainDevicePage(JSON.stringify(params)).then(res => {
    mainDeviceData.value = res.data.records
    pageInfo.value.size = res.data.size
    pageInfo.value.current = res.data.current
--- a/riis-web/src/views/threevisitation/3Dbrowsing/index.vue
+++ b/riis-web/src/views/threevisitation/3Dbrowsing/index.vue
@ -391,36 +391,46 @@
          </el-table-column>
          <el-table-column prop="desc" label="识别类型" width="140px">
            <template #default="scope">
-              <span v-if="scope.row.desc != null && scope.row.desc != ''">{{ scope.row.desc
+              <span v-if="scope.row.recognitionType">{{ currency(recognitionType,
+                scope.row.recognitionType,)
              }}</span>
              <span v-else>--</span>
            </template>
          </el-table-column>
          <el-table-column label="识别值" width="100px">
            <template #default="scope">
-              <span v-if="scope.row.valueType == 'meter' || scope.row.valueType == 'infrared'">
+              <span
+                v-if="scope.row.valueType == 'meter' || scope.row.valueType == 'partial' || scope.row.valueType == 'partial' || scope.row.valueType == 'infrared'">
                <span v-if="scope.row.analysisResult == '异常'" style="color: red;font-size: 16px;font-weight: bold;">
-                  {{
-                    scope.row.value }}
-                  {{ scope.row.unit }}</span>
-                <span v-else> {{ scope.row.value }} {{ scope.row.unit }}</span>
+                  {{ scope.row.value }} {{ scope.row.unit }}
+                </span>
+                <span v-else>
+                  {{ scope.row.value }} {{ scope.row.unit }}
+                </span>
              </span>
              <span v-else>
-                <span v-if="scope.row.conf != null && scope.row.conf != ''">{{ scope.row.conf
-                }}</span>
+                <span v-if="scope.row.desc != null && scope.row.desc != '' && scope.row.valueType != 'sound'">
+                  {{ scope.row.desc }}
+                </span>
                <span v-else>--</span>
              </span>
            </template>
          </el-table-column>
          <el-table-column prop="analysisResult" label="巡视结论" align="center" width="80px">
            <template #default="scope">
-              <span v-if="scope.row.analysisResult == '正常'" style="color: rgb(0, 249, 162)">正常</span>
-              <span v-if="scope.row.analysisResult == '异常'"
-                style="color: rgb(255, 51, 0);color: red;font-size: 16px;font-weight: bold;">异常</span>
-              <span v-if="scope.row.analysisResult == '设备检修'" style="color: rgb(0, 153, 255)">设备检修</span>
-              <span v-if="scope.row.analysisResult == '失败'" style="color: rgb(255, 189, 0)">失败</span>
-              <span v-if="scope.row.analysisResult == '成功'" style="color: rgb(0, 249, 162)">成功</span>
-              <span v-if="scope.row.analysisResult == '' || scope.row.analysisResult == null">--</span>
+              <span v-if="scope.row.analysisResult == '正常' && scope.row.flag != '7'"
+                style="color: rgb(0, 249, 162)">正常</span>
+              <span v-if="scope.row.analysisResult == '异常' && scope.row.flag != '7'"
+                style="color: rgb(255, 51, 0);font-size: 16px;font-weight: bold;">异常</span>
+              <span v-if="scope.row.analysisResult == '设备检修' && scope.row.flag != '7'"
+                style="color: rgb(0, 153, 255)">设备检修</span>
+              <span v-if="scope.row.analysisResult == '失败' && scope.row.flag != '7'"
+                style="color: rgb(255, 189, 0)">失败</span>
+              <span v-if="scope.row.analysisResult == '成功' && scope.row.flag != '7'"
+                style="color: rgb(0, 249, 162)">成功</span>
+              <span v-if="scope.row.flag == '7'" style="color: rgb(255, 51, 0);">表计读数异常</span>
+              <span
+                v-if="(scope.row.analysisResult == '' && scope.row.flag != '7') || (scope.row.analysisResult == null && scope.row.flag != '7')">--</span>
            </template>
          </el-table-column>
          <el-table-column prop="reviseValue" label="修正值" align="center">
@ -592,6 +602,7 @@ const srangingMouse = new THREE.Vector2()

 // 初始化
 onMounted(() => {
+  getTypeTwo()
  setupWebSocket()
  initRenderer()

@ -677,6 +688,12 @@ function Information(val) {
  })

 }
+const recognitionType = ref([])
+function getTypeTwo() {
+    getDeviceByType({ dictcode: 'recognition_type' }).then((res) => {
+        recognitionType.value = res.data
+    })
+}
 // 页面退出
 onBeforeUnmount(() => {
  window.removeEventListener('resize', resize)
@ -2417,21 +2434,21 @@ function getVideoUrl(row, index) {
      videoUrl.value = res.data.data.ws_flv
      videofmp4.value = res.data.data.fmp4
      if (index == 'camera') {
-        presetPosition(130,row.patroldevice_pos)
+        presetPosition(130, row.patroldevice_pos)
      }

    }
  }).catch(function (error) {
  })
 }
-function presetPosition(cmdCode,presetPos) { // 预置位操作 ---设置、删除、调用
+function presetPosition(cmdCode, presetPos) { // 预置位操作 ---设置、删除、调用

-axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((resize) => {
+  axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((resize) => {
    if (res.data.data == "0") {
-        console.log("预置位")
-        axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode + '&parameter1=0&parameter2=' + presetPos + '&combindCode2=0', {}).then((res) => { })
+      console.log("预置位")
+      axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode + '&parameter1=0&parameter2=' + presetPos + '&combindCode2=0', {}).then((res) => { })
    }
-})
+  })
 }
 //摄像机-摄像机-视频播放
 const videoChannelList = ref([])
@ -2503,7 +2520,6 @@ const hisloading = ref(false)
 const timeSlot = ref([])
 const deviceIdone = ref('')
 function historicalRecords(row) {
-  console.log(row)
  getType()
  deviceIdone.value = row
  historParams.value.deviceId = row.objinfo.deviceId
@ -2520,7 +2536,7 @@ function historicalRecords(row) {
  getHistoryDevice(historParams.value).then(res => {
    if (res.code == 0) {
      historydata.value = res.data.records
-      historParams.value.size = res.data.records
+      historParams.value.size = res.data.size
      historParams.value.current = res.data.current
      histotal.value = res.data.total
      hisloading.value = false
@ -3040,8 +3056,9 @@ function nextPage() {
  z-index: 1001;
  width: 320px;
  height: calc(100% - 18px);
-  background: url('@/assets/3d/spjk_ytbj.png') no-repeat;
+  background: url('@/assets/navigation/sanwei.png') no-repeat;
  background-size: 100% 100%;
+  background-color: #001b4a;

  .THREE-right-list-title {
    width: 100%;
Author	SHA1	Message	Date
wangxk	ef033aa4bb	5-13会议BUG提交	2025-05-13 10:45:52 +08:00
wangxk	2511b18167	天气，告警状态改变	2025-05-12 09:07:46 +08:00