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/energyconservation/policyrule/policyRule.vue |   53 +++++++++++++++++++++++++++--------------------------
 1 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/zhitan-vue/src/views/energyconservation/policyrule/policyRule.vue b/zhitan-vue/src/views/energyconservation/policyrule/policyRule.vue
index 558747a..ade43bd 100644
--- a/zhitan-vue/src/views/energyconservation/policyrule/policyRule.vue
+++ b/zhitan-vue/src/views/energyconservation/policyrule/policyRule.vue
@@ -14,35 +14,36 @@
           <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>
-        <!-- <el-button type="primary" icon="Delete">鍒犻櫎</el-button> -->
+    <div class="table-bg-style">
+      <div class="table-box">
+        <el-table :data="tableData" v-loading="loading">
+          <el-table-column prop="title" label="鏂囦欢鏍囬" show-overflow-tooltip align="center" />
+          <el-table-column prop="typeName" label="鏂囦欢绫诲埆" show-overflow-tooltip align="center" />
+          <el-table-column prop="dept" label="鍗板彂閮ㄩ棬" show-overflow-tooltip align="center" />
+          <el-table-column prop="issuingTime" label="鍗板彂鏃堕棿" show-overflow-tooltip align="center" />
+          <el-table-column label="鎿嶄綔" width="300" align="center">
+            <template #default="scope">
+              <el-button v-if="scope.row.url" link type="primary" icon="Files" @click="handleFile(scope.row.url)">
+                闄勪欢
+              </el-button>
+              <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>
-      <el-table :data="tableData" v-loading="loading">
-        <el-table-column prop="title" label="鏂囦欢鏍囬" show-overflow-tooltip align="center" />
-        <el-table-column prop="typeName" label="鏂囦欢绫诲埆" show-overflow-tooltip align="center" />
-        <el-table-column prop="dept" label="鍗板彂閮ㄩ棬" show-overflow-tooltip align="center" />
-        <el-table-column prop="issuingTime" label="鍗板彂鏃堕棿" show-overflow-tooltip align="center" />
-        <el-table-column label="鎿嶄綔" width="300" align="center">
-          <template #default="scope">
-            <el-button v-if="scope.row.url" link type="primary" icon="Files" @click="handleFile(scope.row.url)">
-              闄勪欢
-            </el-button>
-            <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" @get-list="getList" />
   </div>

--
Gitblit v1.9.3