From fbca70fb635b386eb0ec09e47bd11c5c51e059c2 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 15 八月 2023 21:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/healthy/healthyInfo.vue | 76 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index d2d4afd..7a634b1 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -7,7 +7,7 @@
<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="璇烽�夋嫨浣撴鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="formData.checkTime" placeholder="璇烽�夋嫨浣撴鏃堕棿" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="灏辩梾鍖婚櫌" prop="hospital">
@@ -39,7 +39,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</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"
@@ -89,8 +90,8 @@
:http-request="requestUpload"
:show-file-list="true"
>
-
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</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"
@@ -141,7 +142,7 @@
</div>
</template>
<script>
-import {getSecretInfo, uploadPic, download, updateSecret} from "@/api/secret/index";
+import {getHealthInfo, uploadPic, download, updateSecret} from "@/api/healthy/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
@@ -152,8 +153,8 @@
props: [],
data() {
return {
- cdi:"闅愮璇︾粏淇℃伅",
- udi:"闅愮淇℃伅淇敼",
+ cdi:"鍋ュ悍璇︾粏淇℃伅",
+ udi:"鍋ュ悍淇℃伅淇敼",
fot:[".jpg",".jif"],
fileList:[
],
@@ -163,34 +164,54 @@
dsb:true,
btn:false,
isShow:true,
+ uploading: false,
formData: {
- checkTime: undefined,
- hospital: undefined,
- type:undefined,
- title:undefined,
- notice:undefined,
- remark:undefined,
-
+ type: undefined,
+ happenTime: undefined,
+ accNo:undefined,
+ validityDate:undefined,
+ password:undefined,
+ validityDate:undefined,
+ isFinger:undefined,
+ isFace:undefined,
+ isPrivate:undefined,
+ location:undefined,
+ remark: undefined,
url: undefined,
},
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
rules: {
- title: [{
+ password: [{
required: true,
- message: '璇疯緭鍏ユ爣棰�',
+ message: '璇疯緭鍏ュ瘑鐮�',
trigger: 'blur'
}],
- hospital: [{
+ accNo: [{
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'
}],
@@ -199,9 +220,9 @@
message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
- checkTime: [{
+ happenTime: [{
required: true,
- message: '璇烽�夋嫨灏辫瘖鏃堕棿',
+ message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
@@ -227,12 +248,12 @@
this.btn= jd
this.dsb = !jd
this.isShow=true
- document.title = "淇敼闅愮璇︾粏淇℃伅";
- this.$route.meta.title = "淇敼闅愮璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "淇敼鍋ュ悍璇︾粏淇℃伅";
+ this.$route.meta.title = "淇敼鍋ュ悍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅闅愮璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅闅愮璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "鏌ョ湅鍋ュ悍璇︾粏淇℃伅";
+ this.$route.meta.title = "鏌ョ湅鍋ュ悍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.isShow=false
}
@@ -240,7 +261,7 @@
if (id) {
this.loading = true;
- getSecretInfo({id}).then((response) => {
+ getHealthInfo({id}).then((response) => {
this.formData = response.data;
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
@@ -375,10 +396,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