From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 02 一月 2025 21:44:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/pet/index.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 4a65227..314d317 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -111,7 +111,7 @@
<el-table v-loading="loading" border :data="petList" ref="table2" @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" />
@@ -131,6 +131,7 @@
</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" 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">
@@ -355,13 +356,13 @@
<el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
- <el-table-column label="韬唤" prop="identity" sortable width="130" >
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
+ <!-- <el-table-column label="韬唤" prop="identity" sortable width="130" >
<template slot-scope="scope" >
<span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
<span v-else>鈥斺��</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
</el-table>
@@ -490,7 +491,7 @@
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
- name: "Role",
+ name: "ZfPet",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -563,7 +564,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList1:[ ],
fileList2:[ ],
@@ -879,6 +880,7 @@
getList1() {
let userId = this.$store.state.user.userId
+ this.userOptions = []
showShareUser(userId, 2022).then(response=>{
console.log("===========ddddddddddddd")
@@ -899,13 +901,13 @@
this.listRoot.forEach(element => {
kon[element['nickName']] = element['userId']
})
- for(let i in kon){
- this.userOptions.push({label: i,value: kon[i]})
- }
- for(let i in this.userOptions){
- this.userList.push(this.userOptions[i].value)
- }
- console.log(this.userList,'userListuserListuserList99999999999999')
+ // for(let i in kon){
+ // this.userOptions.push({label: i,value: kon[i]})
+ // }
+ // for(let i in this.userOptions){
+ // this.userList.push(this.userOptions[i].value)
+ // }
+ // console.log(this.userList,'userListuserListuserList99999999999999')
this.loading1 = false;
}
);
@@ -920,7 +922,8 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
- // this.getList();
+ this.getList();
+ this.getList1();
Message({ message: "鍒嗕韩鎴愬姛", type: 'success' });
this.open1 = false;
this.id1 = undefined;
@@ -1065,6 +1068,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/pet/petInfo/" + id);
},
@@ -1186,6 +1190,13 @@
background: #FFEFF2;
}
+/deep/ .w-table__fixed{
+
+ bottom: 12px !important;
+
+ box-shadow:none;
+
+ }
.upload-demo .el-upload-list__item-thumbnail img {
width: 100%;
height: 100%;
--
Gitblit v1.9.1