diff --git a/riis-web/src/assets/navigation/hjjc_sj2.png b/riis-web/public/environment/humidity.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj2.png
rename to riis-web/public/environment/humidity.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj7.png b/riis-web/public/environment/oxygen.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj7.png
rename to riis-web/public/environment/oxygen.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj5.png b/riis-web/public/environment/pressure.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj5.png
rename to riis-web/public/environment/pressure.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj6.png b/riis-web/public/environment/rainfall.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj6.png
rename to riis-web/public/environment/rainfall.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj8.png b/riis-web/public/environment/sf6.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj8.png
rename to riis-web/public/environment/sf6.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj1.png b/riis-web/public/environment/temperature.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj1.png
rename to riis-web/public/environment/temperature.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj4.png b/riis-web/public/environment/windDirection.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj4.png
rename to riis-web/public/environment/windDirection.png
diff --git a/riis-web/src/assets/navigation/hjjc_sj3.png b/riis-web/public/environment/windSpeed.png
similarity index 100%
rename from riis-web/src/assets/navigation/hjjc_sj3.png
rename to riis-web/public/environment/windSpeed.png
diff --git a/riis-web/public/webconfig.js b/riis-web/public/webconfig.js
index e6ca7cf..8a7c508 100644
--- 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":"标题"
 }
\ No newline at end of file
diff --git a/riis-web/src/api/alarmInfo/index.ts b/riis-web/src/api/alarmInfo/index.ts
index 752be0c..09126ce 100644
--- 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){
diff --git a/riis-web/src/api/alarminterval/index.ts b/riis-web/src/api/alarminterval/index.ts
index f656888..e9b28ab 100644
--- 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
     });
-  }
\ No newline at end of file
+    
+  }
+    //批量修改警告阈值
+export function getAlgorithmModelById(params:any){
+  return request({
+    url: '/basedata/alarm-threshold/getAlgorithmModelById' ,
+    method: 'get',
+    params:params
+  });
+}
\ No newline at end of file
diff --git a/riis-web/src/api/device/index.ts b/riis-web/src/api/device/index.ts
index 94794af..7882157 100644
--- a/riis-web/src/api/device/index.ts
+++ b/riis-web/src/api/device/index.ts
@@ -129,6 +129,13 @@ 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({
diff --git a/riis-web/src/api/environmentalMonitoring/index.ts b/riis-web/src/api/environmentalMonitoring/index.ts
index c3efa91..b051139 100644
--- 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({
diff --git a/riis-web/src/api/home/index.ts b/riis-web/src/api/home/index.ts
index 86c82bb..f166de5 100644
--- 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){
diff --git a/riis-web/src/api/linksignal/index.ts b/riis-web/src/api/linksignal/index.ts
index 4fa5ba2..5887eab 100644
--- 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
   });
diff --git a/riis-web/src/api/patroldetails/index.ts b/riis-web/src/api/patroldetails/index.ts
index 3ff91c0..2bdeecf 100644
--- 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
     });
diff --git a/riis-web/src/api/task/index.ts b/riis-web/src/api/task/index.ts
index d2c45c9..5b3089e 100644
--- a/riis-web/src/api/task/index.ts
+++ b/riis-web/src/api/task/index.ts
@@ -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
   });
diff --git a/riis-web/src/assets/navigation/humidity.png b/riis-web/src/assets/navigation/humidity.png
new file mode 100644
index 0000000..3056dcd
Binary files /dev/null and b/riis-web/src/assets/navigation/humidity.png differ
diff --git a/riis-web/src/assets/navigation/oxygen.png b/riis-web/src/assets/navigation/oxygen.png
new file mode 100644
index 0000000..86d5d7d
Binary files /dev/null and b/riis-web/src/assets/navigation/oxygen.png differ
diff --git a/riis-web/src/assets/navigation/pressure.png b/riis-web/src/assets/navigation/pressure.png
new file mode 100644
index 0000000..00b22d8
Binary files /dev/null and b/riis-web/src/assets/navigation/pressure.png differ
diff --git a/riis-web/src/assets/navigation/rainfall.png b/riis-web/src/assets/navigation/rainfall.png
new file mode 100644
index 0000000..f91032e
Binary files /dev/null and b/riis-web/src/assets/navigation/rainfall.png differ
diff --git a/riis-web/src/assets/navigation/sf6.png b/riis-web/src/assets/navigation/sf6.png
new file mode 100644
index 0000000..d1269b2
Binary files /dev/null and b/riis-web/src/assets/navigation/sf6.png differ
diff --git a/riis-web/src/assets/navigation/temperature.png b/riis-web/src/assets/navigation/temperature.png
new file mode 100644
index 0000000..99f7155
Binary files /dev/null and b/riis-web/src/assets/navigation/temperature.png differ
diff --git a/riis-web/src/assets/navigation/windDirection.png b/riis-web/src/assets/navigation/windDirection.png
new file mode 100644
index 0000000..7c0c1fa
Binary files /dev/null and b/riis-web/src/assets/navigation/windDirection.png differ
diff --git a/riis-web/src/assets/navigation/windSpeed.png b/riis-web/src/assets/navigation/windSpeed.png
new file mode 100644
index 0000000..a509be8
Binary files /dev/null and b/riis-web/src/assets/navigation/windSpeed.png differ
diff --git a/riis-web/src/components/wavEcharts/index.vue b/riis-web/src/components/wavEcharts/index.vue
index b2bff23..0142fd6 100644
--- 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);
diff --git a/riis-web/src/store/modules/user.ts b/riis-web/src/store/modules/user.ts
index fb262c4..1fb628c 100644
--- 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
   };
 });
 
diff --git a/riis-web/src/views/basedata/alarminterval/index.vue b/riis-web/src/views/basedata/alarminterval/index.vue
index 6f5b22d..59ecadc 100644
--- 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>
-
-
diff --git a/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue b/riis-web/src/views/collectmonitor/environmentalMonitoring/index.vue
index b6702a5..c614991 100644
--- 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,69 @@ 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 +141,24 @@ 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 class="img_text2">{{ item.value }}<span class="img_unit"> {{ item.unit }}</span></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 +180,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'"
diff --git a/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue b/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue
index 5b18c0a..7bd6a06 100644
--- 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;
diff --git a/riis-web/src/views/dashboard/index.vue b/riis-web/src/views/dashboard/index.vue
index 1b102c3..2cc8960 100644
--- 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>
@@ -448,42 +448,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: "",
@@ -509,16 +509,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)
@@ -916,6 +916,7 @@ const tabs = ref(1)
           font-size: 24px;
           color: #00FFFF;
           line-height: 23px;
