From 0ba6a10aed87c4f05d076ee66c3189627bb5b858 Mon Sep 17 00:00:00 2001
From: web <candymxq888@outlook.com>
Date: 星期二, 25 三月 2025 09:02:23 +0800
Subject: [PATCH] fix:修改返回菜单按钮

---
 src/views/facility/monitorList/index.vue |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/views/facility/monitorList/index.vue b/src/views/facility/monitorList/index.vue
index fcaccc3..e757b17 100644
--- a/src/views/facility/monitorList/index.vue
+++ b/src/views/facility/monitorList/index.vue
@@ -8,7 +8,8 @@
 -->
 <script setup>
 import pointApi from "@/api/facility/point";
-import {ref} from "vue";
+import {getMonitorTypeList} from '@/api/facility/monitorType.js'
+import {ref, onMounted} from "vue";
 import setPostParams from "@/utils/searchParams.js";
 
 const route = useRoute();
@@ -42,6 +43,7 @@
 let tableHeader = ref({
     pointName: '监控点名称',
     pointCode: '监控点编号',
+    pointTypeName: '监控类型',
     address: '详细地址',
     createTimeView: '创建时间',
     imageUrl: '图片',
@@ -52,7 +54,7 @@
 async function getList(val) {
     loading.value = true;
     let postParam = setPostParams(val)
-    await pointApi().search(postParam).then((res) => {
+    await pointApi().search({ ...postParam, ...searchParams.value}).then((res) => {
         tableData.value = res.data.list
         pageParam.value.total = res.data.total
         pageParam.value.limit = res.data.limit
@@ -67,6 +69,7 @@
 const formLabel = ({
     pointName: '监控点名称',
     pointCode: '监控点编号',
+    pointTypeId: '监控类型',
     address: '详细地址',
     imageUrl: '图片',
     remark: '备注'
@@ -74,10 +77,12 @@
 const rules = ref({
     pointName: [{required: true, message: `请输入${ formLabel.pointName}`, trigger: "blur"}],
     pointCode: [{required: true, message: `请输入${ formLabel.address}`, trigger: "blur"}],
+    pointTypeId: [{required: true, message: `请输入${ formLabel.pointTypeId}`, trigger: "blur"}],
 });
 const form = ref({
     pointName: '',
     pointCode: '',
+    pointTypeId: '',
     address: '',
     imageUrl: '',
     remark: ''
@@ -85,6 +90,8 @@
 const searchParams = ref({
     keywords: '',
 });
+// 监控点类型
+const monityTypeList = ref([]);
 /** 新增按钮操作 */
 async function handleAdd() {
     reset();
@@ -108,7 +115,7 @@
 /** 删除按钮操作 */
 function handleDelete(row) {
     proxy.$modal.confirm('是否确认删除名称为"' + row.contact + '"的数据项?').then(function () {
-        return pointApi().remove(row.id);
+        // return pointApi().remove(row.id);
     }).then(() => {
         getList();
         proxy.$modal.msgSuccess("删除成功");
@@ -116,6 +123,13 @@
     });
 }
 
+// 获取监控点类型
+const getMonitryType = () => {
+    let postParam = { limit: 100, page: 1 }
+    getMonitorTypeList(postParam).then(res => {
+        monityTypeList.value = res.data.list;
+    })
+}
 
 /**
  *  新增/修改弹窗Form表单相关
@@ -167,6 +181,7 @@
     form.value = {
         pointName: '',
         pointCode: '',
+        pointTypeId: '',
         address: '',
         imageUrl: '',
         remark: ''
@@ -174,14 +189,17 @@
     proxy.resetForm("formRef");
 }
 
-getList();
+onMounted(() => {
+    getList();
+    getMonitryType()
+})
 </script>
 <template>
     <div class="app-container">
         <el-form :model="searchParams" ref="queryRef" :inline="true">
             <el-form-item label="" prop="">
                 <el-input
-                    v-model="searchParams.pointName"
+                    v-model="searchParams.keywords"
                     placeholder="请输入搜索信息"
                     clearable
                     style="width: 200px"
@@ -244,9 +262,18 @@
                 <el-form-item :label="formLabel.pointName" prop="pointName">
                     <el-input v-model="form.pointName" :placeholder="'请输入'+formLabel.pointName"/>
                 </el-form-item>
-
                 <el-form-item :label="formLabel.pointCode" prop="pointCode">
                     <el-input v-model="form.pointCode" :placeholder="'请输入'+formLabel.pointCode"/>
+                </el-form-item>
+                <el-form-item :label="formLabel.pointTypeId" prop="pointTypeId">
+                    <el-select v-model="form.pointTypeId" :placeholder="'请输入'+formLabel.pointTypeId">
+                        <el-option
+                            v-for="(item,index) in monityTypeList"
+                            :label="item.name"
+                            :value="item.id"
+                            :key="index"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item :label="formLabel.address" prop="address">
                     <el-input v-model="form.address" :placeholder="'请输入'+formLabel.address"/>
@@ -254,6 +281,7 @@
                 <el-form-item :label="formLabel.remark" prop="address">
                     <el-input v-model="form.remark" :placeholder="'请输入'+formLabel.remark"/>
                 </el-form-item>
+                <el-form-item></el-form-item>
                 <el-form-item label="图片" prop="imageUrl" style="flex: 1">
                     <upload-icons @uploadData="uploadData" :imageList="form.imageUrl" :limit="1"></upload-icons>
                     <span style="display: block;">(请上传1张设备图片)</span>

--
Gitblit v1.9.3