From 0b5ab067fdfc224e44eb02052802e06eedecbb44 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Wed, 21 Feb 2024 10:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BI/components/dialog/alarm_dialog.vue     | 177 ++++++++++--------
 src/views/BI/components/personnel.vue         |  18 +-
 2 files changed, 106 insertions(+), 89 deletions(-)

diff --git a/src/views/BI/components/dialog/alarm_dialog.vue b/src/views/BI/components/dialog/alarm_dialog.vue
index ba6088a..75943e2 100644
--- a/src/views/BI/components/dialog/alarm_dialog.vue
+++ b/src/views/BI/components/dialog/alarm_dialog.vue
@@ -1,80 +1,82 @@
 <template>
-  <el-dialog v-model="visible" title="告警信息" width="70%">
-    <el-card>
-      <el-form
-        :model="searchForm"
-        label-width="100px"
-        @submit.prevent="fnResetPagination"
-      >
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="报警类型" prop="eleType" label-width="80px">
-              <el-select v-model="searchForm.eleType">
-                <el-option
-                  v-for="item in eleType"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="处理状态" prop="status" label-width="80px">
-              <el-select v-model="searchForm.status">
-                <el-option
-                  v-for="item in statusList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label-width="30px">
-              <el-button type="primary" native-type="submit">搜索</el-button>
-              <el-button native-type="reset" @click="fnResetPagination">
-                重置
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
-    <layout-card>
-      <layout-table
-        ref="tableRef"
-        v-model:pagination="pagination"
-        :data="list"
-        @get-data="fnGetData"
-      >
-        <el-table-column reserve-selection type="selection" width="55" />
-        <el-table-column label="序号" width="70">
-          <template #default="{ $index }">
-            {{ serialNumber(pagination, $index) }}
-          </template>
-        </el-table-column>
-        <el-table-column property="status" label="状态">
-          <template #default="{ row }">
-            {{ row.status === 0 ? "未处理" : "已处理" }}
-          </template>
-        </el-table-column>
-        <el-table-column property="eleType" label="告警类型">
-          <template #default="{ row }">
-            {{ typeList[row.eleType] }}
-          </template>
-        </el-table-column>
-        <el-table-column property="eleName" label="告警名称" />
-        <el-table-column property="name" label="触发人员" />
-        <el-table-column property="layerGroup" label="触发地点" />
-        <el-table-column property="alarmTime" label="触发时间" />
-        <el-table-column property="disposeTime" label="处理时间" />
-        <el-table-column property="disposeStr" label="处理方式" />
-        <el-table-column property="disposeBy" label="处理人" />
-        <el-table-column property="regName" label="备注" />
-      </layout-table>
-    </layout-card>
+  <el-dialog v-model="visible" title="报警信息" width="70%">
+    <table class="print_table">
+      <el-card>
+        <el-form
+          :model="searchForm"
+          label-width="100px"
+          @submit.prevent="fnResetPagination"
+        >
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="报警类型" prop="eleType" label-width="80px">
+                <el-select v-model="searchForm.eleType">
+                  <el-option
+                    v-for="item in eleType"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="处理状态" prop="status" label-width="80px">
+                <el-select v-model="searchForm.status">
+                  <el-option
+                    v-for="item in statusList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label-width="30px">
+                <el-button type="primary" native-type="submit">搜索</el-button>
+                <el-button native-type="reset" @click="fnResetPagination">
+                  重置
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+      <layout-card>
+        <layout-table
+          ref="tableRef"
+          v-model:pagination="pagination"
+          :data="list"
+          @get-data="fnGetData"
+        >
+          <el-table-column reserve-selection type="selection" width="55" />
+          <el-table-column label="序号" width="70">
+            <template #default="{ $index }">
+              {{ serialNumber(pagination, $index) }}
+            </template>
+          </el-table-column>
+          <el-table-column property="status" label="状态">
+            <template #default="{ row }">
+              {{ row.status === 0 ? "未处理" : "已处理" }}
+            </template>
+          </el-table-column>
+          <el-table-column property="eleType" label="告警类型">
+            <template #default="{ row }">
+              {{ typeList[row.eleType] }}
+            </template>
+          </el-table-column>
+          <el-table-column property="eleName" label="告警名称" />
+          <el-table-column property="name" label="触发人员" />
+          <el-table-column property="layerGroup" label="触发地点" />
+          <el-table-column property="alarmTime" label="触发时间" />
+          <el-table-column property="disposeTime" label="处理时间" />
+          <el-table-column property="disposeStr" label="处理方式" />
+          <el-table-column property="disposeBy" label="处理人" />
+          <el-table-column property="regName" label="备注" />
+        </layout-table>
+      </layout-card>
+    </table>
     <template #footer>
       <el-button @click="fnClose">关闭</el-button>
     </template>
