From 335e9e425c4abe93034fe2f0d0b63354c248869c Mon Sep 17 00:00:00 2001
From: web <candymxq888@outlook.com>
Date: 星期六, 12 七月 2025 13:49:16 +0800
Subject: [PATCH] fix:修改后台内容
---
.env.development | 2
src/views/facility/facilityList/index.vue | 36 +++--------
src/views/configuration/warning/index.vue | 58 ++++---------------
src/views/facility/monitorList/index.vue | 31 ----------
.env.production | 1
5 files changed, 26 insertions(+), 102 deletions(-)
diff --git a/.env.development b/.env.development
index 326886d..2bdcf98 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@
VITE_APP_ENV = 'development'
# 图片地址
- VITE_APP_IMG_BASEURL='http://192.168.0.67:8040/upload'
+ VITE_APP_IMG_BASEURL = 'http://192.168.0.67:8040/upload'
#后端本地
VITE_APP_PUBLIC_REQUEST_API = 'http://192.168.0.67:8040'
diff --git a/.env.production b/.env.production
index 8226dbb..dc04b1d 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,3 @@
-
# 页面标题
VITE_APP_TITLE = 丰都气体监测后台管理系统
diff --git a/src/views/configuration/warning/index.vue b/src/views/configuration/warning/index.vue
index 640b144..4e90c1e 100644
--- a/src/views/configuration/warning/index.vue
+++ b/src/views/configuration/warning/index.vue
@@ -53,28 +53,15 @@
<!-- 添加或修改对话框 -->
<el-dialog :title="title" v-model="open" append-to-body center>
<el-form class="form-box" ref="formRef" :model="form" :rules="rules" label-width='auto'>
- <el-form-item label="选择设备" prop="facilityId">
- <el-select v-model="form.facilityId" placeholder="请选择设备" @change="getFacityCodeList">
+ <el-form-item label="设备参数" prop="parametersId">
+ <el-select v-model="form.parametersId" placeholder="请选择设备参数">
<el-option
- v-for="(item,index) in facityList"
- :label="item.facilityName"
+ v-for="(item,index) in facityCodeList"
+ :label="item.name"
:value="item.id"
:key="index"
></el-option>
</el-select>
- </el-form-item>
- <el-form-item label="设备参数" prop="columnsCode">
- <el-select v-model="form.columnsCode" placeholder="请选择设备参数">
- <el-option
- v-for="(item,index) in facityCodeList"
- :label="item.columnsShow"
- :value="item.columnsCode"
- :key="index"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="方案名称" prop="schemeName">
- <el-input v-model="form.schemeName" placeholder="请输入方案名称" />
</el-form-item>
<el-form-item label="低报警值" prop="lowAlarm">
<el-input v-model="form.lowAlarm" placeholder="请输入低报警值" />
@@ -97,10 +84,9 @@
</template>
<script setup name="Menu">
-import facilityApi from '@/api/facility/index.js'
-import waterFacilityParameter from '@/api/facility/parameter.js'
import alarmSchemeApi from '@/api/configuration/warning/alarmScheme.js'
import setPostParams from "@/utils/searchParams.js";
+import commonParameters from '@/api/configuration/commonParameters/index'
import {onMounted} from "vue";
const { proxy } = getCurrentInstance();
@@ -112,9 +98,7 @@
})
const tableData = ref([]);
let tableHeader = ref({
- schemeName: '方案名称',
- facilityName: '设备名称',
- columnsName: '参数名称',
+ columnsShow: '参数名称',
lowAlarm: '低报警值',
tallAlarm: '高报警值',
remark: '备注',
@@ -131,17 +115,13 @@
name: undefined,
},
rules: {
- facilityId: [{ required: true, message: "请选择设备", trigger: "blur" }],
- columnsCode: [{ required: true, message: "请选择设备参数", trigger: "blur" }],
- schemeName: [{ required: true, message: "请输入方案名称", trigger: "blur" }],
lowAlarm: [{ required: true, message: "请输入低报警值", trigger: "blur" }],
tallAlarm: [{ required: true, message: "请输入高报警值", trigger: "blur" }],
remark: [{ required: false, message: "请输入备注信息", trigger: "blur" }],
},
});
const { queryParams, form, rules } = toRefs(data);
-const facityList = ref([]); //设备列表
-const facityCodeList = ref([]); //设备参数列表
+const facityCodeList = ref([]); //参数列表
/**
* 搜索相关
@@ -170,19 +150,10 @@
loading.value = false;
}
-// 获取设备
-const getFacityList = () => {
- let postParam = setPostParams()
- facilityApi().search(postParam).then(res => {
- facityList.value = res.data.list
- })
-}
-
-// 获取设备参数
-const getFacityCodeList = (id) => {
- const code = id ? id : form.value.facilityId
- waterFacilityParameter().getParam(code).then(res => {
- facityCodeList.value = res.data
+// 获取参数列表
+const getcommonParameters = () => {
+ commonParameters().search({ limit: 100, page:1}).then(res => {
+ facityCodeList.value = res.data.list
})
}
@@ -195,7 +166,6 @@
/** 修改按钮操作 */
async function handleUpdate(row) {
reset();
- getFacityCodeList(row.facilityId)
form.value = Object.assign({},row)
open.value = true;
title.value = "修改方案配置";
@@ -247,9 +217,7 @@
/** 表单重置 */
function reset() {
form.value = {
- facilityId:'',
- columnsCode:'',
- schemeName:'',
+ parametersId:'',
lowAlarm:'',
tallAlarm:'',
remark:'',
@@ -259,6 +227,6 @@
onMounted(() => {
getList();
- getFacityList()
+ getcommonParameters()
})
</script>
diff --git a/src/views/facility/facilityList/index.vue b/src/views/facility/facilityList/index.vue
index 8ebec4f..769a24e 100644
--- a/src/views/facility/facilityList/index.vue
+++ b/src/views/facility/facilityList/index.vue
@@ -41,7 +41,6 @@
facilityTypeName: '设备类型',
pointName: '设备监控点',
facilityUrl: '设备图片',
- installDate: '安装日期',
})
/** 获取权限列表 */
@@ -65,7 +64,6 @@
pointId: '设备监控点',
facilityUrl: '设备图片',
remark: '备注信息',
- createTimeView: '创建时间'
})
const rules = ref({
facilityCode: [{required: true, message: `${inpTip + formLabel.facilityCode}`, trigger: "blur"}],
@@ -80,17 +78,9 @@
});
//查询监控点
const pointList = ref();
-const cascaderOption = {
- label: 'pointName',
- value: 'id',
- children: 'childrenList',
- checkStrictly: true,
- expandTrigger: 'hover',
- emitPath: false
-}; //级联选择器配置
const getPoint = async () => {
- await pointApi().getParentPoint().then((res) => {
- pointList.value = res.data
+ await pointApi().search({limit:100, page:1}).then((res) => {
+ pointList.value = res.data.list
})
}
@@ -274,7 +264,6 @@
pointId: '',
facilityUrl: '',
remark: '',
- installDate: ''
};
proxy.resetForm("facilityTypeRef");
}
@@ -369,22 +358,19 @@
</el-select>
</el-form-item>
<el-form-item label="选择监控点" prop="pointId">
- <el-cascader v-model="form.pointId" :options="pointList" :show-all-levels="false"
- :props="cascaderOption"/>
- </el-form-item>
- <el-form-item label="安装日期" prop="installDate">
- <el-date-picker
- v-model="form.installDate"
- type="date"
- placeholder="请选择安装日期"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- :disabled="isDetail ? true : false"
- />
+ <el-select v-model="form.pointId" :placeholder="inpTip+formLabel.pointId">
+ <el-option
+ v-for="(item,index) in pointList"
+ :label="item.pointName"
+ :value="item.id"
+ :key="index"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item :label="formLabel.remark" prop="remark">
<el-input v-model="form.remark" :placeholder="inpTip+formLabel.remark"/>
</el-form-item>
+ <el-form-item></el-form-item>
<el-form-item label="资料上传" prop="facilityUrl" style="flex: 1">
<upload-icons @uploadData="uploadData" :imageList="form.facilityUrl" :limit="1"></upload-icons>
<span style="display: block;">(请上传1张设备图片)</span>
diff --git a/src/views/facility/monitorList/index.vue b/src/views/facility/monitorList/index.vue
index 5363288..519470d 100644
--- a/src/views/facility/monitorList/index.vue
+++ b/src/views/facility/monitorList/index.vue
@@ -1,11 +1,3 @@
-<!--
- * @Author: hqs elkers@163.com
- * @Date: 2024-08-06 14:47:41
- * @LastEditors: hqs elkers@163.com
- * @LastEditTime: 2024-08-14 16:50:56
- * @FilePath: \water-qinghe-web\src\views\facilit\index.vue
- * @Description: 监控点
--->
<script setup>
import pointApi from "@/api/facility/point";
import {ref, onMounted} from "vue";
@@ -44,7 +36,6 @@
pointName: '监控点名称',
pointCode: '监控点编号',
pointType: '监控类型',
- waterWidth: '水面宽度',
address: '详细地址',
createTimeView: '创建时间',
imageUrl: '图片',
@@ -72,7 +63,6 @@
pointCode: '监控点编号',
pointType: '监控点类型',
parentId: '父级监控点',
- waterWidth: '水面宽度',
address: '详细地址',
imageUrl: '图片',
remark: '备注'
@@ -87,7 +77,6 @@
pointCode: '',
pointType: '',
parentId: '',
- waterWidth: '',
address: '',
imageUrl: '',
remark: ''
@@ -95,14 +84,12 @@
const searchParams = ref({
keywords: '',
});
-// 监控点列表
-const monityList = ref([]);
+
// 监控点类型
const monityTypeList = [
{id: 1, name: '水温监测点'},
{id: 2, name: '生态流量监测点'}
];
-const cascaderOption = { label: 'pointName', value: 'id', children: 'childrenList', checkStrictly: true, expandTrigger: 'hover', emitPath: false }; //级联选择器配置
/** 新增按钮操作 */
async function handleAdd() {
@@ -133,14 +120,6 @@
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {
});
-}
-
-
-// 获取监控点列表
-const getMonitryList = () => {
- pointApi().getParentPoint().then(res => {
- monityList.value = res.data;
- })
}
/**
@@ -195,7 +174,6 @@
pointName: '',
pointCode: '',
pointType: '',
- waterWidth: '',
address: '',
imageUrl: '',
remark: ''
@@ -205,7 +183,6 @@
onMounted(() => {
getList();
- getMonitryList();
})
</script>
<template>
@@ -276,9 +253,6 @@
<!-- 添加/修改表单 -->
<el-dialog :title="title" v-model="open" append-to-body center>
<el-form class="form-box" ref="formRef" :model="form" :rules="rules" label-width='auto'>
- <el-form-item :label="formLabel.parentId" prop="parentId">
- <el-cascader v-model="form.parentId" :options="monityList" :show-all-levels="false" :props="cascaderOption" />
- </el-form-item>
<el-form-item :label="formLabel.pointType" prop="pointType">
<el-select v-model="form.pointType" :placeholder="'请输入'+formLabel.pointType">
<el-option
@@ -300,9 +274,6 @@
</el-form-item>
<el-form-item :label="formLabel.remark" prop="address">
<el-input v-model="form.remark" :placeholder="'请输入'+formLabel.remark"/>
- </el-form-item>
- <el-form-item :label="formLabel.waterWidth" prop="waterWidth">
- <el-input v-model="form.waterWidth" :placeholder="'请输入'+formLabel.waterWidth"/>
</el-form-item>
<el-form-item></el-form-item>
<el-form-item label="图片" prop="imageUrl" style="flex: 1">
--
Gitblit v1.9.3