From 63b70dbc269b7b9d20a7a88f3dd7c8bb0934d3f4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 03 九月 2024 21:49:18 +0800
Subject: [PATCH] 修改了一些bug
---
ruoyi-ui/src/views/pet/index.vue | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 9337b4a..f0defaf 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -108,7 +108,7 @@
</el-row>
- <el-table v-loading="loading" border :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <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"/>
@@ -480,7 +480,7 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import {getAllInfo} from "@/api/system/user"
-
+import {showShareUser} from "@/api/bignote/index";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -493,6 +493,9 @@
data() {
return {
// 鍒嗕韩缁欒皝鐨刲ist
+ total1:0,
+
+ PetNoteList:[],
listRoot: [],
open1:false,
open2:false,
@@ -872,27 +875,19 @@
return row.id
},
getList1() {
- this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- let clanId = this.$store.state.user.clanId
- getAllInfo(this.queryParams1).then(response => {
- this.listRoot = response.data.data;
- const kon = {}
- 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,'userListuserListuserList')
- this.loading1 = false;
- }
- );
- },
+ let userId = this.$store.state.user.userId
+
+
+ showShareUser(userId, 2022).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+
+ },
// 纭鍒嗕韩
subShare(row) {
const shareList = {}
@@ -961,16 +956,7 @@
this.loading = false;
}
);
- listPetnote(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- console.log(response.data)
- this.PetNoteList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
- }
- );
},
handleRemove(file) {
--
Gitblit v1.9.1