fix 添加报警列表搜索

2026-05-13 11:20:24 +08:00
parent 6e62bcd085
commit ce94dd756b
6 changed files with 232 additions and 164 deletions
--- a/src/views/WarningList/list.vue
+++ b/src/views/WarningList/list.vue
@@ -4,17 +4,19 @@
      <div v-show="showSearch" class="mb-[10px]">
        <el-card shadow="hover">
          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="报警编号" prop="deviceId">
+              <el-input v-model="queryParams.deviceId" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
            </el-form-item>
-            <el-form-item label="设备名称" prop="value">
-              <el-input v-model="queryParams.value" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="设备选择" prop="userName">
+              <el-select v-model="queryParams.status" placeholder="请选择" clearable style="width: 160px">
+                <el-option label="绑定的设备" :value="0" />
+              </el-select>
            </el-form-item>
-            <el-form-item label="监控区域" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="报警时间" prop="alarmTime">
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
            </el-form-item>
-            <el-form-item label="设备状态" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="报警区域" prop="monitoringArea">
+              <el-input v-model="queryParams.monitoringArea" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item>
              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -29,64 +31,70 @@
      <template #header>
        <el-row :gutter="10" class="flex justify-end mb8">
          <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">添加设备</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              >批量唤醒</el-button
+            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="multiple" @click="handleBatchProcess"
+              >批量处理</el-button
            >
          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              >批量删除</el-button
-            >
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
-          </el-col> -->
-          <!-- <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar> -->
        </el-row>
      </template>

      <el-table v-loading="loading" border :data="demoList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="true" label="主键" align="center" prop="id" />
