From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/operation/components/deviceDetail.vue |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/operation/components/deviceDetail.vue b/admin/src/views/operation/components/deviceDetail.vue
index 02633b3..1dcab14 100644
--- a/admin/src/views/operation/components/deviceDetail.vue
+++ b/admin/src/views/operation/components/deviceDetail.vue
@@ -143,10 +143,12 @@
         border
         style="width: 100%">
         <el-table-column
+          :key="Date.now()"
           prop="realName"
           label="杩愮淮浜哄憳">
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           label="璁惧鐘舵��">
           <template slot-scope="{row}">
             <span v-if="row.status === 0">姝ｅ父</span>
@@ -155,14 +157,17 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="remark"
+          :key="Date.now()"
+          prop="content"
           label="杩愮淮澶囨敞">
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           prop="dealDate"
           label="杩愮淮鏃堕棿">
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           label="鎿嶄綔">
           <template slot-scope="{row}">
             <el-button type="text" @click="handleDetail(row)">鏌ョ湅璇︽儏</el-button>
@@ -185,24 +190,34 @@
         border
         style="width: 100%">
         <el-table-column
+          :key="Date.now()"
           prop="schemeTitle"
           label="璁″垝鍚嶇О">
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           prop="taskCode"
           label="浠诲姟缂栧彿">
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           label="浠诲姟鏃堕棿">
           <template slot-scope="{row}">
             {{row.startDate}} ~ {{row.endDate}}
           </template>
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           prop="realname"
           label="宸℃浜�">
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
+          prop="dealDate"
+          label="宸℃鏃堕棿">
+        </el-table-column>
+        <el-table-column
+          :key="Date.now()"
           label="宸℃缁撴灉">
           <template slot-scope="{row}">
             <span v-if="row.dealStatus === 0">姝ｅ父</span>
@@ -210,6 +225,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           label="宸℃闄勪欢">
           <template slot-scope="{row}">
             <el-image
@@ -221,6 +237,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          :key="Date.now()"
           prop="content"
           label="宸℃璇存槑">
         </el-table-column>
@@ -284,7 +301,7 @@
       }
     },
     getDetail() {
-      this.this.activeTabs = 0
+      this.activeTabs = 0
       const { id } = this
       detailById(id).then(res => {
         this.info = res
@@ -328,6 +345,7 @@
         capacity: this.pageSize,
         page: this.page,
         model: {
+          status: 1,
           deviceId: this.id
         }
       }).then(res => {

--
Gitblit v1.9.3