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/energyefficiency/benchmarkmanage/benchmarkmanage.vue |  198 ++++++++++++++++++++++++++-----------------------
 1 files changed, 106 insertions(+), 92 deletions(-)

diff --git a/zhitan-vue/src/views/energyefficiency/benchmarkmanage/benchmarkmanage.vue b/zhitan-vue/src/views/energyefficiency/benchmarkmanage/benchmarkmanage.vue
index aee4ffb..1e43c29 100644
--- a/zhitan-vue/src/views/energyefficiency/benchmarkmanage/benchmarkmanage.vue
+++ b/zhitan-vue/src/views/energyefficiency/benchmarkmanage/benchmarkmanage.vue
@@ -1,122 +1,136 @@
 <template>
-    <div class="page">
-        <div class="form-card">
-            <el-form :model="form" ref="queryRef" :inline="true" label-width="85px">
-                <el-form-item label="鏍囨潌缂栧彿" prop="code">
-                    <el-input v-model="form.code" placeholder="璇疯緭鍏ユ爣鏉嗙紪鍙�" />
-                </el-form-item>
-                <el-form-item label="鏍囨潌绫诲瀷" prop="type">
-                    <el-select v-model="form.type" clearable>
-                        <el-option v-for="dict in benchmark_type" :key="dict.value" :label="dict.label"
-                            :value="dict.value" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="鏍囨潌绛夌骇" prop="grade">
-                    <el-select v-model="form.grade" clearable>
-                        <el-option v-for="dict in benchmark_grade" :key="dict.value" :label="dict.label"
-                            :value="dict.value" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-                    <el-button icon="Refresh" @click="resetQuery">閲嶇疆</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>
-            <el-table :data="tableData" v-loading="loading">
-                <el-table-column prop="code" label="鏍囨潌缂栧彿" show-overflow-tooltip align="center" />
-                <el-table-column prop="type" label="鏍囨潌绫诲瀷" show-overflow-tooltip align="center"
-                    :formatter="(row, c) => proxy.selectDictLabel(benchmark_type, row.type)" />
-                <el-table-column prop="grade" label="鏍囨潌绛夌骇" show-overflow-tooltip align="center"
-                    :formatter="(row, c) => proxy.selectDictLabel(benchmark_grade, row.grade)" />
-                <el-table-column prop="value" label="鏍囨潌鍊�" show-overflow-tooltip align="center" />
-                <el-table-column prop="nationalNum" label="鍥芥爣缂栧彿" show-overflow-tooltip align="center" />
-                <el-table-column prop="createBy" label="褰曞叆浜�" show-overflow-tooltip align="center" />
-                <el-table-column prop="createTime" label="褰曞叆鏃堕棿" show-overflow-tooltip align="center" />
-                <el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip align="center" />
-                <el-table-column prop="active" label="鎿嶄綔" width="150" align="center">
-                    <template #default="scope">
-                        <el-button link type="primary" icon="Edit" @click="handleAdd(scope.row)">
-                            淇敼
-                        </el-button>
-                        <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)">
-                            鍒犻櫎
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize" @pagination="getList" />
-        </div>
-        <EditModal ref="EditModalRef" :benchmark_grade="benchmark_grade" :benchmark_type="benchmark_type"
-            @getList="getList" />
-
+  <div class="page">
+    <div class="form-card">
+      <el-form :model="form" ref="queryRef" :inline="true" label-width="85px">
+        <el-form-item label="鏍囨潌缂栧彿" prop="code">
+          <el-input v-model="form.code" placeholder="璇疯緭鍏ユ爣鏉嗙紪鍙�" />
+        </el-form-item>
+        <el-form-item label="鏍囨潌绫诲瀷" prop="type">
+          <el-select v-model="form.type" clearable>
+            <el-option v-for="dict in benchmark_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鏍囨潌绛夌骇" prop="grade">
+          <el-select v-model="form.grade" clearable>
+            <el-option v-for="dict in benchmark_grade" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+          <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+        </el-form-item>
+      </el-form>
     </div>
