From ac62137e3fec9b37b2289ba703674a266ebdd163 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 11 八月 2025 15:05:08 +0800
Subject: [PATCH] yys 联调用水管理
---
src/views/energyManagement/waterManagement/index.vue | 20 +++++-----
src/views/energyManagement/waterManagement/components/formDia.vue | 62 +++++++++++++++---------------
src/views/equipmentManagement/ledger/Form.vue | 2
src/api/energyManagement/waterManagement.js | 13 +++---
4 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/src/api/energyManagement/waterManagement.js b/src/api/energyManagement/waterManagement.js
index aef7465..caa82bf 100644
--- a/src/api/energyManagement/waterManagement.js
+++ b/src/api/energyManagement/waterManagement.js
@@ -4,7 +4,7 @@
// 鐢ㄦ按璁惧-鍒嗛〉鏌ヨ
export function waterEquipmentListPage(query) {
return request({
- url: '/waterEquipmentConsumption/listPage',
+ url: '/waterRecord/listPage',
method: 'get',
params: query,
})
@@ -13,7 +13,7 @@
// 鐢ㄦ按瓒嬪娍-鍒嗛〉鏌ヨ
export function listPageByWaterTrend(query) {
return request({
- url: '/waterEquipmentConsumption/listPageByTrend',
+ url: '/waterRecord/listPageByTrend',
method: 'get',
params: query,
})
@@ -22,7 +22,7 @@
// 鐢ㄦ按璁惧-鍒犻櫎
export function waterEquipmentDelete(query) {
return request({
- url: '/waterEquipmentConsumption/delete',
+ url: '/waterRecord/delete',
method: 'delete',
data: query,
})
@@ -31,7 +31,7 @@
// 鐢ㄦ按璁惧-鏂板
export function waterEquipmentAdd(query) {
return request({
- url: '/waterEquipmentConsumption/add',
+ url: '/waterRecord/add',
method: 'post',
data: query,
})
@@ -40,7 +40,7 @@
// 鐢ㄦ按璁惧-淇敼
export function waterEquipmentUpdate(query) {
return request({
- url: '/waterEquipmentConsumption/update',
+ url: '/waterRecord/update',
method: 'post',
data: query,
})
@@ -49,8 +49,9 @@
// 鐢ㄦ按璁惧涓嬫媺妗嗘煡璇�
export function waterDeviceList(query) {
return request({
- url: '/waterEquipmentConsumption/deviceList',
+ url: '/device/ledger/page',
method: 'get',
+ params: query,
})
}
diff --git a/src/views/energyManagement/waterManagement/components/formDia.vue b/src/views/energyManagement/waterManagement/components/formDia.vue
index a692b95..2e58ea0 100644
--- a/src/views/energyManagement/waterManagement/components/formDia.vue
+++ b/src/views/energyManagement/waterManagement/components/formDia.vue
@@ -15,9 +15,9 @@
>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="璁惧锛�" prop="code">
+ <el-form-item label="璁惧锛�" prop="deviceModel">
<el-select
- v-model="form.code"
+ v-model="form.deviceModel"
placeholder="璇烽�夋嫨"
clearable
@change="setName"
@@ -35,9 +35,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="姣忔棩闄愬埗姘撮噺锛�" prop="everyNum">
+ <el-form-item label="姣忔棩闄愬埗姘撮噺锛�" prop="waterDayLimit">
<el-input
- v-model="form.everyNum"
+ v-model="form.waterDayLimit"
placeholder="璇疯緭鍏�"
clearable
/>
@@ -46,18 +46,18 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="棰濆畾娴侀噺锛�" prop="flowRating">
+ <el-form-item label="棰濆畾娴侀噺锛�" prop="ratedRate">
<el-input
- v-model="form.flowRating"
+ v-model="form.ratedRate"
placeholder="璇疯緭鍏�"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹為檯娴侀噺锛�" prop="flowActual">
+ <el-form-item label="瀹為檯娴侀噺锛�" prop="actualTraffic">
<el-input
- v-model="form.flowActual"
+ v-model="form.actualTraffic"
placeholder="璇疯緭鍏�"
clearable
/>
@@ -66,10 +66,10 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="杩愯鏃堕棿锛�" prop="runDate">
+ <el-form-item label="杩愯鏃堕棿锛�" prop="runTime">
<el-date-picker
style="width: 100%"
- v-model="form.runDate"
+ v-model="form.runTime"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
type="date"
@@ -79,9 +79,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="褰撴棩鐢ㄦ按閲忥細" prop="dayNum">
+ <el-form-item label="褰撴棩鐢ㄦ按閲忥細" prop="waterDay">
<el-input
- v-model="form.dayNum"
+ v-model="form.waterDay"
placeholder="璇疯緭鍏�"
clearable
/>
@@ -99,9 +99,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢ㄦ按绫诲瀷锛�" prop="waterType">
+ <el-form-item label="鐢ㄦ按绫诲瀷锛�" prop="type">
<el-select
- v-model="form.waterType"
+ v-model="form.type"
placeholder="璇烽�夋嫨"
clearable
>
@@ -136,25 +136,25 @@
const data = reactive({
form: {
- name: "",
- code: "",
- everyNum: "",
- flowRating: "",
- flowActual: "",
- runDate: "",
- dayNum: "",
+ deviceName: "",
+ deviceModel: "",
+ waterDayLimit: "",
+ ratedRate: "",
+ actualTraffic: "",
+ runTime: "",
+ waterDay: "",
waterPrice: "",
- waterType: "",
+ type: "",
},
rules: {
- code: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- runDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- everyNum: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- flowRating: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- flowActual: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- dayNum: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ deviceModel: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ runTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ waterDayLimit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ ratedRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ actualTraffic: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ waterDay: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
waterPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- waterType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ type: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
})
const { form, rules } = toRefs(data);
@@ -166,8 +166,8 @@
dialogFormVisible.value = true;
form.value = {}
proxy.resetForm("formRef");
- waterDeviceList().then((res) => {
- codeList.value = res.data;
+ waterDeviceList({size: -1}).then((res) => {
+ codeList.value = res.data.records;
});
if (type === "edit") {
form.value = {...row}
diff --git a/src/views/energyManagement/waterManagement/index.vue b/src/views/energyManagement/waterManagement/index.vue
index 848a945..181ae88 100644
--- a/src/views/energyManagement/waterManagement/index.vue
+++ b/src/views/energyManagement/waterManagement/index.vue
@@ -4,7 +4,7 @@
<div>
<span class="search_title">璁惧鍚嶇О锛�</span>
<el-input
- v-model="searchForm.name"
+ v-model="searchForm.deviceName"
style="width: 240px"
placeholder="璇疯緭鍏�"
@change="handleQuery"
@@ -101,35 +101,35 @@
const tableColumn = ref([
{
label: "璁惧鍚嶇О",
- prop: "name",
+ prop: "deviceName",
width: 200,
},
{
label: "瑙勬牸鍨嬪彿",
- prop: "code",
+ prop: "deviceModel",
width: 200,
},
{
label: "棰濆畾娴侀噺",
- prop: "flowRating",
+ prop: "ratedRate",
},
{
label: "瀹為檯娴侀噺",
- prop: "flowActual",
+ prop: "actualTraffic",
},
{
label: "杩愯鏃堕棿",
- prop: "runDate",
+ prop: "runTime",
width:150
},
{
label: "褰撴棩鐢ㄦ按閲�",
- prop: "dayNum",
+ prop: "waterDay",
width: 150,
},
{
label: "姣忔棩闄愬埗姘撮噺",
- prop: "everyNum",
+ prop: "waterDayLimit",
width:220
},
{
@@ -175,7 +175,7 @@
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: { Authorization: "Bearer " + getToken() },
// 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "/waterEquipmentConsumption/importData",
+ url: import.meta.env.VITE_APP_BASE_API + "/waterRecord/importData",
// 鏂囦欢涓婁紶鍓嶇殑鍥炶皟
beforeUpload: (file) => {
console.log('鏂囦欢鍗冲皢涓婁紶', file);
@@ -257,7 +257,7 @@
}
function importTemplate() {
proxy.download(
- "/waterEquipmentConsumption/export",
+ "/waterRecord/export",
{},
'鐢ㄦ按璁惧瀵煎叆妯＄増.xlsx'
);
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index f7029ee..c1daab7 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -8,7 +8,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿" prop="deviceModel">
- <el-input v-model="form.deviceModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ <el-input v-model="form.deviceModel" :disabled="form.deviceModel != null ? true : false" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</el-form-item>
</el-col>
<el-col :span="12">
--
Gitblit v1.9.3