From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/modelconfiguration/energytype/energyType.vue | 338 +++++++++++++++++++++-----------------------------------
1 files changed, 128 insertions(+), 210 deletions(-)
diff --git a/zhitan-vue/src/views/modelconfiguration/energytype/energyType.vue b/zhitan-vue/src/views/modelconfiguration/energytype/energyType.vue
index 8319cfa..a13c75f 100644
--- a/zhitan-vue/src/views/modelconfiguration/energytype/energyType.vue
+++ b/zhitan-vue/src/views/modelconfiguration/energytype/energyType.vue
@@ -1,25 +1,12 @@
<template>
<div class="page">
<div class="form-card">
- <el-form
- :model="queryParams"
- ref="queryRef"
- :inline="true"
- label-width="80px"
- >
+ <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="80px">
<el-form-item label="鑳芥簮绫诲瀷">
- <el-input
- v-model="queryParams.enername"
- placeholder="鑳芥簮绫诲瀷"
- maxlength="30"
- />
+ <el-input v-model="queryParams.enername" placeholder="鑳芥簮绫诲瀷" maxlength="30" />
</el-form-item>
<el-form-item label="鑳芥簮鍝佺">
- <el-select
- v-model="queryParams.enerclassid"
- placeholder="鑳芥簮鍝佺"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.enerclassid" placeholder="鑳芥簮鍝佺" style="width: 100%">
<el-option
v-for="dict in energyVarietiesList"
:key="dict.enerclassid"
@@ -29,121 +16,77 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="Plus" @click="handleAdd"> 鏂板 </el-button>
</el-form-item>
</el-form>
</div>
- <div class="table-box">
- <div class="mt20 mb20">
- <el-button type="primary" icon="Plus" @click="handleAdd"
- >鏂板</el-button
- >
+ <div class="table-bg-style">
+ <div class="table-box">
+ <el-table v-loading="loading" :data="energyTypeList">
+ <el-table-column
+ label="鑳芥簮绫诲瀷"
+ align="center"
+ key="enername"
+ prop="enername"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column label="璁￠噺鍗曚綅" align="center" key="muid" prop="muid" :show-overflow-tooltip="true" />
+ <el-table-column
+ label="鑳芥簮鍝佺"
+ align="center"
+ key="enerclassname"
+ prop="enerclassname"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column label="鑳芥簮缂栧彿" align="center" key="enersno" prop="enersno" :show-overflow-tooltip="true" />
+ <el-table-column
+ label="鏄惁瀛樺偍"
+ align="center"
+ key="isstorage"
+ prop="isstorage"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column label="鍗曚环" align="center" key="price" prop="price" :show-overflow-tooltip="true" />
+ <el-table-column
+ label="鎶樻爣绯绘暟"
+ align="center"
+ key="coefficient"
+ prop="coefficient"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鎺掓斁鍥犲瓙"
+ align="center"
+ key="emissionFactors"
+ prop="emissionFactors"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column label="澶囨敞" align="center" key="note" prop="note" :show-overflow-tooltip="true" />
+ <el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="缂栬緫" placement="top">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"> 缂栬緫 </el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"> 鍒犻櫎 </el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="queryParams.total > 0"
+ :total="queryParams.total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
</div>
- <el-table v-loading="loading" :data="energyTypeList">
- <el-table-column
- label="鑳芥簮绫诲瀷"
- align="center"
- key="enername"
- prop="enername"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="璁￠噺鍗曚綅"
- align="center"
- key="muid"
- prop="muid"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鑳芥簮鍝佺"
- align="center"
- key="enerclassname"
- prop="enerclassname"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鑳芥簮缂栧彿"
- align="center"
- key="enersno"
- prop="enersno"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鏄惁瀛樺偍"
- align="center"
- key="isstorage"
- prop="isstorage"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鍗曚环"
- align="center"
- key="price"
- prop="price"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鎶樻爣绯绘暟"
- align="center"
- key="coefficient"
- prop="coefficient"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鎺掓斁鍥犲瓙"
- align="center"
- key="emissionFactors"
- prop="emissionFactors"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="澶囨敞"
- align="center"
- key="note"
- prop="note"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="200"
- class-name="small-padding fixed-width"
- >
- <template #default="scope">
- <el-tooltip content="缂栬緫" placement="top">
- <el-button
- link
- type="primary"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- >
- 缂栬緫
- </el-button>
- </el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top">
- <el-button
- link
- type="primary"
- icon="Delete"
- @click="handleDelete(scope.row)"
- >
- 鍒犻櫎
- </el-button>
- </el-tooltip>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="queryParams.total > 0"
- :total="queryParams.total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
</div>
+
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form :model="form" :rules="rules" ref="formRef" label-width="90px">
<el-row>
@@ -154,12 +97,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="璁￠噺鍗曚綅" prop="muid">
- <el-select
- v-model="form.muid"
- placeholder="璇烽�夐」璁￠噺鍗曚綅"
- clearable
- style="width: 100%"
- >
+ <el-select v-model="form.muid" placeholder="璇烽�夐」璁￠噺鍗曚綅" clearable style="width: 100%">
<el-option
v-for="dict in sys_unit"
:key="dict.value"
@@ -177,11 +115,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鑳芥簮鍝佺" prop="enerclassid">
- <el-select
- v-model="form.enerclassid"
- placeholder="璇烽�夐」鑳芥簮鍝佺"
- style="width: 100%"
- >
+ <el-select v-model="form.enerclassid" placeholder="璇烽�夐」鑳芥簮鍝佺" style="width: 100%">
<el-option
v-for="dict in energyVarietiesList"
:key="dict.enerclassid"
@@ -193,11 +127,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏄惁瀛樺偍" prop="isstorage">
- <el-select
- v-model="form.isstorage"
- placeholder="璇烽�夐」鏄惁瀛樺偍"
- style="width: 100%"
- >
+ <el-select v-model="form.isstorage" placeholder="璇烽�夐」鏄惁瀛樺偍" style="width: 100%">
<el-option
v-for="dict in sys_yes_no"
:key="dict.value"
@@ -248,11 +178,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="澶囨敞" prop="note">
- <el-input
- v-model="form.note"
- placeholder="璇疯緭鍏ュ娉�"
- type="textarea"
- />
+ <el-input v-model="form.note" placeholder="璇疯緭鍏ュ娉�" type="textarea" />
</el-form-item>
</el-col>
</el-row>
@@ -273,15 +199,15 @@
getEnergyType,
updateEnergyType,
delEnergyType,
-} from "@/api/modelConfiguration/energyType";
-import { listEnergyVarietiesList } from "@/api/modelConfiguration/energyVarieties";
-const { proxy } = getCurrentInstance();
-const { sys_unit, sys_yes_no } = proxy.useDict("sys_unit", "sys_yes_no");
-const energyVarietiesList = ref([]);
-const energyTypeList = ref([]);
-const open = ref(false);
-const loading = ref(false);
-const title = ref("");
+} from "@/api/modelConfiguration/energyType"
+import { listEnergyVarietiesList } from "@/api/modelConfiguration/energyVarieties"
+const { proxy } = getCurrentInstance()
+const { sys_unit, sys_yes_no } = proxy.useDict("sys_unit", "sys_yes_no")
+const energyVarietiesList = ref([])
+const energyTypeList = ref([])
+const open = ref(false)
+const loading = ref(false)
+const title = ref("")
const data = reactive({
form: {},
queryParams: {
@@ -292,76 +218,68 @@
enerclassname: null,
},
rules: {
- enername: [
- { required: true, message: "鑳芥簮绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ enername: [{ required: true, message: "鑳芥簮绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }],
enersno: [
{ required: true, message: "鑳芥簮缂栧彿涓嶈兘涓虹┖", trigger: "blur" },
{ pattern: /^[a-z0-9]*$/, message: "鑳芥簮缂栧彿蹇呴』涓烘暟瀛�/灏忓啓瀛楁瘝" },
],
- enerclassid: [
- { required: true, message: "鑳芥簮鍝佺涓嶈兘涓虹┖", trigger: "blur" },
- ],
- isstorage: [
- { required: true, message: "鏄惁瀛樺偍涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ enerclassid: [{ required: true, message: "鑳芥簮鍝佺涓嶈兘涓虹┖", trigger: "blur" }],
+ isstorage: [{ required: true, message: "鏄惁瀛樺偍涓嶈兘涓虹┖", trigger: "blur" }],
price: [{ required: true, message: "鍗曚环涓嶈兘涓虹┖", trigger: "blur" }],
- coefficient: [
- { required: true, message: "鎶樻爣绯绘暟涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ coefficient: [{ required: true, message: "鎶樻爣绯绘暟涓嶈兘涓虹┖", trigger: "blur" }],
},
-});
-const { queryParams, form, rules } = toRefs(data);
-getList();
-getEnergyVarietiesList();
+})
+const { queryParams, form, rules } = toRefs(data)
+getList()
+getEnergyVarietiesList()
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鍒楄〃
function getList() {
- loading.value = true;
+ loading.value = true
listEnergyType(proxy.addDateRange(queryParams.value)).then((res) => {
- loading.value = false;
- energyTypeList.value = res.rows;
- queryParams.value.total = res.total;
- });
+ loading.value = false
+ energyTypeList.value = res.rows
+ queryParams.value.total = res.total
+ })
}
function getEnergyVarietiesList() {
listEnergyVarietiesList().then((res) => {
- energyVarietiesList.value = res.data;
- });
+ energyVarietiesList.value = res.data
+ })
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鎼滅储
function handleQuery() {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1
+ getList()
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-閲嶇疆
function resetQuery() {
- proxy.resetForm("queryRef");
+ proxy.resetForm("queryRef")
queryParams.value = {
pageNum: 1,
pageSize: 10,
total: 0,
enerclassname: null,
- };
- getList();
+ }
+ getList()
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鏂板
function handleAdd() {
- reset();
- open.value = true;
- title.value = "鏂板鑳芥簮绫诲瀷";
+ reset()
+ open.value = true
+ title.value = "鏂板鑳芥簮绫诲瀷"
}
function handleClick(label, value) {
- form.value[label] = value;
- console.log(form.value, label, value);
+ form.value[label] = value
+ console.log(form.value, label, value)
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-缂栬緫
function handleUpdate(row) {
- reset();
+ reset()
getEnergyType(row.enerid).then((response) => {
- form.value = response.data;
- open.value = true;
- title.value = "缂栬緫鑳芥簮绫诲瀷";
- });
+ form.value = response.data
+ open.value = true
+ title.value = "缂栬緫鑳芥簮绫诲瀷"
+ })
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鏂板/缂栬緫-淇濆瓨
function submitForm() {
@@ -369,24 +287,24 @@
if (valid) {
if (form.value.enerid != undefined) {
updateEnergyType(form.value).then((response) => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("淇敼鎴愬姛")
+ open.value = false
+ getList()
+ })
} else {
addEnergyType(form.value).then((response) => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("鏂板鎴愬姛")
+ open.value = false
+ getList()
+ })
}
}
- });
+ })
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鏂板/缂栬緫-鍙栨秷
function cancel() {
- open.value = false;
- reset();
+ open.value = false
+ reset()
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鏂板/缂栬緫-琛ㄥ崟閲嶇疆
function reset() {
@@ -401,21 +319,21 @@
muidString: null,
note: null,
price: null,
- };
- proxy.resetForm("formRef");
+ }
+ proxy.resetForm("formRef")
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮绫诲瀷绠＄悊-鍒犻櫎
function handleDelete(row) {
proxy.$modal
.confirm('鏄惁纭鍒犻櫎鑳芥簮绫诲瀷涓�"' + row.enername + '"鐨勬暟鎹」锛�')
.then(function () {
- return delEnergyType(row.enerid);
+ return delEnergyType(row.enerid)
})
.then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList()
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
})
- .catch(() => {});
+ .catch(() => {})
}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3