From 9ac4f1edc86c9af627fcff2b3263e029ec4c95ff Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 11 十二月 2023 21:50:56 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/device/index.vue | 2 +
ruoyi-ui/src/views/bignote/index.vue | 2 +
ruoyi-ui/src/views/contacts/index.vue | 6 ++
ruoyi-ui/src/views/pet/petInfo.vue | 33 ++++++++++------
ruoyi-ui/src/views/secret/secretInfo.vue | 56 +++++++++++++++++++++++++---
ruoyi-ui/src/views/clean/index.vue | 2 +
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/economy/index.vue | 2 +
ruoyi-ui/src/views/pet/index.vue | 2 +
ruoyi-ui/src/views/note/index.vue | 1
ruoyi-ui/src/views/collection/index.vue | 2 +
ruoyi-ui/src/views/doctor/index.vue | 2 +
12 files changed, 92 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index fc2402d..6330ea0 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -192,6 +192,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:bignote:list']"
>淇敼</el-button>
@@ -199,6 +200,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 6949e12..f41f833 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -177,6 +177,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:clean:info']"
>淇敼</el-button>
@@ -184,6 +185,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index bb2b6ff..08df003 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -249,6 +249,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>
@@ -258,6 +259,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
><span style="font-size: 14px;">鍒犻櫎</span></el-button>
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index ec75261..c5cbb96 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -82,6 +82,7 @@
plain
icon="el-icon-plus"
size="mini"
+
@click="handleAdd"
v-hasPermi="['system:role:add']"
>鏂板</el-button>
@@ -94,6 +95,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
+
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
@@ -217,6 +219,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>
@@ -226,6 +229,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
><span style="font-size: 14px;">鍒犻櫎</span></el-button>
@@ -418,7 +422,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index cf06588..74b15b1 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -194,6 +194,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
@@ -201,6 +202,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index c7e50e6..4222612 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -198,6 +198,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>
@@ -208,6 +209,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
+ :disabled="!scope.row.ownData"
v-hasPermi="['system:role:remove']"
><span style="font-size: 14px;">鍒犻櫎</span></el-button>
<el-button
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index c372b50..0251554 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -161,6 +161,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:economy:info']"
>淇敼</el-button>
@@ -168,6 +169,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index fde3f82..2a38206 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -673,6 +673,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
+ alert(23)
const Ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
return delProperty(Ids);
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 5926caf..4f97874 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -122,6 +122,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:property:info']"
>淇敼</el-button>
@@ -129,6 +130,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index 507e7f7..e0d5a8c 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -166,8 +166,10 @@
</el-upload>
</el-col>
</div>
+
<!-- <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button> -->
</el-col>
+
</div>
</el-container>
@@ -259,11 +261,15 @@
</div>
</el-col>
+
</div>
+ <div class="form-header mt">
-
-
+</div>
+ <div>
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼榄呭疇淇℃伅</el-button>
+ </div>
<el-dialog :visible.sync="dialogVisible">
<img w-full :src="dialogImageUrl" alt="Preview Image" />
@@ -397,7 +403,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileListOther:[
@@ -557,6 +563,8 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
+ this.isShow = true
+
// document.title = "淇敼榄呭疇璇︾粏淇℃伅";
this.$route.meta.title = "淇敼榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
@@ -564,6 +572,7 @@
// document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";
this.$route.meta.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.btn = false;
+ this.isShow = false;
}
let _this = this
@@ -573,7 +582,7 @@
getPetList(id).then((response) => {
this.petList = response.data;
console.log(this.petList)
- alert(this.petList.headPicture)
+ // alert(this.petList.headPicture)
this.loading = false;
});
// getPetowner(id).then((response) => {
@@ -619,14 +628,14 @@
},
submitForm() {
- let ul = this.fileList1.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileList2.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.petList.headPicture = ul,
- this.petList.fullPicture = uls,
+ // let ul = this.fileList1.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = this.fileList2.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // this.petList.headPicture = ul,
+ // this.petList.fullPicture = uls,
this.$refs['elForm'].validate(valid => {
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index d210bcf..e8642c9 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -38,15 +38,27 @@
</el-input>
</el-form-item>
<el-form-item label="鏄惁寮�鍚寚绾�" prop="isFinger">
- <el-input v-model="formData.isFinger" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb">
+
+ <el-select v-model="formData.isFinger" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ <!-- <el-input v-model="formData.isFinger" :active-value="鏄�" :inactive-value="鍚�" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb"> -->
</el-input>
</el-form-item>
<el-form-item label="鏄惁寮�鍚汉鑴�" prop="isFace">
- <el-input v-model="formData.isFace" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鍒掓墸" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+
+ <el-select v-model="formData.isFace" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="绉佹湁/鍏湁" prop="isPrivate">
- <el-input v-model="formData.isPrivate" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-select v-model="formData.isPrivate" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions3" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -191,7 +203,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileListOther:[
@@ -260,6 +272,26 @@
}],
},
+ typeOptions2: [
+ {
+ value: '0',
+ label: '鍚�',
+ },
+ {
+ value: '1',
+ label: '鏄�',
+ }
+ ],
+ typeOptions3: [
+ {
+ value: '0',
+ label: '绉佹湁',
+ },
+ {
+ value: '1',
+ label: '鍏湁',
+ }
+ ],
typeOptions: [{
value: '0',
label: '鍩洪噾',
@@ -296,6 +328,18 @@
this.loading = true;
getSecretInfo({id}).then((response) => {
this.formData = response.data;
+ 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==1)
+ this.formData.isPrivate = '鍏辨湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -463,7 +507,7 @@
updateSecret(_this.formData).then(response => {
this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
})
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index d473d95..05c769f 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `https://10.39.18.174:8080/`,
+ // target: `https://10.39.18.174:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1