From b5d842b900757a2fb48d673cb33bb551e8da7b89 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 06 八月 2023 00:35:36 +0800
Subject: [PATCH] 完善电子文件问题

---
 ruoyi-ui/src/views/device/index.vue |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index d5e3876..d336d92 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -6,7 +6,7 @@
         <el-date-picker
           v-model="dateRange"
           style="width: 240px;"
-          value-format="yyyy-MM-dd HH-MM"
+          value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -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>
 
 
@@ -285,7 +286,7 @@
           class="upload-demo"
           multiple
 
-          :on-remove="handleRemove"
+          :on-remove="handleRemoveFile"
           :http-request="requestUpload"
           :show-file-list="true"
         >
@@ -403,7 +404,7 @@
           trigger: 'blur'
         }],
         status: [{
-          required: true,
+          // required: true,
           message: '鏄惁娉ㄩ攢',
           trigger: 'change'
         }],
@@ -482,6 +483,8 @@
 
     getList() {
       this.loading = true;
+      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
       // console.log(this.queryParams)
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
       listEquipment(this.queryParams).then(response => {
@@ -581,6 +584,20 @@
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+          this.$delete(this.fileList,i);
+      }
+    },
+    handleRemoveFile(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
+      {
+        if(this.fileListOther[i].url==file.url)
+          this.$delete(this.fileListOther,i);
+      }
+    },
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
@@ -601,6 +618,12 @@
           });
         }
       });
+      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+      Object.keys(this.formDat).forEach(key => {
+        this.formDat[key] = '';
+      });
+      this.handleRemove(this.fileList[0]);
+      this.handleRemoveFile(this.fileListOther[0]);
     },
     requestUpload(params)
     {

--
Gitblit v1.9.1