+    <div class="table-bg-style">
+      <div class="theme-dark-mt20 mb20 ml20">
+        <el-button type="primary" icon="Plus" @click="handleAdd">鏂板</el-button>
+      </div>
+      <div class="table-box">
+        <el-table :data="tableData" v-loading="loading">
+          <el-table-column prop="code" label="鏍囨潌缂栧彿" show-overflow-tooltip align="center" />
+          <el-table-column
+            prop="type"
+            label="鏍囨潌绫诲瀷"
+            show-overflow-tooltip
+            align="center"
+            :formatter="(row, c) => proxy.selectDictLabel(benchmark_type, row.type)"
+          />
+          <el-table-column
+            prop="grade"
+            label="鏍囨潌绛夌骇"
+            show-overflow-tooltip
+            align="center"
+            :formatter="(row, c) => proxy.selectDictLabel(benchmark_grade, row.grade)"
+          />
+          <el-table-column prop="value" label="鏍囨潌鍊�" show-overflow-tooltip align="center" />
+          <el-table-column prop="nationalNum" label="鍥芥爣缂栧彿" show-overflow-tooltip align="center" />
+          <el-table-column prop="createBy" label="褰曞叆浜�" show-overflow-tooltip align="center" />
+          <el-table-column prop="createTime" label="褰曞叆鏃堕棿" show-overflow-tooltip align="center" />
+          <el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip align="center" />
+          <el-table-column prop="active" label="鎿嶄綔" width="150" align="center">
+            <template #default="scope">
+              <el-button link type="primary" icon="Edit" @click="handleAdd(scope.row)"> 淇敼 </el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)"> 鍒犻櫎 </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+
+    <EditModal
+      ref="EditModalRef"
+      :benchmark_grade="benchmark_grade"
+      :benchmark_type="benchmark_type"
+      @getList="getList"
+    />
+  </div>
 </template>
 <script setup>
-import EditModal from './components/EditModal.vue'
-import { valueManageList, valueManageDel } from '@/api/benchmarkManage'
+import EditModal from "./components/EditModal.vue"
+import { valueManageList, valueManageDel } from "@/api/benchmarkManage"
 let proxy = getCurrentInstance().proxy
 
-let { benchmark_grade, benchmark_type } = proxy.useDict("benchmark_grade", 'benchmark_type')
+let { benchmark_grade, benchmark_type } = proxy.useDict("benchmark_grade", "benchmark_type")
 let form = ref({
-    code: null,
-    type: null,
-    grade: null,
+  code: null,
+  type: null,
+  grade: null,
 })
 function handleQuery() {
-    queryParams.value.pageNum = 1
-    getList()
+  queryParams.value.pageNum = 1
+  getList()
 }
 
 function resetQuery() {
-    queryParams.value.pageNum = 1
-    form.value = {}
-    handleQuery();
+  queryParams.value.pageNum = 1
+  form.value = {}
+  handleQuery()
 }
 
-
-let loading = ref(false);
-let total = ref(0);
+let loading = ref(false)
+let total = ref(0)
 let tableData = ref([])
 let queryParams = ref({
-    pageNum: 1,
-    pageSize: 10,
+  pageNum: 1,
+  pageSize: 10,
 })
 function getList(flag) {
-    loading.value = true
-    valueManageList({ ...queryParams.value, ...form.value }).then(res => {
-        tableData.value = res.rows
-        total.value = res.total
-        loading.value = false
-    })
-
+  loading.value = true
+  valueManageList({ ...queryParams.value, ...form.value }).then((res) => {
+    tableData.value = res.rows
+    total.value = res.total
+    loading.value = false
+  })
 }
 
 getList()
-let EditModalRef = ref('')
+let EditModalRef = ref("")
 function handleAdd(row) {
-    if (EditModalRef.value) {
-        EditModalRef.value.handleOpen(row)
-    }
-
+  if (EditModalRef.value) {
+    EditModalRef.value.handleOpen(row)
+  }
 }
 
 function handleDel(row) {
-    proxy.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤�?').then(function () {
-        return valueManageDel(row.id);
-    }).then(() => {
-        getList();
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-    }).catch(() => { });
+  proxy.$modal
+    .confirm("鏄惁纭鍒犻櫎鏁版嵁椤�?")
+    .then(function () {
+      return valueManageDel(row.id)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+    })
+    .catch(() => {})
 }
-
 </script>
-
 
 <style lang="scss" scoped>
 @import "@/assets/styles/page.scss";

--
Gitblit v1.9.3