From cfa5f387337a497fed7e70775855d93f7cb6addf Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 30 七月 2023 17:10:45 +0800
Subject: [PATCH] 7.30提交

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

diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 279416f..5beeda4 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -2,11 +2,11 @@
   <div class="app-container" style="opacity: 1;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-      <el-form-item label="鏃堕棿" >
+      <el-form-item label="鏃堕棿" prop="happenTime">
         <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="寮�濮嬫棩鏈�"
@@ -42,10 +42,10 @@
 
       </el-form-item>
 
-      <el-form-item label="鏍囬" prop="content">
+      <el-form-item label="浜嬮」鍐呭" prop="content">
         <el-input
           v-model="queryParams.content"
-          placeholder="璇疯緭鍏ユ爣棰�"
+          placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
@@ -128,7 +128,7 @@
       <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="center" sortable prop="happenTime" width="180">
+      <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="180">
         <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">
@@ -285,7 +285,7 @@
           class="upload-demo"
           multiple
 
-          :on-remove="handleRemove"
+          :on-remove="handleRemoveFile"
           :http-request="requestUpload"
           :show-file-list="true"
         >
@@ -386,7 +386,8 @@
         content:undefined,
         buyer:undefined,
         location:undefined,
-        createDate:undefined
+        createDate:undefined,
+        happenTime:undefined
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -402,7 +403,7 @@
           trigger: 'blur'
         }],
         status: [{
-          required: true,
+          // required: true,
           message: '鏄惁娉ㄩ攢',
           trigger: 'change'
         }],
@@ -481,6 +482,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 => {
@@ -580,6 +583,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() {
 
@@ -600,6 +617,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