-        <el-table-column label="部门id" align="center" prop="deptId" />
-        <el-table-column label="用户id" align="center" prop="userId" />
-        <el-table-column label="排序号" align="center" prop="orderNum" />
-        <el-table-column label="key键" align="center" prop="testKey" />
-        <el-table-column label="值" align="center" prop="value" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="报警编号" align="center" prop="deviceId" width="90" />
+        <el-table-column label="报警时间" align="center" prop="alarmTime" min-width="170" />
+        <el-table-column label="所属设备" align="center" prop="userName" min-width="120" show-overflow-tooltip />
+        <el-table-column label="报警区域" align="center" prop="monitoringArea" min-width="120" show-overflow-tooltip />
+        <el-table-column label="处理状态" align="center" prop="status" width="100">
          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['demo:demo:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['demo:demo:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
+            <el-tag v-if="scope.row.status === 0" type="warning">未处理</el-tag>
+            <el-tag v-else-if="scope.row.status === 1" type="success">已处理</el-tag>
+            <span v-else>{{ scope.row.status ?? '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理人" align="center" prop="userId" min-width="100">
+          <template #default="scope">
+            {{ scope.row.userName ?? '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="处理时间" align="center" prop="processingTime" min-width="170">
+          <template #default="scope">
+            {{ scope.row.processingTime ?? '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <template #default="scope">
+            <el-button v-hasPermi="['demo:demo:edit']" type="primary" link @click="handleUpdate(scope.row)">处理</el-button>
          </template>
        </el-table-column>
      </el-table>

      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
    </el-card>
-    <!-- 添加或修改测试单对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="520px" append-to-body>
+      <el-form ref="demoFormRef" :model="form" label-width="100px">
+        <el-form-item label="设备编号">
+          <el-input v-model="form.deviceId" disabled />
        </el-form-item>
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        <el-form-item label="设备名称">
+          <el-input v-model="form.deviceName" disabled />
        </el-form-item>
-        <el-form-item label="排序号" prop="orderNum">
-          <el-input v-model="form.orderNum" placeholder="请输入排序号" />
+        <el-form-item label="监控区域">
+          <el-input v-model="form.monitoringArea" disabled />
        </el-form-item>
-        <el-form-item label="key键" prop="testKey">
-          <el-input v-model="form.testKey" placeholder="请输入key键" />
+        <el-form-item label="报警时间">
+          <el-input v-model="form.alarmTime" disabled />
        </el-form-item>
-        <el-form-item label="值" prop="value">
-          <el-input v-model="form.value" placeholder="请输入值" />
+        <el-form-item label="处理状态">
+          <el-tag v-if="form.status === 0" type="warning">未处理</el-tag>
+          <el-tag v-else-if="form.status === 1" type="success">已处理</el-tag>
+          <span v-else>{{ form.status ?? '-' }}</span>
+        </el-form-item>
+        <el-form-item label="处理人">
+          <el-input :model-value="form.userName ?? '-'" disabled />
+        </el-form-item>
+        <el-form-item label="处理时间">
+          <el-input :model-value="form.processingTime ?? '-'" disabled />
        </el-form-item>
      </el-form>
      <template #footer>
@@ -99,18 +107,17 @@
  </div>
 </template>

-<script setup name="Demo" lang="ts">
-import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
-import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
+<script setup name="WarningList" lang="ts">
+import { listDemo, updateDemo } from '@/api/WarningList/index';
+//import { DemoVO, DemoQuery, DemoForm } from '@/api/WarningList/types';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

-const demoList = ref<DemoVO[]>([]);
+const demoList = ref([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
-const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);

@@ -122,129 +129,108 @@ const dialog = reactive<DialogOption>({
  title: ''
 });

-const initFormData: DemoForm = {
+const initFormData: any = {
  id: undefined,
-  deptId: undefined,
+  deviceId: undefined,
+  deviceName: undefined,
+  userName: undefined,
+  monitoringArea: undefined,
+  alarmTime: undefined,
+  status: undefined,
  userId: undefined,
-  orderNum: undefined,
-  testKey: undefined,
-  value: undefined
+  processingTime: undefined
 };
-const data = reactive<PageData<DemoForm, DemoQuery>>({
+/* ?id=&deviceId=&pageSize=1&pageNum=1&beginTime=&endTime= */
+const data = reactive({
  form: { ...initFormData },
  queryParams: {
    pageNum: 1,
    pageSize: 10,
-    deptId: undefined,
-    userId: undefined,
-    orderNum: undefined,
-    testKey: undefined,
-    value: undefined
+    id: undefined,
+    deviceId: undefined,
+    beginTime: undefined,
+    endTime: undefined
  },
-  rules: {
-    id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
-    deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
-    userId: [{ required: true, message: '用户id不能为空', trigger: 'blur' }],
-    orderNum: [{ required: true, message: '排序号不能为空', trigger: 'blur' }],
-    testKey: [{ required: true, message: 'key键不能为空', trigger: 'blur' }],
-    value: [{ required: true, message: '值不能为空', trigger: 'blur' }]
-  }
+  rules: {}
 });

-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form } = toRefs(data);

-/** 查询测试单列表 */
 const getList = async () => {
  loading.value = true;
-  const res = await listDemo(queryParams.value);
-  demoList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  try {
+    const res = await listDemo(queryParams.value);
+    demoList.value = res.rows;
+    total.value = res.total;
+  } finally {
+    loading.value = false;
+  }
 };

-/** 取消按钮 */
 const cancel = () => {
  reset();
  dialog.visible = false;
 };

-/** 表单重置 */
 const reset = () => {
  form.value = { ...initFormData };
  demoFormRef.value?.resetFields();
 };

-/** 搜索按钮操作 */
 const handleQuery = () => {
  queryParams.value.pageNum = 1;
  getList();
 };

-/** 重置按钮操作 */
 const resetQuery = () => {
  queryFormRef.value?.resetFields();
  handleQuery();
 };

-/** 多选框选中数据 */
-const handleSelectionChange = (selection: DemoVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
+const handleSelectionChange = (selection: any) => {
+  ids.value = selection.map((item) => item.id as string | number);
  multiple.value = !selection.length;
 };

-/** 新增按钮操作 */
-const handleAdd = () => {
+/** 单条：打开确认弹窗 */
+const handleUpdate = (row: any) => {
  reset();
+  Object.assign(form.value, row);
  dialog.visible = true;
-  dialog.title = '添加测试单';
+  dialog.title = '处理报警';
 };

-/** 修改按钮操作 */
-const handleUpdate = async (row?: DemoVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getDemo(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改测试单';
+/** 批量：确认后直接提交 */
+const handleBatchProcess = async () => {
+  if (!ids.value.length) {
+    proxy?.$modal.msgWarning('请先选择要处理的报警');
+    return;
+  }
+  await proxy?.$modal.confirm('是否确认批量处理已选中的报警？');
+  loading.value = true;
+  try {
+    await updateDemo(ids.value);
+    proxy?.$modal.msgSuccess('处理成功');
+    await getList();
+  } finally {
+    loading.value = false;
+  }
 };

-/** 提交按钮 */
-const submitForm = () => {
-  demoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateDemo(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addDemo(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('修改成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: DemoVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delDemo(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'demo/demo/export',
-    {
-      ...queryParams.value
-    },
-    `demo_${new Date().getTime()}.xlsx`
-  );
+const submitForm = async () => {
+  if (form.value.id == null) {
+    proxy?.$modal.msgWarning('数据异常');
+    return;
+  }
+  buttonLoading.value = true;
+  try {
+    await updateDemo(form.value.id);
+    proxy?.$modal.msgSuccess('处理成功');
+    dialog.visible = false;
+    await getList();
+  } finally {
+    buttonLoading.value = false;
+  }
 };

 onMounted(() => {
--- a/src/views/equipmentList/list.vue
+++ b/src/views/equipmentList/list.vue
@@ -14,7 +14,10 @@
              <el-input v-model="queryParams.monitoringArea" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item label="设备状态" prop="status">
-              <el-input v-model="queryParams.status" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.status" placeholder="请选择设备状态" clearable style="width: 160px">
+                <el-option label="在线" :value="1" />
+                <el-option label="离线" :value="2" />
+              </el-select>
            </el-form-item>
            <el-form-item>
              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -32,7 +35,7 @@
            <el-button type="primary" plain icon="Plus" @click="handleAdd">添加设备</el-button>
          </el-col>
          <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="multiple" @click="handleActivate()"
              >批量唤醒</el-button
            >
          </el-col>
@@ -53,7 +56,13 @@
        <el-table-column v-if="true" label="设备编号" align="center" prop="code" />
        <el-table-column label="设备名称" align="center" prop="name" />
        <el-table-column label="监控区域" align="center" prop="monitoringArea" />
-        <el-table-column label="设备状态" align="center" prop="status" />
+        <el-table-column label="设备状态" align="center" prop="status" width="100">
+          <template #default="scope">
+            <span v-if="scope.row.status === 1 || scope.row.status === '1'">在线</span>
+            <span v-else-if="scope.row.status === 2 || scope.row.status === '2'">离线</span>
+            <span v-else>{{ scope.row.status ?? '-' }}</span>
+          </template>
+        </el-table-column>
        <el-table-column label="设备型号" align="center" prop="model" />
        <el-table-column label="固件版本" align="center" prop="id" />
        <el-table-column label="是否绘制区域" align="center" prop="isDrawArea" />
@@ -61,10 +70,9 @@
        <el-table-column width="400" label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
-            <el-button type="primary" @click="handleDelete(scope.row)">查看监控</el-button>
-            <el-button type="primary" @click="handleDelete(scope.row)">唤醒设备</el-button>
+            <el-button type="primary" @click="handleSee(scope.row)">查看监控</el-button>
+            <el-button type="primary" @click="handleActivate(scope.row)">唤醒设备</el-button>
            <el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
-           
          </template>
        </el-table-column>
      </el-table>
@@ -73,7 +81,7 @@
    </el-card>
    <!-- 添加或修改测试单对话框 -->
    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="demoFormRef" :model="form" :rules="rules" >
+      <el-form ref="demoFormRef" :model="form" :rules="rules">
        <el-form-item label="设备编号：" prop="code">
          <el-input v-model="form.code" placeholder="请输入设备编号" />
        </el-form-item>
@@ -107,7 +115,6 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
-const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);

@@ -123,7 +130,7 @@ const initFormData = {
  id: undefined,
  code: undefined,
  name: undefined,
-  monitoringArea: undefined,
+  monitoringArea: undefined
 };
 const data = reactive({
  form: { ...initFormData },
@@ -180,7 +187,6 @@ const resetQuery = () => {
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any) => {
  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
  multiple.value = !selection.length;
 };

@@ -218,6 +224,31 @@ const submitForm = () => {
  });
 };

+/** 唤醒设备（单行传 row，批量不传则使用表格勾选 ids，调用 actDevice） */
+const handleActivate = async (row?: any) => {
+  const targetIds = row?.id != null ? row.id : ids.value;
+  const isBatch = row == null;
+  if (isBatch && (!Array.isArray(targetIds) || !targetIds.length)) {
+    proxy?.$modal.msgWarning('请先勾选要唤醒的设备');
+    return;
+  }
+  const msg = isBatch ? `是否确认批量唤醒已选中的 ${targetIds.length} 台设备？` : `是否确认唤醒设备「${row!.name ?? row!.code ?? row!.id}」？`;
+  await proxy?.$modal.confirm(msg);
+  loading.value = true;
+  try {
+    await actDevice(targetIds);
+    proxy?.$modal.msgSuccess('唤醒成功');
+    await getList();
+  } finally {
+    loading.value = false;
+  }
+};
+
+/* 查看监控 */
+const handleSee = (row?: any) => {
+  alert('查看监控');
+};
+
 /** 删除按钮操作 */
 const handleDelete = async (row?: DemoVO) => {
  const _ids = row?.id || ids.value;
--- a/src/views/systemList/base/base.vue
+++ b/src/views/systemList/base/base.vue
@@ -4,23 +4,19 @@
      <p class="title">系统名称与LOGO配置</p>
      <el-form ref="ruleFormRef" :model="form">
        <el-form-item label="系统名称" prop="name">
-          <el-input  v-model="form.name"/>
+          <el-input v-model="form.name" />
        </el-form-item>
        <el-form-item label="系统图标" prop="logo">
-          <el-upload
-            v-model:file-list="fileList"
-            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-            list-type="picture-card"
-          >
-          <el-icon><Plus /></el-icon>
-        </el-upload>
-        <br>
-        <p>只支持.jpg、.png格式,最多上传1张，单张大小不超过500kb</p>
+          <el-upload v-model:file-list="fileList" action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" list-type="picture-card">
+            <el-icon><Plus /></el-icon>
+          </el-upload>
+          <br />
+          <p>只支持.jpg、.png格式,最多上传1张，单张大小不超过500kb</p>
        </el-form-item>
        <el-form-item>
          <el-button @click="cancel">取消</el-button>
          <el-button type="primary" @click="save">保存配置</el-button>
-      </el-form-item>
+        </el-form-item>
      </el-form>
    </div>
  </div>
@@ -28,7 +24,7 @@

 <script lang="ts" setup>
 import { ref, reactive } from 'vue';
-import type { UploadProps, UploadUserFile } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus';
 const form = reactive({
  name: '',
  remark: '',
@@ -37,9 +33,9 @@ const form = reactive({
 const fileList = ref<UploadUserFile[]>([
  {
    name: 'food.jpeg',
-    url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+    url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
  }
-])
+]);

 const cancel = () => {
  console.log('cancel');