@@ -86,7 +88,6 @@ import { useVModels } from "@vueuse/core";
 import useListData from "@/assets/js/useListData.js";
 import { getAlArmDataList } from "@/request/bi/mapApi.js";
 import { serialNumber } from "@/assets/js/utils.js";
-
 const typeList = {
   1: "滞留报警",
   2: "串岗报警",
@@ -97,20 +98,29 @@ const typeList = {
   7: "越界报警",
   8: "聚集告警",
 };
-const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
-  useListData(getAlArmDataList);
 const props = defineProps({
   visible: {
     type: Boolean,
     required: true,
     default: false,
   },
+  eleTypeNum: {
+    type: Number,
+    required: true,
+  },
   pd: {
     type: Object,
     required: false,
     default: () => ({}),
   },
 });
+const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
+  useListData(getAlArmDataList, {
+    defaultSearchForm: {
+      eleType: props.eleTypeNum,
+      status: 0,
+    },
+  });
 const statusList = [
   {
     label: "未处理",
@@ -136,4 +146,11 @@ const fnClose = () => {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.video {
+  width: 100%;
+  height: 500px;
+  border: 2px solid #11acd7;
+  border-radius: 4px;
+}
+</style>
diff --git a/src/views/BI/components/personnel.vue b/src/views/BI/components/personnel.vue
index fa8c5c2..e6461e5 100644
--- a/src/views/BI/components/personnel.vue
+++ b/src/views/BI/components/personnel.vue
@@ -50,7 +50,12 @@
         </div>
       </div>
     </div>
-    <alarm-dialog v-model:visible="data.drawer" :pd="data.form" />
+    <alarm-dialog
+      v-if="data.drawer"
+      v-model:visible="data.drawer"
+      v-model:pd="data.form"
+      :ele-type-num="+data.eleType"
+    />
   </div>
 </template>
 <script setup>
@@ -63,7 +68,6 @@ import {
   getAlarmTypeCount,
   getPersonnelPositioningCount,
 } from "@/request/bi/mapApi.js";
-
 const data = reactive({
   block1OptionsList: [
     {
@@ -72,6 +76,7 @@ const data = reactive({
       count: 0,
     },
   ],
+  eleType: 0,
   block2OptionsList: [
     {
       label: "滞留报警",
@@ -166,7 +171,7 @@ const getPersonnelData = async () => {
 const fnAlarmTypeClick = (e) => {
   data.drawer = true;
   data.form.title = e.label;
-  data.form.type = e.type;
+  data.eleType = e.type;
 };
 const getAlarmTypeData = async () => {
   const resData = await getAlarmTypeCount();
@@ -288,6 +293,7 @@ getPositionData();
         display: flex;
         justify-content: space-between;
         padding: 10px;
+        cursor: pointer;
       }
     }
   }
@@ -340,32 +346,26 @@ getPositionData();
           }
         }
       }
-
       .table {
         margin-top: 5px;
 
         .tr {
           display: flex;
-
           &:nth-child(odd) {
             background-color: rgba(42, 86, 158, 0.53);
           }
-
           .td {
             flex: 1;
             text-align: left;
             font-size: 14px;
             color: #fff;
             padding: 10px 10px;
-
             &:nth-child(1) {
               flex-basis: 30%;
             }
-
             &:nth-child(2) {
               flex-basis: 50%;
             }
-
             &:nth-child(3) {
               flex-basis: 20%;
             }