From 49bf04d7865d999463a024b82a6cd7608bb89507 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-ui/src/views/healthy/healthyInfo.vue |   68 ++++++++++++----------------------
 1 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index 1ffcfea..d2d4afd 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <div class="form-header mt">
-      <h4 class="dt h4">闅愮璇︾粏淇℃伅 </h4>
+      <h4 class="dt h4">鍋ュ悍璇︾粏淇℃伅 </h4>
 
     </div>
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
       <el-form-item label="浣撴鏃堕棿" prop="checkTime">
-        <el-input v-model="formData.checkTime" placeholder="璇烽�夋嫨浣撴鏃堕棿" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        <el-input v-model="formData.checkTime" placeholder="璇烽�夋嫨浣撴鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
 
       <el-form-item label="灏辩梾鍖婚櫌" prop="hospital">
@@ -51,14 +51,14 @@
           >
           <span class="el-upload-list__item-actions">
           <span
-            v-if="isShow"
+
             class="el-upload-list__item-preview"
             @click="handlePictureCardPreview(file)"
           >
             <i class="el-icon-zoom-in"></i>
           </span>
           <span
-            v-if="isShow"
+
             class="el-upload-list__item-delete"
             @click="handleDownload(file.url)"
           >
@@ -85,7 +85,7 @@
         multiple
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
-        :on-remove="handleRemove"
+        :on-remove="handleRemoveFile"
         :http-request="requestUpload"
         :show-file-list="true"
       >
@@ -101,20 +101,19 @@
           >
           <span class="el-upload-list__item-actions">
                   <span
-                    v-if="isShow"
+
                     class="el-upload-list__item-preview"
                     @click="handleFileCardPreview(file)"
                   >
                     <i class="el-icon-zoom-in"></i>
                   </span>
                   <span
-                    v-if="isShow"
-                    @click="handleRemove(file)"
-                    class="el-upload-list__item-delete"
 
+                    class="el-upload-list__item-delete"
+                    @click="handleDownload(file.url)"
                   >
-                    <i class="el-icon-download"></i>
-                  </span>
+                 <i class="el-icon-download"></i>
+                 </span>
                   <span
                     v-if="isShow"
                     class="el-upload-list__item-delete"
@@ -165,52 +164,33 @@
       btn:false,
       isShow:true,
       formData: {
-        type: undefined,
-        happenTime: undefined,
-        accNo:undefined,
-        validityDate:undefined,
-        password:undefined,
-        validityDate:undefined,
-        isFinger:undefined,
-        isFace:undefined,
-        isPrivate:undefined,
-        location:undefined,
-        remark: undefined,
+        checkTime: undefined,
+        hospital: undefined,
+        type:undefined,
+        title:undefined,
+        notice:undefined,
+        remark:undefined,
+
         url: undefined,
       },
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
       rules: {
-        password: [{
+        title: [{
           required: true,
-          message: '璇疯緭鍏ュ瘑鐮�',
+          message: '璇疯緭鍏ユ爣棰�',
           trigger: 'blur'
         }],
 
-        accNo: [{
+        hospital: [{
           required: true,
-          message: '璇疯緭鍏ヨ处鍙�',
+          message: '璇疯緭鍏ュ尰闄�',
           trigger: 'blur'
         }],
         type: [{
           required: true,
           message: '璇烽�夋嫨鍩洪噾/鍙拌处',
-          trigger: 'change'
-        }],
-        isFinger: [{
-          required: true,
-          message: '璇烽�夋嫨鏄惁',
-          trigger: 'change'
-        }],
-        isFace: [{
-          required: true,
-          message: '璇烽�夋嫨鏄惁',
-          trigger: 'change'
-        }],
-        isPrivate: [{
-          required: true,
-          message: '璇烽�夋嫨鏄惁',
           trigger: 'change'
         }],
 
@@ -219,9 +199,9 @@
           message: '璇烽�夋嫨鏈夋晥鏈�',
           trigger: 'change'
         }],
-        happenTime: [{
+        checkTime: [{
           required: true,
-          message: '璇烽�夋嫨鏈夋晥鏈�',
+          message: '璇烽�夋嫨灏辫瘖鏃堕棿',
           trigger: 'change'
         }],
 
@@ -260,7 +240,7 @@
     if (id) {
       this.loading = true;
 
-      getSecretInfo(query).then((response) => {
+      getSecretInfo({id}).then((response) => {
         this.formData = response.data;
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)

--
Gitblit v1.9.1