From 2f56209d3cdfda779aeed6cd30b1c0cc0cda3e70 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:47:16 +0800
Subject: [PATCH] 修改了权限代码
---
ruoyi-ui/src/views/pet/index.vue | 109 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 33 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 11df3f8..b904392 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -64,7 +64,7 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
@@ -95,7 +95,7 @@
<el-table v-loading="loading" :data="petList,PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="绉嶇被" prop="animal" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="鍝佺" prop="type" sortable :show-overflow-tooltip="true" width="150" />
@@ -115,12 +115,14 @@
</el-table-column>
<el-table-column label="瀹犵墿id" prop="id" sortable width="100" />
<el-table-column label="涓讳汉濮撳悕" prop="masterName" sortable width="100" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <div class="button-container">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:property:info']"
>淇敼</el-button>
@@ -128,13 +130,14 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
-
+ </div>
</template>
</el-table-column>
</el-table>
@@ -191,8 +194,8 @@
<el-input v-model="formDat.eatHabit" placeholder="璇疯緭鍏ラギ椋熶範鎯�(鍠�)" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="楗涔犳儻(鎭�)" prop="diseatHabit">
- <el-input v-model="formDat.diseatHabit" placeholder="璇疯緭鍏ラギ椋熶範鎯�(鎭�)" clearable :style="{width: '100%'}" >
+ <el-form-item label="楗涔犳儻(鎭�)" prop="disEatHabit">
+ <el-input v-model="formDat.disEatHabit" placeholder="璇疯緭鍏ラギ椋熶範鎯�(鎭�)" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鐢熸椿涔犳儻(鍠�)" prop="lifeHabit">
@@ -319,22 +322,27 @@
</el-dialog>
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
+ </el-dialog>
+
</div>
</template>
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
-import {listPet,enload, getPetInfo, delPet,addPet, uploadPic} from "@/api/pet/index";
+import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1} from "@/api/pet/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -360,13 +368,20 @@
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
+
+ dialogImageUrl: '',
+ dialogVisible: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList1:[ ],
fileList2:[ ],
fileListOther:[ ],
+ uploadFileList1: [],
dsb:true,
btn:false,
formDat: {
@@ -384,7 +399,7 @@
dialect: undefined,
address:undefined,
eatHabit:undefined,
- diseatHabit: undefined,
+ disEatHabit: undefined,
LifeHabit: undefined,
disLifeHabit: undefined,
headPicture:undefined,
@@ -403,7 +418,7 @@
dialect: undefined,
address:undefined,
eatHabit:undefined,
- diseatHabit: undefined,
+ disEatHabit: undefined,
LifeHabit: undefined,
disLifeHabit: undefined,
url: undefined,
@@ -438,22 +453,22 @@
animal: [{
required: true,
message: '璇疯緭鍏ョ绫�',
- trigger: 'blue'
+ trigger: 'blur'
}],
idNum: [{
required: true,
message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
- trigger: 'blue'
+ trigger: 'blur'
}],
securityCode: [{
// required: true,
message: '璇疯緭鍏ラ槻浼爜',
- trigger: 'blue'
+ trigger: 'blur'
}],
name: [{
required: true,
message: '璇疯緭鍏ュ悕瀛�',
- trigger: 'blue'
+ trigger: 'blur'
}],
birth: [{
required: true,
@@ -463,12 +478,12 @@
color: [{
required: true,
message: '璇疯緭鍏ラ鑹�',
- trigger: 'blue'
+ trigger: 'blur'
}],
properties: [{
// required: true,
message: '璇疯緭鍏ユ�ц川',
- trigger: 'blue'
+ trigger: 'blur'
}],
sex: [{
required: true,
@@ -494,9 +509,9 @@
trigger: 'blur'
}],
- diseatHabit: [{
+ disEatHabit: [{
required: true,
- message: '璇疯緭鍏ラギ椋熶範鎯�(鍠�)',
+ message: '璇疯緭鍏ラギ椋熶範鎯�(鎭�)',
trigger: 'blur'
}],
masterName: [{
@@ -535,10 +550,16 @@
},
created() {
this.getList();
-
+ this.getInfo()
},
methods: {
-
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
// 鍙栨秷鎸夐挳
cancelData() {
@@ -601,11 +622,19 @@
}
},
handleRemoveFile(file) {
+ // for(let i = 0; i < this.fileList2.length; i++)
+ // {
+ // if(this.fileList2[i].url==file.url)
+ // this.$delete(this.fileList2,i);
+ // }
for(let i = 0; i < this.fileList2.length; i++)
+ {
+ if(this.fileList2[i].url==file.url)
{
- if(this.fileList2[i].url==file.url)
- this.$delete(this.fileList2,i);
- }
+ this.$delete(this.fileList2,i);
+ this.$delete(this.uploadFileList1,i);
+ }
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -638,7 +667,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -705,18 +734,26 @@
if (valid) {
addPet(this.formDat).then(response => {
+ // alert(this.formDat.diseatHabit)
+ // alert(this.formDat.eatHabit)
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList1.length; i++)
+ {
+ this.handleRemove(this.fileList1[0]);
+ }
+ for(let i = 0; i < this.fileList2.length; i++){
+ this.handleRemoveFile(this.fileList2[0]);
+ }
this.getList();
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
+
},
requestUpload(params)
{
@@ -726,7 +763,7 @@
formData.append('uploadFile', file);
let _this = this
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
_this.fileList1.push({name:response.data.fileName, url:response.data.url})
// _this.fileList2.push({name:response.data.fileName, url:response.data.url})
@@ -742,7 +779,7 @@
formData.append('uploadFile', file);
let _this = this
- uploadPic(formData).then(response => {
+ uploadPic1(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
// _this.fileList1.push({name:response.data.fileName, url:response.data.url})
_this.fileList2.push({name:response.data.fileName, url:response.data.url})
@@ -791,4 +828,10 @@
color: #999;
border: 1px dashed #999;
}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1