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/device/index.vue | 31 ++----
ruoyi-ui/src/views/bignote/index.vue | 2
ruoyi-ui/src/views/contacts/index.vue | 32 ++----
ruoyi-ui/src/views/clean/index.vue | 43 +++-----
ruoyi-ui/src/views/economy/index.vue | 41 +++-----
ruoyi-ui/src/views/pet/index.vue | 50 +++------
ruoyi-ui/src/views/note/index.vue | 33 ++---
ruoyi-ui/src/views/collection/index.vue | 33 ++----
ruoyi-ui/src/views/doctor/index.vue | 31 ++----
9 files changed, 112 insertions(+), 184 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index c6bb794..10d2246 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -822,7 +822,7 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
- alert(userId)
+ // alert(userId)
showShareUser(userId, 2013).then(response=>{
console.log("===========ddddddddddddd")
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index c7d3ee6..ca4dd06 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -554,6 +554,8 @@
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/clean/index";
import {listUserAll} from "@/api/root/index";
+import {showShareUser} from "@/api/bignote/index";
+
// import {Message} from "element-ui";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
@@ -562,7 +564,8 @@
dicts: ['sys_normal_disable'],
data() {
return {
- // 鍒嗕韩缁欒皝鐨刲ist
+ // 鍒嗕韩缁欒皝鐨刲is
+ total1:0,
searchQuery: undefined,
listRoot: [],
open1:false,
@@ -867,25 +870,15 @@
},
getList1() {
this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2020).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) {
@@ -967,12 +960,12 @@
getCateInfor()
{
let _this = this
- getCategory().then(response=>{
+ // getCategory().then(response=>{
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
},
handleRemove(file) {
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 760c740..1858d8e 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -626,7 +626,7 @@
} from "@/api/collection/index";
import {listUserAll} from "@/api/root/index";
import {Message} from "element-ui";
-
+import {showShareUser} from "@/api/bignote/index";
export default {
name: "index",
@@ -935,26 +935,17 @@
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]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2018).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) {
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 339f1d8..2d2a081 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -606,6 +606,7 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {getContactList,enload, addContact, delContact,uploadPic,
@@ -949,26 +950,17 @@
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]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2021).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) {
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 61db026..6066f93 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -556,7 +556,7 @@
} from "@/api/device/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
-
+import {showShareUser} from "@/api/bignote/index";
export default {
name: "Role",
@@ -564,6 +564,7 @@
data() {
return {
// 鍒嗕韩缁欒皝鐨刲ist
+ total1: 0,
listRoot: [],
open1:false,
open2:false,
@@ -858,25 +859,15 @@
},
getList1() {
this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2017).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) {
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index d0dbc35..fb4eb05 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -565,7 +565,7 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
-
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic,listType,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -882,26 +882,15 @@
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]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2019).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) {
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 1aeb72d..6079dc1 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -519,13 +519,14 @@
} from "@/api/economy/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {listUserAll} from "@/api/root/index";
-
+import {showShareUser} from "@/api/bignote/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
// 鍒嗕韩缁欒皝鐨刲ist
+ total1:0,
listRoot: [],
open1:false,
open2:false,
@@ -838,25 +839,15 @@
},
getList1() {
this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2023).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) {
@@ -962,12 +953,12 @@
getCateInfor()
{
let _this = this
- getCategory().then(response=>{
+ // getCategory().then(response=>{
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
},
// 鍙栨秷鎸夐挳
cancel() {
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 10e0795..f9401cf 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -148,6 +148,9 @@
plain
icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
<template #dropdown>
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
<el-dropdown-menu>
<el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
@@ -531,6 +534,7 @@
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import {showShareUser} from "@/api/bignote/index";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
@@ -546,6 +550,7 @@
data() {
return {
// 鍒嗕韩缁欒皝鐨刲ist
+ total1:0,
listRoot: [],
open1:false,
open2:false,
@@ -832,25 +837,15 @@
},
getList1() {
this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- this.queryParams.clanId = this.$store.state.user.clanId
- listUserAll(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, 2002).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) {
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