+          margin-right: 10px;
         }
 
         .three_bottom_two {
diff --git a/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue b/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue
index 5c9a3a7..617232f 100644
--- 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;}'
diff --git a/riis-web/src/views/monitorsystem/alarminformation.vue b/riis-web/src/views/monitorsystem/alarminformation.vue
index df47ae9..84d011c 100644
--- 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;">
diff --git a/riis-web/src/views/monitorsystem/giveanalarm.vue b/riis-web/src/views/monitorsystem/giveanalarm.vue
index b5adccc..a13e3fd 100644
--- 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>
diff --git a/riis-web/src/views/question/answering/index.vue b/riis-web/src/views/question/answering/index.vue
new file mode 100644
index 0000000..724bdbe
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/riis-web/src/views/task/alarmInfo/editvideo.vue b/riis-web/src/views/task/alarmInfo/editvideo.vue
new file mode 100644
index 0000000..0cf0a8f
--- /dev/null
+++ 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>
diff --git a/riis-web/src/views/task/alarmInfo/index.vue b/riis-web/src/views/task/alarmInfo/index.vue
new file mode 100644
index 0000000..2be22e6
--- /dev/null
+++ b/riis-web/src/views/task/alarmInfo/index.vue
@@ -0,0 +1,1147 @@
+<script lang="ts">
+export default {
+    name: "alarmInfo", // 警告信息确认
+};
+</script>
+<script setup lang="ts">
+import Page from '@/components/Pagination/page.vue'
+import { ref, onMounted, watch } from "vue";
+import JessibucaPlayer from '@/components/jessibuca/index1.vue'
+import { ElMessage } from "element-plus";
+import { getAlarmLogPage, setAlarmLogStatus, setBatchAlarmLogStatus } from "@/api/alarmInfo";
+import { getDeviceByType,getDictionaryItems } from "@/api/device";
+import moment from 'moment'
+import axios from 'axios';
+import { getNotCheckAlarmCount } from '@/api/home';
+import { useUserStore } from '@/store/modules/user';
+import { getSubstation, } from "@/api/alarminterval";
+import { getMainEquipment } from "@/api/device";
+import Editvideo from "./editvideo.vue";
+import Eldialog from '@/components/seccmsdialog/eldialog.vue';
+const userStore = useUserStore();
+const url = userStore.webApiBaseUrl;
+watch(() => userStore.alarmCount, (newValue, oldValue) => {
+    getData()
+},
+    { deep: true })
+//控制行变色
+const tableRowClassName = ({
+    row,
+    rowIndex,
+}: {
+    row: any
+    rowIndex: number
+}) => {
+    if (rowIndex % 2 === 0) {
+        return 'warning-row'
+    } else if (rowIndex % 2 === 1) {
+        return 'success-row'
+    }
+    return ''
+}
+const treeloading = ref(false)
+const tableData: any = ref([])
+// 查询参数
+const queryInfo: any = ref({
+
+    current: 1, // 当前页
+    size: 10, // 页大小
+    stationCode: userStore.stationCode,
+    taskAlarmType: '', // 告警来源
+    alarmType: '', // 告警类型
+    alarmLevel: '', // 告警等级
+    checkFlag: '0', // 状态
+    startDate: '', // 开始时间
+    endDate: '',// 结束时间
+})
+const dateArr: any = ref([])
+tableData.value = []
+const alarmInfo: any = ref({})
+const total = ref()
+function getData() { // 获取列表信息
+    queryInfo.value.startDate = ""
+    queryInfo.value.endDate = ""
+    if (!queryInfo.value.areaId) {
+        queryInfo.value.bayId = ""
+        queryInfo.value.mainDeviceId = ""
+    }
+    if (!queryInfo.value.bayId) {
+        queryInfo.value.mainDeviceId = ""
+    }
+    if (dateArr.value != null && dateArr.value.length != 0) {
+        queryInfo.value.startDate = dateArr.value[0]
+        queryInfo.value.endDate = dateArr.value[1]
+    } else {
+        queryInfo.value.startDate = ''
+        queryInfo.value.endDate = ''
+    }
+    treeloading.value = true
+    getAlarmLogPage(queryInfo.value).then((res: any) => {
+        for (let i = 0; i < res.data.records.length; i++) {
+            if (res.data.records[i].defectFilePath) {
+                res.data.records[i].defectFilePath1 = []
+                var dateParts = res.data.records[i].defectFilePath.split(",");
+                dateParts.forEach((item: any) => {
+                    res.data.records[i].defectFilePath1.push(userStore.webApiBaseUrl + "/previewimage?type=alarm&filename=" + encodeURI(item))
+                })
+
+            } else if (res.data.records[i].filePath) {
+                res.data.records[i].defectFilePath1 = []
+                var dateParts = res.data.records[i].filePath.split(",");
+                dateParts.forEach((item: any) => {
+                    res.data.records[i].defectFilePath1.push(userStore.webApiBaseUrl + "/previewimage?type=alarm&filename=" + encodeURI(item))
+                })
+            }
+
+        }
+        treeloading.value = false
+        tableData.value = res.data.records
+        total.value = res.data.total
+        queryInfo.value.size = res.data.size
+        queryInfo.value.current = res.data.current
+    }).catch(() => {
+        treeloading.value = false
+    })
+}
+//重置
+function resetting() {
+    queryInfo.value = {
+        current: 1, // 当前页
+        size: 10, // 页大小
+        stationCode: userStore.stationCode,
+        taskAlarmType: '', // 告警来源
+        alarmType: '', // 告警类型
+        alarmLevel: '', // 告警等级
+        checkFlag: '0', // 状态
+        startDate: '', // 开始时间
+        endDate: '',// 结束时间
+    }
+    // let endDate = moment(new Date()).format('YYYY-MM-DD')
+    // const now = new Date(endDate)
+    // const year = now.getFullYear();
+    // const month = now.getMonth();
+    // const day = now.getDate();
+    // let startDate = moment(new Date(year, month - 1, day)).format('YYYY-MM-DD')
+    queryInfo.value.checkFlag = ''
+    dateArr.value = []
+    getData()
+}
+//表格多选事件
+const multipleSelection = ref([])
+const alarmId: any = ref([])
+const handleSelectionChange = (val: any) => {
+    multipleSelection.value = val
+    alarmId.value = []
+    multipleSelection.value.forEach((item: any) => {
+        if (item.checkFlag == 0) {
+            alarmId.value.push(item.id)
+        }
+    })
+}
+const Explicit = ref(false)
+const examinationInfo: any = ref({
+    checkResult: "1"
+})
+function examinationAllClick(row: any) {
+    doubleHit.value = false
+    examinationInfo.value = {
+        checkResult: "1"
+    }
+    isCheckAll.value = true
+    Explicit.value = true
+}
+function examinationClick(row: any) {
+    doubleHit.value = false
+    isCheckAll.value = false
+    examinationInfo.value = row
+    // examinationInfo.value.checkResult = "0"
+    Explicit.value = true
+}
+const playDeviceId = ref("")
+const playChannelId = ref("")
+function queryRecordDetails(row: any) {
+    playDeviceId.value = ""
+    playChannelId.value = ""
+    let startTimeStr = moment(new Date(alarmInfo.value.alarmDate).getTime() - 15 * 1000).format("YYYY-MM-DD HH:mm:ss");
+    let endTimeStr = moment(new Date(alarmInfo.value.alarmDate).getTime() + 15 * 1000).format("YYYY-MM-DD HH:mm:ss");
+
+    axios.get(userStore.webApiMonitorUrl + '/api/gb_record/queryNvrRecord/' + alarmInfo.value.patroldeviceCode + '/' + alarmInfo.value.patroldeviceCode + '?startTime=' + startTimeStr + '&endTime=' + endTimeStr, {}).then((res: any) => {
+        if (res.data.code === 0) {
+            // 处理时间信息
+            clickNum.value = clickNum.value + 1
+            playDeviceId.value = res.data.data.deviceId
+            playChannelId.value = res.data.data.channelId
+            setTime(startTimeStr, endTimeStr);
+            playRecord()
+        }
+
+    }).catch(function (error: any) {
+    })
+}
+function rowClick(row: any) {
+    console.log(row)
+    if (row.id == alarmInfo.value.id ) {
+        return
+    }
+    if (row.alarmSourceType == 2) {
+        ElMessage({message:'辅控任务暂无图片和视频',type:'warning'})
+        return
+    }
+    alarmInfo.value = row
+    RefreshLoad(row)
+    // queryRecordDetails(row.alarmDate)
+}
+const doubleHit = ref(false)
+function confirmClick() {
+    if (doubleHit.value == true) {
+        return
+    }
+    doubleHit.value = true
+    if (isCheckAll.value == false) {
+        const temporaryInfo = {
+            id: examinationInfo.value.id,
+            checkFlag: 1,
+            checkResult: examinationInfo.value.checkResult,
+            checkComment: examinationInfo.value.checkComment,
+            taskAlarmType: examinationInfo.value.taskAlarmType,
+            alarmType: examinationInfo.value.alarmType,
+            deviceId: examinationInfo.value.deviceid
+        }
+        setAlarmLogStatus(temporaryInfo).then((res: any) => {
+            if (res != undefined && res.code == '0') {
+                ElMessage({
+                    type: "success",
+                    message: "核查成功",
+                });
+                getNotCheckAlarmCount({ stationId: userStore.stationId }).then((res: any) => {
+                    userStore.alarmCount = res.data.count
+                })
+                Explicit.value = false
+                getData()
+            } else {
+                doubleHit.value = false
+            }
+        }).catch(() => {
+            ElMessage({
+                type: "error",
+                message: "核查失败",
+            });
+            doubleHit.value = false
+        })
+    } else {
+
+        let alarmJson = {
+            ids: alarmId.value.join(","),
+            checkFlag: 1,
+            checkResult: examinationInfo.value.checkResult,
+            checkComment: examinationInfo.value.checkComment,
+        }
+        const temporaryInfo = {
+            alarmJson: JSON.stringify(alarmJson)
+        }
+        setBatchAlarmLogStatus(temporaryInfo).then((res: any) => {
+            if (res != undefined && res.code == '0') {
+                ElMessage({
+                    type: "success",
+                    message: "核查成功",
+                });
+                getNotCheckAlarmCount({ stationId: userStore.stationId }).then((res: any) => {
+                    userStore.alarmCount = res.data.count
+                })
+                Explicit.value = false
+                getData()
+            } else {
+                doubleHit.value = false
+            }
+
+
+        }).catch(() => {
+            ElMessage({
+                type: "error",
+                message: "核查失败",
+            });
+            doubleHit.value = false
+        })
+    }
+
+}
+const startTime = ref('2023-05-12 09:08:37')
+const endTime = ref('2023-05-12 14:51:18')
+const chooseDate = ref('2023-05-12')
+
+const tmpTime = ref(0)
+const tmpStartTime = ref(0)
+
+function setTime(startTimes: any, endTimes: any) {
+    startTime.value = startTimes;
+    endTime.value = endTimes;
+    let start: any = (new Date(startTime.value).getTime() - new Date(chooseDate.value + " 00:00:00").getTime()) / 1000;
+    let end: any = (new Date(endTime.value).getTime() - new Date(chooseDate.value + " 00:00:00").getTime()) / 1000;
+    tmpTime.value = new Date(endTimes).getTime() - new Date(startTimes).getTime()
+    tmpStartTime.value = new Date(startTimes).getTime()
+}
+const streamId = ref("")
+function gbPlay() {// 视频回放播放功能
+    axios.get(userStore.webApiMonitorUrl + '/api/playback/resume/' + streamId.value, {}).then((res: any) => {
+    }).catch(function (error: any) {
+    });
+}
+function gbPause() { // 视频回放暂停功能
+    axios.get(userStore.webApiMonitorUrl + '/api/playback/pause/' + streamId.value, {}).then((res: any) => {
+    }).catch(function (error: any) {
+    })
+}
+function closeVideo(index: any) { // 关闭视频
+
+}
+
+const videoUrl = ref('')
+const isCheckAll = ref(false)
+
+const AlarmLevelList: any = ref([]) // 告警等级
+const AlarmSourceList: any = ref([])
+const checkFlagList: any = ref([{
+    id: "0",
+    itemcode: "0",
+    dictname: "未核查"
+}, {
+    id: "1",
+    itemcode: "1",
+    dictname: "已审核"
+}, {
+    id: "2",
+    itemcode: "2",
+    dictname: "已修正"
+}
+])
+const AlarmTypeArr: any = ref([])
+function getArrType() { // 查询字典方法
+    const paramstype = {
+        dictcode: 'AlarmLevel'
+    }
+    getDeviceByType(paramstype).then((res: any) => {
+        AlarmLevelList.value = res.data
+    })
+
+    const paramstypes = {
+        dictcode: 'AlarmSource'
+    }
+    getDeviceByType(paramstypes).then((res: any) => {
+        AlarmSourceList.value = res.data
+    })
+    getDictionaryItems({ dictCodes: 'AlarmType,fk_alarmType' }).then((res: any) => {
+        AlarmTypeArr.value = res.data
+    })
+}
+function currency(list: any, itemcode: any) {
+    let dictname = ''
+    list.forEach((element: any) => {
+        if (element.itemcode == itemcode) {
+            dictname = element.dictname
+        }
+    })
+    return dictname
+}
+const isImgBox = ref(false)
+const ImgPath = ref("")
+
+const streamInfo: any = ref({})
+const app = ref("")
+const mediaServerId = ref("")
+const ssrc = ref("")
+const recordVideoPlayer: any = ref(null)
+function stopPlayRecord(callback: any) {
+    recordVideoPlayer.value.pause()
+    videoUrl.value = '';
+    axios.get(userStore.webApiMonitorUrl + '/api/playback/stop/' + playDeviceId.value + "/" + playChannelId.value + "/" + streamId.value, {}).then((res: any) => {
+        if (callback) callback()
+    })
+}
+
+const clickNum = ref(0)
+function sliderChange(e: any) {
+    if (streamId.value !== "") {
+        stopPlayRecord(() => {
+            streamId.value = "";
+            sliderChange(e);
+        })
+    } else {
+        axios.get(userStore.webApiMonitorUrl + '/api/playback/start/' + playDeviceId.value + "/" + playChannelId.value + '?startTime=' + e + '&endTime=' + endTime.value, {}).then((res: any) => {
+
+            if (res.data.code === 0) {
+                // 处理时间信息
+                streamInfo.value = res.data.data;
+                app.value = res.data.data.app;
+                streamId.value = res.data.data.stream;
+                mediaServerId.value = res.data.data.mediaServerId;
+                ssrc.value = res.data.data.ssrc;
+                videoUrl.value = getUrlByStreamInfo()
+            }
+        }).catch(function (error: any) {
+        });
+    }
+}
+function playRecord() {
+    if (streamId.value !== "") {
+        stopPlayRecord(() => {
+            streamId.value = "";
+            playRecord();
+        })
+    } else {
+        axios.get(userStore.webApiMonitorUrl + '/api/playback/start/' + playDeviceId.value + "/" + playChannelId.value + '?startTime=' + startTime.value + '&endTime=' + endTime.value, {}).then((res: any) => {
+            if (res.data.code === 0) {
+                // 处理时间信息
+                streamInfo.value = res.data.data;
+                app.value = res.data.data.app;
+                streamId.value = res.data.data.stream;
+                mediaServerId.value = res.data.data.mediaServerId;
+                ssrc.value = res.data.data.ssrc;
+                videoUrl.value = getUrlByStreamInfo()
+            }
+        }).catch(function (error: any) {
+        });
+    }
+}
+function getUrlByStreamInfo() {
+    if (location.protocol === "https:") {
+        videoUrl.value = streamInfo.value["wss_flv"]
+    } else {
+        videoUrl.value = streamInfo.value["ws_flv"]
+    }
+    return videoUrl.value;
+
+}
+onMounted(() => {
+    let endDate = moment(new Date()).format('YYYY-MM-DD')
+    const now = new Date(endDate)
+    const year = now.getFullYear();
+    const month = now.getMonth();
+    const day = now.getDate();
+    let startDate = moment(new Date(year, month - 1, day)).format('YYYY-MM-DD')
+    dateArr.value = [startDate, endDate]
+    getArrType()
+    getData()
+    notification()
+})
+//获取变电站树
+const treeAll = ref([])
+function notification() {
+    getSubstation().then((res: any) => {
+        treeAll.value = res.data
+    })
+
+}
+//获取变电站
+const areaAll: any = ref([])
+const bayAll: any = ref([])
+function getStation() {
+    const terrlist: any = ref([])
+    const terrarealist: any = ref([])
+    const terrbaylist: any = ref([])
+    treeAll.value.forEach((element: any) => {
+        terrlist.value.push(element)
+        if (element.stationId == userStore.stationId) {
+            element.children.forEach((res: any) => {
+                terrarealist.value.push(res)
+                if (res.areaId == queryInfo.value.areaId) {
+                    if (res.children) {
+                        res.children.forEach((row: any) => {
+                            terrbaylist.value.push(row)
+                        })
+                    }
+                }
+            });
+        }
+
+    });
+    areaAll.value = [...new Set(terrarealist.value)];
+    bayAll.value = [...new Set(terrbaylist.value)];
+}
+//获取间隔下主设备
+const Masterdata: any = ref([])
+function gatMain() {
+    const paramsall = {
+        bayId: queryInfo.value.bayId
+    }
+    getMainEquipment(paramsall).then((res: any) => {
+        Masterdata.value = res.data
+    });
+}
+
+
+//视频配置
+const isswitch = ref(false)
+const devicechannelInfo = ref({})
+const videofmp4 = ref('')
+function RefreshLoad(info: any) {
+    console.log(info)
+    if (isswitch.value == true) {
+        ElMessage({
+            type: 'error',
+            message: '正在加载监控视频！',
+        })
+        return
+    }
+    devicechannelInfo.value = {
+        deviceId: info.channelList[0].deviceId,
+        channelId: info.channelList[0].channelId
+    }
+    isswitch.value = true
+    axios.get(userStore.webApiMonitorUrl + '/api/play/start/' + info.channelList[0].deviceId + '/' + info.channelList[0].channelId, {}).then((res: any) => {
+        isswitch.value = false
+        if (res.data.data != undefined) {
+            videoUrl.value = res.data.data.ws_flv
+            videofmp4.value = res.data.data.fmp4
+            axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + info.channelList[0].deviceId, {}).then((res: any) => {
+                if (res.data.data == "0" && info.patroldevicePos) {
+                    axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + info.channelList[0].deviceId + '/' + info.channelList[0].channelId + '?cmdCode=' + '130' + '&parameter1=0&parameter2=' + info.patroldevicePos + '&combindCode2=0', {}).then((res: any) => { })
+                }
+            })
+
+
+
+        }
+    }).catch(function (error: any) {
+
+    })
+}
+const isVideo = ref(false)
+</script>
+<template>
+
+    <div class="alarmInfo-box">
+
+        <div class="alarmInfo-left">
+            <div>
+                <div
+                    style="height:37px;position: relative;display: flex;align-items: center; justify-content: space-between;">
+                    <div style="display: flex;align-items: center;" class="screenHomepage">
+                        <el-select v-model="queryInfo.taskAlarmType" class="m-2 selType" placeholder="告警来源"
+                            @change="getData" style="width:140px;" :teleported="false" :popper-append-to-body="false"
+                            clearable>
+                            <el-option v-for="item in AlarmSourceList" :key="item.id" :label="item.dictname"
+                                :value="item.itemcode" />
+                        </el-select>
+                        <el-select v-model="queryInfo.alarmType" class="m-2 selType" placeholder="告警类型"
+                            @change="getData" style="width:140px;" :teleported="false" :popper-append-to-body="false"
+                            clearable>
+                            <el-option v-for="item in AlarmTypeArr" :key="item.id" :label="item.dictname"
+                                :value="item.itemcode" />
+                        </el-select>
+
+                        <el-select v-model="queryInfo.alarmLevel" class="m-2 selType" placeholder="告警等级"
+                            @change="getData" style="width:100px;" :teleported="false" :popper-append-to-body="false"
+                            clearable>
+                            <el-option v-for="item in AlarmLevelList" :key="item.id" :label="item.dictname"
+                                :value="item.itemcode" />
+                        </el-select>
+                        <el-select v-model="queryInfo.checkFlag" class="m-2 selType" placeholder="状态" @change="getData"
+                            style="width:100px;" :teleported="false" :popper-append-to-body="false" clearable>
+                            <el-option v-for="item in checkFlagList" :key="item.id" :label="item.dictname"
+                                :value="item.itemcode" />
+                        </el-select>
+                        <el-date-picker v-model="dateArr" type="daterange" range-separator="至" start-placeholder="开始时间"
+                            style="width:250px;margin-right: 10px;" popper-class="elDatePicker" format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD" end-placeholder="结束时间" :clearable="false" @change="getData" />
+                        <el-button class="searchButton" @click="getData">搜索</el-button>
+                        <el-button class="searchButton" @click="resetting">重置</el-button>
+                    </div>
+                    <div style="min-width: 0px;">
+                        <el-button class="searchButton" @click="examinationAllClick"
+                            :disabled="multipleSelection.length == 0">批量核查</el-button>
+                    </div>
+                </div>
+                <div>
+                    <el-select v-model="queryInfo.areaId" class="m-2 selType" placeholder="区域"
+                        @visible-change="getStation" @change="getData" style="width:140px;" :teleported="false"
+                        :popper-append-to-body="false" clearable>
+                        <el-option v-for="item in areaAll" :key="item.areaId" :label="item.areaName"
+                            :value="item.areaId" />
+                    </el-select>
+                    <el-select v-model="queryInfo.bayId" class="m-2 selType" placeholder="间隔"
+                        @visible-change="getStation" @change="getData" style="width:140px;" :teleported="false"
+                        :popper-append-to-body="false" clearable>
+                        <el-option v-for="item in bayAll" :key="item.bayId" :label="item.bayName" :value="item.bayId" />
+                    </el-select>
+                    <el-select v-model="queryInfo.mainDeviceId" class="m-2 selType" placeholder="主设备" @change="getData"
+                        style="width:140px;" @visible-change="gatMain" :teleported="false"
+                        :popper-append-to-body="false" clearable>
+                        <el-option v-for="item in Masterdata" :key="item.mainDeviceId" :label="item.mainDeviceName"
+                            :value="item.mainDeviceId" />
+                    </el-select>
+                </div>
+
+
+                <el-table row-key="id" :data="tableData" :row-class-name="tableRowClassName" class="PatrolMonitoring"
+                    v-loading="treeloading" element-loading-background="rgb(11, 40, 34)" highlight-current-row
+                    style="width: 100%;margin:auto;position: relative;margin-top: 0px; height:calc(75vh); overflow: auto "
+                    :header-cell-style="{ background: '#002b6a', color: '#B5D7FF', height: '50px' }"
+                    @selection-change="handleSelectionChange" @row-click="rowClick">
+                    <el-table-column type="selection" width="55" align="center" />
+                    <el-table-column type="index" align="center" label="序号" width="60px"></el-table-column>
+                    <el-table-column prop="patroldeviceName" label="设备名称" />
+                    <el-table-column prop="componentName" label="部件名称" />
+                    <el-table-column prop="deviceName" label="点位名称" />
+                    <el-table-column prop="materialId" label="实物ID">
+                        <template #default="scope">
+                            <span v-if="scope.row.materialId">{{ scope.row.materialId }}</span>
+                            <span v-else>--</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="点位分类" prop="appearanceType">
+                        <template #default="scope">
+                            <span v-if="scope.row.pointType == 1">Ⅰ类</span>
+                            <span v-if="scope.row.pointType == 2">Ⅱ类</span>
+                            <span v-if="scope.row.pointType == 3">Ⅲ类</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="taskAlarmType" label="告警来源" width="110px" align="center">
+                        <template #default="scope">
+                            <span>{{ currency(AlarmSourceList, scope.row.taskAlarmType) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="alarmType" label="告警类型" width="110px" align="center">
+                        <template #default="scope">
+
+                            <span>{{ currency(AlarmTypeArr,scope.row.alarmSourceType == '1'? scope.row.alarmType : scope.row.fkAlarmType) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="alarmLevel" label="告警等级" width="90px" align="center">
+                        <template #default="scope">
+                            <span v-if="scope.row.alarmLevel == 1" style="color: #0099FF;">{{ currency(AlarmLevelList,
+                                scope.row.alarmLevel) }}</span>
+                            <span v-if="scope.row.alarmLevel == 2" style="color: #FFFF00;">{{ currency(AlarmLevelList,
+                                scope.row.alarmLevel) }}</span>
+                            <span v-if="scope.row.alarmLevel == 3" style="color: #FF9900;">{{ currency(AlarmLevelList,
+                                scope.row.alarmLevel) }}</span>
+                            <span v-if="scope.row.alarmLevel == 4" style="color: #FF3300;">{{ currency(AlarmLevelList,
+                                scope.row.alarmLevel) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="custom2" label="缺陷类别" width="90px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="alarmDate" label="告警时间" width="110px" align="center" />
+                    <el-table-column prop="checkFlag" label="状态" width="70px" align="center">
+                        <template #default="scope">
+                            <span>{{ currency(checkFlagList, scope.row.checkFlag) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="80px" align="center">
+                        <template #default="scope">
+                            <div style="display: flex;justify-content: space-around;">
+                                <div class="button-style" @click.stop="examinationClick(scope.row)">核查</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: center;margin-top: 5px;">
+                    <Page style="position: relative;z-index: 100;" :total="total" v-model:size="queryInfo.size"
+                        :jumper="'hide'" v-model:current="queryInfo.current" @pagination="getData()"></Page>
+                </div>
+            </div>
+        </div>
+        <div class="alarmInfo-right">
+            <div class="alarmInfo-visitation" >
+                <div style="display:flex;align-items: center;margin: 5px 0px ;">
+                    <div class="alarmInfo-line"></div>
+                    <div class="alarmInfo-title"> <span class="fontFamily">实时视频 </span> </div>
+                </div>
+                <div class="video-box">
+                    <div v-if="alarmInfo.id == undefined">
+                        <img src="@/assets/monitorsystem/gjqr_wsp.png">
+                        <div style="    font-family: 'Arial Normal', 'Arial';
+            font-weight: 400;
+            font-style: normal;
+            font-size: 18px;
+            color: rgba(255, 255, 255, 0.6);
+            text-align: center;
+            padding-top: 10px;">暂无视频</div>
+                    </div>
+                    <!-- <JessibucaPlayer v-if="alarmInfo.id != undefined" ref="recordVideoPlayer" :isrecord="'alarmInfo'" :_uid="99"
+            :visible.sync="true" :videoUrl="videoUrl" height="100px" :tmpTime="tmpTime" :endTime="endTime"
+            :tmpStartTime="tmpStartTime" :chooseDate="chooseDate" :hasAudio="true" fluent autoplay live
+            :clickNum="clickNum" @closeVideo="closeVideo" @sliderChange="sliderChange" @gbPlay="gbPlay"
+            @gbPause="gbPause"></JessibucaPlayer> -->
+                    <JessibucaPlayer v-if="alarmInfo.id != undefined" ref="recordVideoPlayer" :zhu='true' :_uid="101"
+                        :devicechannelInfo="devicechannelInfo" :visible.sync="true" :videoUrl="videoUrl"
+                        :videofmp4="videofmp4" :hasAudio="true" fluent autoplay live @closeVideo="closeVideo">
+                    </JessibucaPlayer>
+                </div>
+            </div>
+
+            <div class="alarmInfo-visitation" >
+                <div style="display:flex;align-items: center;height: 40px;padding-left: 10px;">
+                    <div class="alarmInfo-line"></div>
+                    <div class="alarmInfo-title" style="color: #0099ff;"> <span class="fontFamily">告警图片</span> </div>
+                </div>
+                
+                <div class="alarmimg">
+                    <div v-if="alarmInfo.id == undefined">
+                        <img src="@/assets/monitorsystem/gjqr_wtp.png">
+                        <div style="font-family: 'Arial Normal', 'Arial';
+            font-weight: 400;
+            font-style: normal;
+            font-size: 18px;
+            color: rgba(255, 255, 255, 0.6);
+            text-align: center;
+            padding-top: 10px;">暂无图片</div>
+                    </div>
+                    <div style="width: 96%;height: 90%;" v-if="alarmInfo.id != undefined && alarmInfo.fileType != 3">
+                        <div style="width:100%;height:80%; position: relative;">
+                            <div style="position: absolute;
+                right: 5px;
+                top: 5px;
+                width: 26px;
+                height: 26px;
+                border-radius: 4px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                cursor: pointer;
+                background: rgba(0,0,0,0.5);">
+
+                                <img src="@/assets/monitorsystem/xsri_fd.png" alt="">
+                                <el-image style="position: absolute;width:100%;height:100%; opacity: 0;"
+                                    :src="alarmInfo.defectFilePath1[0]" :zoom-rate="1.2"
+                                    :preview-src-list="alarmInfo.defectFilePath1" :preview-teleported="true"
+                                    fit="cover" />
+                            </div>
+                            <img style="width:100%;height:100%;" :src="alarmInfo.defectFilePath1[0]">
+
+                        </div>
+
+                        <div style="padding-top:10px">巡视结果：<span style="color:#ff2525">{{ alarmInfo.value }}{{
+                            alarmInfo.unit
+                                }}</span></div>
+                        <div style="display:flex;">
+                            <div style="min-width:70px;">告警描述：</div>
+                            <div style="color:#ff2525">{{ alarmInfo.content }}</div>
+
+                        </div>
+                    </div>
+                    <div style="width: 96%;height: 98%;display: flex;align-items: end;"
+                        v-if="alarmInfo.filePath != null && alarmInfo.filePath != '' && alarmInfo.fileType == 3">
+                        <audio style="width: 100%;"
+                            :src="url + '/playAudioFile?filename=' + encodeURI(alarmInfo.defectFilePath)" controls>
+                        </audio>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <Eldialog v-model="Explicit" :close-on-click-modal="false" @before-close="Explicit = false"
+            :title="isCheckAll ? '批量核查' : '核查确认'" append-to-body width="1100px" draggable>
+            <template v-slot:PopFrameContent>
+                <div v-if="isCheckAll == false">
+
+                    <div style="display:flex;align-items: center;margin-bottom: 10px;">
+                        <div class="details-line"></div>
+                        <div class="details-title">告警信息</div>
+                    </div>
+                    <div style="display: flex;justify-content: space-between;align-items: center;">
+                        <div>
+                            <div class="details-conent">
+                                <div class="details-name">间隔名称：</div>
+                                <div>{{ examinationInfo.bayName }}</div>
+                            </div>
+                            <div class="details-conent">
+                                <div class="details-name">设备名称：</div>
+                                <div>{{ examinationInfo.patroldeviceName }}</div>
+                            </div>
+                            <div class="details-conent">
+                                <div class="details-name">部件名称：</div>
+                                <div>{{ examinationInfo.componentName }}</div>
+                            </div>
+                            <div class="details-conent" v-if="examinationInfo.alarmSourceType == 1">
+                                <div class="details-name">告警来源：</div>
+                                <div>{{ currency(AlarmSourceList, examinationInfo.taskAlarmType) }}</div>
+                            </div>
+
+                            <div class="details-conent">
+                                <div class="details-name">告警等级：</div>
+                                <div>{{ currency(AlarmLevelList, examinationInfo.alarmLevel) }}</div>
+                            </div>
+                        </div>
+                        <div style="width:290px;height: 180px;margin: 0px 0px 10px 0px ;" v-if="examinationInfo.alarmSourceType == 1">
+                            <div style="width:100%;height:100%; position: relative;">
+                                <div title="查看图片" style="position: absolute;right: 5px;top: 5px;width: 26px;height: 26px;border-radius: 4px;
+                                    display: flex;align-items: center;justify-content: center;cursor: pointer;background: rgba(0,0,0,0.5);">
+                                    <img src="@/assets/monitorsystem/region/img.png" alt="">
+                                    <el-image v-if="examinationInfo.defectFilePath1"
+                                        style="position: absolute;width:100%;height:100%; opacity: 0;"
+                                        :src="examinationInfo.defectFilePath1[0]" :zoom-rate="1.2"
+                                        :preview-src-list="examinationInfo.defectFilePath1" :preview-teleported="true"
+                                        fit="cover" />
+                                </div>
+                                <div title="查看视频" style="position: absolute;right: 40px;top: 5px;width: 26px;height: 26px;border-radius: 4px;display: flex;
+                                    align-items: center;justify-content: center;cursor: pointer; background: rgba(0,0,0,0.5);">
+                                    <img src="@/assets/monitorsystem/region/video.png" alt="" @click="isVideo = true">
+                                </div>
+                                <span v-if="examinationInfo.defectFilePath">
+                                    <video v-if="examinationInfo.defectFilePath.indexOf('mp4') != -1" width="300"
+                                        height="400"
+                                        :src="url + '/alarm/' + decodeURIComponent(examinationInfo.filePath)" loop
+                                        autoplay preload="auto" controls></video>
+                                    <div v-else-if="examinationInfo.fileType == 3" style="padding-top:20px;">
+                                        <audio style="width: 100%;margin-top:30px;"
+                                            :src="url + '/video/' + decodeURIComponent(examinationInfo.filePath)"
+                                            controls>
+                                        </audio>
+                                    </div>
+                                    <img v-else-if="examinationInfo.defectFilePath1" style="width:100%;height:100%;"
+                                        :src="examinationInfo.defectFilePath1[0]">
+                                </span>
+                                <!-- <img v-if="examinationInfo.defectFilePath1" style="width:100%;height:100%;":src="examinationInfo.defectFilePath1[0]"> -->
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="details-conent">
+                        <div class="details-name">告警描述：</div>
+                        <div>{{ examinationInfo.content }}</div>
+                    </div>
+                    <div style="display:flex;align-items: center;margin-bottom: 10px;margin-top: 30px;">
+                        <div class="details-line"></div>
+                        <div class="details-title">核查确认</div>
+                    </div>
+                </div>
+                <div class="details-conent" style="align-items: center;">
+                    <div class="details-name" style="padding-right: 10px;">是否属实</div>
+
+                    <el-radio-group v-model="examinationInfo.checkResult"
+                        :disabled="examinationInfo.checkFlag != 0 && examinationInfo.checkFlag != undefined">
+                        <el-radio label="1" size="large">是</el-radio>
+                        <el-radio label="0" size="large">否</el-radio>
+                    </el-radio-group>
+                </div>
+                <div class="details-conent">
+                    <div class="details-name" style="padding-right: 10px;">反馈意见</div>
+                    <el-input v-model="examinationInfo.checkComment"
+                        :readonly="examinationInfo.checkFlag != 0 && examinationInfo.checkFlag != undefined" :rows="3"
+                        resize="none" type="textarea" placeholder="" />
+                </div>
+                <div style="display:flex;justify-content:center;margin-top:40px">
+                    <div class="details-button" v-if="examinationInfo.checkFlag == 0 || examinationInfo.checkFlag == undefined" @click="Explicit = false">取消</div>
+                    <div class="details-button"
+                        v-if="examinationInfo.checkFlag == 0 || examinationInfo.checkFlag == undefined"
+                        @click="confirmClick">确定</div>
+                </div>
+            </template>
+        </Eldialog>
+        <Eldialog v-model="isImgBox" :close-on-click-modal="false" @before-close="isImgBox = false" :title="''"
+            append-to-body width="1100px" draggable>
+            <template v-slot:PopFrameContent>
+                <div style="    display: flex;align-items: center;  justify-content: center;">
+                    <img :src="ImgPath" alt="" style="max-width:100vw ;max-height: 100vh;">
+                </div>
+            </template>
+        </Eldialog>
+        <Eldialog v-model="isVideo" :close-on-click-modal="false" @before-close="isVideo = false" :title="'查看摄像机'"
+            append-to-body width="1100px" draggable>
+            <template v-slot:PopFrameContent>
+                <Editvideo :_uid="2001" v-if="isVideo == true" :rowInfo="examinationInfo.channelList[0]"
+                    :online="'1'" />
+            </template>
+        </Eldialog>
+    </div>
+</template>
+<style scoped lang="scss">
+.alarmInfo-box {
+    display: flex;
+    justify-content: space-between;
+    padding: 8px;
+    padding-bottom: 0;
+
+    .alarmInfo-left {
+        padding: 8px;
+        width: calc(65vw);
+        height: calc(100vh - 90px);
+        background: url(@/assets/navigation/ty_1614x988.png);
+        background-size: 100% 100%;
+    }
+
+    .alarmInfo-right {
+        width: calc(33.5vw);
+        height: calc(100vh - 90px);
+        display: flex;
+        flex-wrap: wrap;
+        align-content: space-between;
+
+        .alarmInfo-line {
+            width: 4px;
+            height: 15px;
+            background: inherit;
+            background-color: #0099ff;
+            margin-right: 8px;
+        }
+
+        .alarmInfo-title {
+            font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+            font-weight: 700;
+            font-style: normal;
+            font-size: 18px;
+            color: #0099ff;
+        }
+
+        .video-box {
+            width: 100%;
+            // margin: auto;
+            height: calc(100% - 45px);
+            background-color: rgba(40, 40, 40, 1);
+            margin-top: 10px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .alarmInfo-visitation {
+            width: 100%;
+            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 {
+            width: 100%;
+            height: calc(100% - 45px);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-family: 'Arial Normal', 'Arial';
+            font-weight: 400;
+            font-style: normal;
+            font-size: 14px;
+            color: #FFFFFF;
+        }
+    }
+}
+
+// 弹窗
+.el-overlay {
+    position: fixed;
+    z-index: 2023;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 2000;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    overflow: auto;
+
+    .notification {
+        width: 100vw;
+        height: 100vh;
+        position: absolute;
+        top: 0;
+        right: 0;
+        left: 0;
+        bottom: 0;
+
+        background-size: 100% 100%;
+
+        .notification-title {
+            text-align: center;
+            font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+            font-weight: 700;
+            font-style: normal;
+            font-size: 18px;
+            color: #FFFFFF;
+            height: 40px;
+            line-height: 38px;
+        }
+
+        .notification-body {
+            position: absolute;
+            bottom: 15px;
+            left: 0;
+            right: 0;
+        }
+    }
+
+    .examination {
+        width: 670px;
+        height: 650px;
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        left: 0px;
+        bottom: 0px;
+        margin: auto;
+        background: url(@/assets/monitorsystem/ejectbg/xsri_xz.png);
+        background-size: 100% 100%;
+
+        .examination-title {
+            text-align: center;
+            font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+            font-weight: 700;
+            font-style: normal;
+            font-size: 18px;
+            color: #FFFFFF;
+            height: 40px;
+            line-height: 38px;
+        }
+
+        .examination-body {
+            position: absolute;
+            bottom: 15px;
+            left: 0;
+            right: 0;
+        }
+    }
+
+    .examinationAll {
+        width: 670px;
+        height: 420px;
+        position: absolute;
+        top: 0px;
+        right: 0;
+        left: 0;
+        bottom: 0;
+        margin: auto;
+        background: url(@/assets/monitorsystem/ejectbg/u1243.png);
+        background-size: 100% 100%;
+
+        .examination-title {
+            text-align: center;
+            font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+            font-weight: 700;
+            font-style: normal;
+            font-size: 18px;
+            color: #FFFFFF;
+            height: 40px;
+            line-height: 38px;
+        }
+
+        .examination-body {
+            position: absolute;
+            bottom: 15px;
+            left: 0;
+            right: 0;
+        }
+    }
+
+
+    .details-line {
+        width: 4px;
+        height: 10px;
+        background: inherit;
+        background-color: #0099ff;
+        margin-right: 8px;
+    }
+
+    .details-title {
+        font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+        font-weight: 700;
+        font-style: normal;
+        font-size: 14px;
+        color: #0099ff;
+    }
+
+    .details-conent {
+        font-family: 'Arial Normal', 'Arial';
+        font-weight: 400;
+        font-style: normal;
+        font-size: 14px;
+        color: #FFFFFF;
+        padding: 7px 0;
+        display: flex;
+    }
+
+    .details-name {
+        min-width: 95px;
+        text-align: right;
+    }
+
+    :deep(.el-radio__inner) {
+        border-color: rgb(0, 249, 162) !important;
+        background: rgb(15, 51, 42) !important;
+    }
+
+    :deep(.is-checked .el-radio__inner) {
+        border-color: rgb(0, 249, 162) !important;
+        background: rgb(0, 249, 162) !important;
+    }
+
+    :deep(.el-radio__label) {
+        color: rgba(255, 255, 255, 0.5);
+    }
+
+    :deep(.is-checked .el-radio__label) {
+        color: rgba(255, 255, 255, 1) !important;
+    }
+
+    :deep(.is-checked .el-radio__inner::after) {
+        width: 6px;
+        height: 6px;
+        border-radius: var(--el-radio-input-border-radius);
+        background-color: rgb(15, 51, 42)
+    }
+
+    :deep(.el-textarea__inner) {
+        background: rgba(1, 1, 1, 0);
+        box-shadow: 0 0 0 1px rgba(0, 249, 162, 0.2);
+        color: #ffffff;
+    }
+
+    :deep(.el-input__wrapper) {
+        background: rgba(1, 1, 1, 0) !important;
+        box-shadow: 0 0 0 1px rgba(0, 249, 162, 0.2) !important;
+    }
+
+    .details-button {
+        width: 112px;
+        height: 36px;
+        line-height: 36px;
+        font-family: 'Arial Normal', 'Arial';
+        font-weight: 400;
+        font-style: normal;
+        font-size: 14px;
+        text-align: center;
+        background: url(@/assets/monitorsystem/xsri_an.png);
+        background-size: 100% 100%;
+        cursor: pointer;
+        margin: 0 15px;
+    }
+
+    .details-button:hover {
+        background: url(@/assets/monitorsystem/xsri_an1.png);
+        background-size: 100% 100%;
+    }
+}
+
+.examination1 {
+    width: 1200px;
+    height: 880px;
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    margin: auto;
+    background: url(@/assets/monitorsystem/ejectbg/glbj.png);
+    background-size: 100% 100%;
+    z-index: 400000;
+
+    .examination1-title {
+        text-align: center;
+        font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+        font-weight: 700;
+        font-style: normal;
+        font-size: 18px;
+        color: #FFFFFF;
+        height: 40px;
+        line-height: 38px;
+    }
+
+    .examination1-body {
+        position: absolute;
+        bottom: 15px;
+        left: 0;
+        right: 0;
+    }
+}
+</style>
diff --git a/riis-web/src/views/task/makeTask/index.vue b/riis-web/src/views/task/makeTask/index.vue
index d2ea004..4ef9cc2 100644
--- 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;
@@ -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;
 }
diff --git a/riis-web/src/views/task/patrolDetails/index.vue b/riis-web/src/views/task/patrolDetails/index.vue
index d12dd78..6558e86 100644
--- 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>
-
-
diff --git a/riis-web/src/views/task/patrolmonitor/index.vue b/riis-web/src/views/task/patrolmonitor/index.vue
index d713220..b16f8dc 100644
--- 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>
diff --git a/riis-web/src/views/threevisitation/3Dbrowsing/index.vue b/riis-web/src/views/threevisitation/3Dbrowsing/index.vue
index 3aca550..6d8f048 100644
--- a/riis-web/src/views/threevisitation/3Dbrowsing/index.vue
+++ b/riis-web/src/views/threevisitation/3Dbrowsing/index.vue
@@ -3040,8 +3040,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%;