From 93de43267e1663031fe5dc2f5ae40d128a182a76 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 18 六月 2026 17:24:51 +0800
Subject: [PATCH] 新增智能电表、空调管理

---
 admin/src/views/contract/contractList.vue |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/admin/src/views/contract/contractList.vue b/admin/src/views/contract/contractList.vue
index 13a9176..c5c2e9a 100644
--- a/admin/src/views/contract/contractList.vue
+++ b/admin/src/views/contract/contractList.vue
@@ -15,18 +15,16 @@
         <el-table-column prop="zlFirstPrice" label="绉熻祦鍗曚环" min-width="100" show-overflow-tooltip>
             <template slot-scope="{row}">
                 <div style="display: flex; align-items: center;">
-                    <span>{{row.zlFirstPrice}}</span>
-                    <span v-if="row.zlFirstCircle === 0">鍏�/m虏路澶�</span>
-                    <span v-if="row.zlFirstCircle === 1">鍏�/m虏路鏈�</span>
-                    <span v-if="row.zlFirstCircle === 2">鍏�/澶�</span>
-                    <span v-if="row.zlFirstCircle === 3">鍏�/鏈�</span>
-                    <span v-if="row.zlFirstCircle === 4">鍏�/骞�</span>
-                    <span v-if="row.zlFirstCircle === 5">鍏�/m虏路骞�</span>
-                    <span v-if="row.zlFirstCircle === 6">鍏�/鍦�</span>
+                    <span>{{row.zlFirstPrice || row.wyFirstPrice}}</span>
+                    <span>{{row.zlFirstCircleStr || row.wyFirstCircleStr}}</span>
                 </div>
             </template>
         </el-table-column>
-      <el-table-column prop="totalArea" label="绉熻祦闈㈢Н" min-width="100" show-overflow-tooltip />
+        <el-table-column label="绉熻祦闈㈢Н" min-width="100" show-overflow-tooltip>
+            <template slot-scope="{row}">
+                {{row.totalArea}}銕�
+            </template>
+        </el-table-column>
       <el-table-column prop="signDate" label="绛捐鏃�" min-width="100" show-overflow-tooltip />
       <el-table-column prop="code" label="鍚堝悓缂栧彿" min-width="100" show-overflow-tooltip />
       <el-table-column label="鍚堝悓鐘舵��" min-width="90" fixed="right" show-overflow-tooltip>
@@ -124,11 +122,15 @@
     },
     getList (page) {
       const { pagination, filters } = this
+      const model = { ...filters }
+      if (model.selDate && model.selDate.length === 2) {
+        model.queryStartTime = model.selDate[0]
+        model.queryEndTime = model.selDate[1]
+      }
+      delete model.selDate
       this.loading = true
       fetchList({
-        model: {
-          ...filters
-        },
+        model,
         sorts: [{ direction: 'DESC', property: 'param1' }],
         capacity: pagination.pageSize,
         page: page || pagination.page

--
Gitblit v1.9.3