From ecec72d382a83718d3b1d8e60a473829c8d90d40 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 15 八月 2023 21:38:03 +0800
Subject: [PATCH] 完善荣誉证书模块的类别和名称的选择输入功能;家根网可以按照身份、姓名搜索;成长经历阅历的各个小模块的时间在修改时变成可选形式

---
 ruoyi-ui/src/views/device/index.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 8ea514e..2742998 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -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>
 
 
@@ -248,7 +249,8 @@
           :http-request="requestUpload"
           :file-list="fileList"
         >
-          <i slot="default" class="el-icon-plus"></i>
+          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
             <img
               class="el-upload-list__item-thumbnail"
@@ -364,6 +366,7 @@
       ],
       dsb:true,
       btn:false,
+      uploading: false,
       formDat: {
         // type: undefined,
         content: undefined,
@@ -621,8 +624,13 @@
       Object.keys(this.formDat).forEach(key => {
         this.formDat[key] = '';
       });
-      this.handleRemove(this.fileList[0]);
-      this.handleRemoveFile(this.fileListOther[0]);
+      for(let i = 0; i <= this.fileList.length; i++)
+      {
+        this.handleRemove(this.fileList[0]);
+      }
+      for(let i = 0; i < this.fileListOther.length; i++){
+        this.handleRemoveFile(this.fileListOther[0]);
+      }
     },
     requestUpload(params)
     {
@@ -630,10 +638,11 @@
       var formData = new FormData();
       formData.append('uploadFile', file);
       let _this = this
-
+      this.uploading = true;
       uploadPic(formData).then(response => {
         let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+        this.uploading = false;
+        this.$modal.msgSuccess("涓婁紶鎴愬姛");
         if(_this.fot.includes(pth) === true)
         {
           _this.fileList.push({name:response.data.fileName, "url":response.data.url})

--
Gitblit v1.9.1