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/energyvarieties/energyVarieties.vue | 190 ++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 78 deletions(-)
diff --git a/zhitan-vue/src/views/modelconfiguration/energyvarieties/energyVarieties.vue b/zhitan-vue/src/views/modelconfiguration/energyvarieties/energyVarieties.vue
index d1ba49c..9d5e639 100644
--- a/zhitan-vue/src/views/modelconfiguration/energyvarieties/energyVarieties.vue
+++ b/zhitan-vue/src/views/modelconfiguration/energyvarieties/energyVarieties.vue
@@ -1,6 +1,5 @@
<template>
<div class="page">
-
<div class="form-card">
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="80px" @submit.prevent>
<el-form-item label="鑳芥簮鍝佺">
@@ -10,36 +9,73 @@
<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="energyVarietiesList">
+ <el-table-column
+ label="鑳芥簮鍝佺"
+ align="center"
+ key="enerclassname"
+ prop="enerclassname"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column label="澶囨敞" align="center" key="note" prop="note" :show-overflow-tooltip="true" />
+ <el-table-column
+ label="鍒涘缓浜�"
+ align="center"
+ key="createBy"
+ prop="createBy"
+ :show-overflow-tooltip="true"
+ width="100"
+ />
+ <el-table-column
+ label="鍒涘缓鏃堕棿"
+ align="center"
+ key="createTime"
+ prop="createTime"
+ :show-overflow-tooltip="true"
+ width="200"
+ />
+ <el-table-column
+ label="鏇存柊浜�"
+ align="center"
+ key="updateBy"
+ prop="updateBy"
+ :show-overflow-tooltip="true"
+ width="100"
+ />
+ <el-table-column
+ label="鏇存柊鏃堕棿"
+ align="center"
+ key="updateTime"
+ prop="updateTime"
+ :show-overflow-tooltip="true"
+ width="200"
+ />
+ <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="energyVarietiesList">
- <el-table-column label="鑳芥簮鍝佺" align="center" key="enerclassname" prop="enerclassname" :show-overflow-tooltip="true" />
- <el-table-column label="澶囨敞" align="center" key="note" prop="note" :show-overflow-tooltip="true" />
- <el-table-column label="鍒涘缓浜�" align="center" key="createBy" prop="createBy" :show-overflow-tooltip="true" width="100"/>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" key="createTime" prop="createTime" :show-overflow-tooltip="true" width="200"/>
- <el-table-column label="鏇存柊浜�" align="center" key="updateBy" prop="updateBy" :show-overflow-tooltip="true" width="100"/>
- <el-table-column label="鏇存柊鏃堕棿" align="center" key="updateTime" prop="updateTime" :show-overflow-tooltip="true" width="200"/>
- <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="100px">
@@ -72,12 +108,12 @@
getEnergyVarieties,
updateEnergyVarieties,
delEnergyVarieties,
-} from "@/api/modelConfiguration/energyVarieties";
-const { proxy } = getCurrentInstance();
-const energyVarietiesList = ref([]);
-const open = ref(false);
-const loading = ref(false);
-const title = ref("");
+} from "@/api/modelConfiguration/energyVarieties"
+const { proxy } = getCurrentInstance()
+const energyVarietiesList = ref([])
+const open = ref(false)
+const loading = ref(false)
+const title = ref("")
const data = reactive({
form: {},
queryParams: {
@@ -89,41 +125,39 @@
rules: {
enerclassname: [{ required: true, message: "鑳芥簮鍝佺涓嶈兘涓虹┖", trigger: "blur" }],
},
-});
-const { queryParams, form, rules } = toRefs(data);
-getList();
+})
+const { queryParams, form, rules } = toRefs(data)
+getList()
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮鍝佺璁剧疆-鍒楄〃
function getList() {
- loading.value = true;
- listEnergyVarieties(
- proxy.addDateRange(queryParams.value)
- ).then((res) => {
- loading.value = false;
- energyVarietiesList.value = res.rows;
- queryParams.value.total = res.total;
- });
+ loading.value = true
+ listEnergyVarieties(proxy.addDateRange(queryParams.value)).then((res) => {
+ loading.value = false
+ energyVarietiesList.value = res.rows
+ queryParams.value.total = res.total
+ })
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮鍝佺璁剧疆-鎼滅储
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 handleUpdate(row) {
@@ -133,58 +167,58 @@
// title.value = "缂栬緫鑳芥簮鍝佺绠＄悊";
// }
function handleUpdate(row) {
- reset();
- getEnergyVarieties(row.enerclassid).then(response => {
- form.value = response.data;
- open.value = true;
- title.value = "缂栬緫鑳芥簮鍝佺绠＄悊";
- });
-};
+ reset()
+ getEnergyVarieties(row.enerclassid).then((response) => {
+ form.value = response.data
+ open.value = true
+ title.value = "缂栬緫鑳芥簮鍝佺绠＄悊"
+ })
+}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮鍝佺璁剧疆-鏂板/缂栬緫-淇濆瓨
function submitForm() {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
if (form.value.enerclassid != undefined) {
updateEnergyVarieties(form.value).then((response) => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("淇敼鎴愬姛")
+ open.value = false
+ getList()
+ })
} else {
addEnergyVarieties(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() {
form.value = {
- enerclassname: '',
- note: ''
- };
- proxy.resetForm("formRef");
+ enerclassname: "",
+ note: "",
+ }
+ proxy.resetForm("formRef")
}
// 妯″瀷閰嶇疆绠＄悊-鑳芥簮鍝佺璁剧疆-鍒犻櫎
function handleDelete(row) {
proxy.$modal
.confirm('鏄惁纭鍒犻櫎鑳芥簮鍝佺涓�"' + row.enerclassname + '"鐨勬暟鎹」锛�')
.then(function () {
- return delEnergyVarieties(row.enerclassid);
+ return delEnergyVarieties(row.enerclassid)
})
.then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList()
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
})
- .catch(() => { });
+ .catch(() => {})
}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3