Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.WEB/src/views/warn/zjrq/index.vue

@@ -86,9 +86,6 @@
               <div class="linebox">预警时间：{{ detailData.tick }}</div>
             </el-col>
 
-            <el-col :span="12">
-              <div class="linebox">备注信息：{{ detailData.extend ? detailData.extend : "暂无数据" }}</div>
-            </el-col>
             <el-col :span="12">
               <div class="linebox">
                 复核视频：
@@ -102,6 +99,12 @@
                 <!-- {{ detailData.videoUrl }} -->
               </div>
             </el-col>
+            <el-col :span="12">
+              <div class="linebox">处理时间：{{ detailData.handTime ? detailData.handTime : "暂无数据" }}</div>
+            </el-col>
+            <el-col :span="24">
+              <div class="linebox">备注信息：{{ detailData.extend ? detailData.extend : "暂无数据" }}</div>
+            </el-col>
             <el-col :span="24">
               <div class="linebox">
                 处理意见：
@@ -154,7 +157,7 @@
 
 <script setup lang="tsx" name="sysSpa">
  import VideoPlay from "@/components/VideoPlay/videoplay.vue";
-import { warnZJRQApi } from "@/api";
+import { warnZJRQApi, monitorLIVEApi } from "@/api";
 import { ZJRQ } from "@/api/interface";
 import { useHandleData } from "@/hooks/useHandleData";
 import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface";
@@ -174,6 +177,7 @@ const previewhandleClose = () => {
 const visible = ref(false); //是否显示表单
 onMounted(() => {
   getWarnTypeList();
+  getCreamaList()
 });
 const formRefH = ref<InstanceType<typeof handleForm> | null>(null);
 function toHandle(opt: FormOptEnum, record: {} | ZJRQ.WarnInfo= {}) {
@@ -199,6 +203,17 @@ function getWarnTypeList() {
   })
   
 }
+const creamaData = ref<any>([]);
+const getCreamaList = () => {
+  monitorLIVEApi.list({ pageNum: 1, pageSize: 1000 }).then(res => {
+    creamaData.value = res.data.list.map((item:any) => {
+          return {
+            label: item.sensorName,
+            value: item.sensorId
+          };
+        });
+  });
+};
 // 自定义渲染表头（使用tsx语法）
 const headerRender = (scope: any) => {
   return (
@@ -232,8 +247,13 @@ const columns: ColumnProps<ZJRQ.WarnInfo>[] = [
     // }
   },
   {
-    prop: "cameraName",
+    prop: "cameraId",
     label: "预警摄像头",
+    enum: creamaData,
+    search: { 
+      el: "tree-select",
+      span: 1 
+    } 
     // render: () => {
     //   return "楼道";
     // }
@@ -305,7 +325,6 @@ const columns: ColumnProps<ZJRQ.WarnInfo>[] = [
   { prop: "operation", label: "操作", width: 250, fixed: "right" }
 ];
 
-
 const getTableList = (params: any) => {
   let newParams = JSON.parse(JSON.stringify(params));
   newParams.tick && (newParams.StartTick = newParams.tick[0]);