From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/secret/secretInfo.vue | 97 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index 547c472..eb150cb 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -158,7 +158,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 147px; height: 147px"
fit="cover">
@@ -355,6 +355,7 @@
this.loading = true;
getSecretInfo({id}).then((response) => {
_this.formData = response.data;
+ console.log(_this.formData,'123')
if(_this.formData.isFinger==1)
_this.formData.isFinger = '鏄�'
else
@@ -375,12 +376,26 @@
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
// alert(pth)
if (_this.fot.includes(pth) === true)
- {
- if(paths[i][0]=="/")
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
- else
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
- }
+ // {
+ // if(paths[i][0]=="/")
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ // else
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ // }
+ {
+ if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: paths[i],res:false})
+ }else{
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ }
+
+ }
else {
// alert()
@@ -532,17 +547,17 @@
});
} else {
if(this.formData.isFinger==1)
- this.formData.isFinger = '鏄�'
- else
- this.formData.isFinger = '鍚�'
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
if(this.formData.isFace==1)
- this.formData.isFace = '鏄�'
- else
- this.formData.isFace = '鍚�'
- if(this.formData.isPrivate==0)
- this.formData.isPrivate = '鍏湁'
- else
- this.formData.isPrivate = '绉佹湁'
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
this.$modal.msgSuccess("淇敼澶辫触");
}
@@ -610,6 +625,18 @@
updateSecret(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
});
}
@@ -666,6 +693,18 @@
this.formData.isPrivate = 1
updateSecret(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
});
}
@@ -764,6 +803,18 @@
_this.formData.isPrivate = 1
updateSecret(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
// this.open = false;
this.getData()
this.fileListOther1=[]
@@ -826,6 +877,18 @@
updateSecret(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==0)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
});
// }
--
Gitblit v1.9.1