From 9f9c41e93df80b48fbcc4d1c2e7748bed8111302 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:36:55 +0800
Subject: [PATCH] 家庭资产备忘本

---
 ruoyi-ui/src/views/device/index.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 5beeda4..d336d92 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -128,10 +128,10 @@
       <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
       <el-table-column label="璁惧鍚嶇О" prop="name" sortable width="120" />
 
-      <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="180">
+      <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="150">
         <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="180">
+      <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="120">
         <template slot-scope="scope">
           {{ getSrc1(scope.row.status) }}
         </template>
@@ -145,7 +145,7 @@
       </el-table-column>
 
 
-      <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
+      <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="120" align="center">
 
         <template slot-scope="scope" >
           <div  @click="handleCheck(scope.row)">
@@ -155,15 +155,16 @@
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
-              v-if="scope.row.url !== ',' "
+              v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
             >
             <img
+              v-else
               class="el-upload-list__item-thumbnail"
               src="../../assets/images/deviceA.png"
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
-              v-if="scope.row.url === ','"
+
             ></div>
         </template>
       </el-table-column>
@@ -210,11 +211,11 @@
         </el-form-item>
 
         <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
-          <el-date-picker
+          <el-input
             v-model='formDat.happenTime'
             type='date'
             placeholder='閫夋嫨鏃ユ湡'
-          ></el-date-picker>
+          ></el-input>
         </el-form-item>
 
 

--
Gitblit v1.9.1