From 80e0b09695493b7f811f746dfb7158244088afe3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 22 九月 2024 11:02:56 +0800
Subject: [PATCH] 修改了多个bug
---
ruoyi-ui/src/views/self/memo.vue | 54 +++-
ruoyi-ui/src/views/clanManager/ancestor/index.vue | 62 +----
ruoyi-ui/src/views/marry/index.vue | 2
ruoyi-ui/src/views/travel/index.vue | 16
ruoyi-ui/src/views/bignote/index.vue | 16
ruoyi-ui/src/views/contacts/index.vue | 16
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/system/user/index.vue | 4
ruoyi-ui/src/views/economy/index.vue | 16
ruoyi-ui/src/views/pet/index.vue | 16
ruoyi-ui/src/views/secret/index.vue | 60 +++--
ruoyi-ui/src/views/wish/index.vue | 60 +++--
ruoyi-ui/src/views/collection/index.vue | 16
ruoyi-ui/src/views/healthy/index.vue | 2
ruoyi-ui/src/views/doctor/index.vue | 16
ruoyi-ui/src/views/honor/index.vue | 61 +++--
ruoyi-ui/src/views/self/show.vue | 2
ruoyi-ui/src/views/device/index.vue | 22 +-
ruoyi-ui/src/views/clean/index.vue | 16
ruoyi-ui/src/views/selfeconomy/index.vue | 59 +++--
ruoyi-ui/src/layout/components/TagsView/index.vue | 4
ruoyi-ui/src/router/index.js | 5
ruoyi-ui/src/views/note/index.vue | 16
23 files changed, 303 insertions(+), 240 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 40b1c87..bc9faf1 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -1,6 +1,8 @@
<template>
<div id="tags-view-container" class="tags-view-container">
+
<scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+
<router-link
v-for="tag in visitedViews"
ref="tag"
@@ -16,7 +18,9 @@
{{ tag.title }}
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link>
+
</scroll-pane>
+
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 鍒锋柊椤甸潰</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 鍏抽棴褰撳墠</li>
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 527e438..b08668b 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -338,9 +338,12 @@
{
path: '/familymodel/Device',
component: Layout,
+ name: 'ZfDevice',
// permissions: [],
- hidden: true,
+ // hidden: true,
permissions: ['familymodel:device:info'],
+ component: () => import('@/views/device/index'),
+
children: [
{
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index ab1971a..6efa7e2 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -530,7 +530,7 @@
import {listUserAll} from "@/api/root/index";
import {getInfo} from "@/api/login";
export default {
- name: "Role",
+ name: "ZfEvent",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -844,13 +844,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;
}
);
diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 52aa510..51c32da 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -8,48 +8,14 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.name"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input
- v-model="queryParams.phonenumber"
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select
- v-model="queryParams.status"
- placeholder="鐢ㄦ埛鐘舵��"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
+
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -79,7 +45,7 @@
>淇敼</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="info"
plain
@@ -88,7 +54,7 @@
@click="handleImport"
v-hasPermi="['system:user:import']"
>瀵煎叆</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@@ -157,7 +123,7 @@
<el-row>
<el-col :span="12" >
- <el-form-item label="瀹舵棌鍚嶇О" prop="clanId">
+ <el-form-item label="閫夊鏃忓彿" prop="clanId">
<el-select v-model="form.clanId" placeholder="璇疯緭鍏ュ鏃忓悕绉�">
<el-option
@@ -459,6 +425,7 @@
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getList() {
this.loading = true;
+ alert(this.queryParams.name)
//alert(this.queryParams.pageNum)
listAncestor(this.queryParams).then(response => {
this.userList = response.data.data;
@@ -529,7 +496,8 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.userId);
+ this.ids = selection.map(item => item.id);
+ console.log(this.ids+"----------")
this.single = selection.length != 1;
this.multiple = !selection.length;
},
@@ -715,9 +683,17 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/user/export', {
- ...this.queryParams
- }, `user_${new Date().getTime()}.xlsx`)
+ const Ids = this.ids;
+alert(Ids)
+ if(Ids.length==0)
+ {
+ this.download('/ZfAncestor/export', {
+ ...this.queryParams
+ }, `zIdea_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/ZfAncestor/export1/'+Ids, {
+ }, `zIdea_${new Date().getTime()}.xlsx`)
+ }
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 1fa576f..1a0a7f6 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -561,7 +561,7 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
- name: "Role",
+ name: "ZfClean",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -891,13 +891,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;
}
);
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 59a8756..4560e30 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -630,7 +630,7 @@
import {getAllInfo} from "@/api/system/user"
export default {
- name: "index",
+ name: "ZfCollection",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -959,13 +959,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;
}
);
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 4f52365..9082c35 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -615,7 +615,7 @@
} from "@/api/contacts/index";
import {listUserAll} from "@/api/root/index";
export default {
- name: "index",
+ name: "ZfContact",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -973,13 +973,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;
}
);
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index bc6dbda..731c75b 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -560,7 +560,7 @@
import {showShareUser} from "@/api/bignote/index";
export default {
- name: "Role",
+ name: "ZfDevice",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -662,7 +662,8 @@
buyer:undefined,
location:undefined,
createDate:undefined,
- happenTime:undefined
+ happenTime:undefined,
+ name:undefined,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -880,13 +881,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;
}
);
@@ -949,7 +950,8 @@
this.loading = true;
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
- // console.log(this.queryParams)
+ console.log(this.queryParams)
+ //alert(this.queryParams.name)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let _this = this
listEquipment(this.queryParams).then(response => {
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 9c357de..d670be8 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -574,7 +574,7 @@
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
- name: "index",
+ name: "ZfDoctor",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -903,13 +903,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;
}
);
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 5a6b090..a90ab90 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -522,7 +522,7 @@
import {listUserAll} from "@/api/root/index";
import {showShareUser} from "@/api/bignote/index";
export default {
- name: "Role",
+ name: "ZfEconomy",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -859,13 +859,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;
}
);
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index bd58e64..05e1e18 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -374,7 +374,7 @@
import {Message} from "element-ui";
export default {
- name: "Role",
+ name: "ZYearInfo",
dicts: ['sys_normal_disable'],
data() {
return {
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 5c5ba9c..7751898 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -536,8 +536,8 @@
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";
-
-
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
//瀵煎叆鎺ュ彛鍑芥暟
import {listHonor,listType,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -545,10 +545,11 @@
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
- name: "index",
+ name: "ZHonor",
dicts: ['sys_normal_disable'],
data() {
return {
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -854,26 +855,40 @@
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;
- }
- );
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2030).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ 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')
+ this.loading1 = false;
+ }
+ );
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 5957b93..098c5d0 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -540,7 +540,7 @@
import {getInfo} from "@/api/login";
export default {
- name: "show",
+ name: "ZMarry",
dicts: ['sys_normal_disable'],
data() {
return {
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 756e15f..cf5c502 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -543,7 +543,7 @@
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
- name: "Role",
+ name: "ZfProperty",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -856,13 +856,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;
}
);
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 4a65227..fc8d9ae 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -490,7 +490,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 {
@@ -899,13 +899,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;
}
);
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index f736a4c..255e4af 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -555,7 +555,8 @@
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";
-
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {listSecret,enload,delSecret, addSecret, uploadPic,getCategory,
@@ -566,10 +567,11 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
- name: "Role",
+ name: "ZSecret",
dicts: ['sys_normal_disable'],
data() {
return {
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -888,26 +890,40 @@
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;
- }
- );
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2031).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ 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')
+ this.loading1 = false;
+ }
+ );
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 06997d4..e752d65 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -740,6 +740,8 @@
getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
getCategory,
} from "@/api/self/index";
+import {getAllInfo} from "@/api/system/user"
+import {showShareUser} from "@/api/bignote/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
@@ -1004,26 +1006,40 @@
})
},
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]})
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2062).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ 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')
+ this.loading1 = false;
}
- for(let i in this.userOptions){
- this.userList.push(this.userOptions[i].value)
- }
- console.log(this.userList,'userListuserListuserList')
- this.loading1 = false;
- }
- );
+ );
},
/** 鏌ヨ璁板綍鍒楄〃 */
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 0619d9c..5c64fff 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -587,7 +587,7 @@
export default {
- name: "show",
+ name: "Self",
dicts: ['sys_normal_disable'],
data() {
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index c1c5a02..1353cf3 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -582,7 +582,8 @@
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";
-
+import {getAllInfo} from "@/api/system/user"
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel,
@@ -593,7 +594,7 @@
export default {
- name: "index",
+ name: "ZProperty",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -935,26 +936,40 @@
// this.multiple1 = !selection.length
},
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;
- }
- );
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2026).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ 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')
+ this.loading1 = false;
+ }
+ );
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 88d13cc..2583850 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -89,7 +89,7 @@
v-hasPermi="['system:user:remove']"
>鍋滅敤</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="info"
plain
@@ -98,7 +98,7 @@
@click="handleImport"
v-hasPermi="['system:user:import']"
>瀵煎叆</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 205a542..2bed287 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -743,7 +743,7 @@
import {delFamilyevent, listFamilyevent} from "@/api/bignote";
export default {
- name: "Role",
+ name: "Ztravel",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -1181,13 +1181,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;
}
);
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 9d1254e..5595e96 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -575,8 +575,8 @@
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";
-
-
+import {getAllInfo} from "@/api/system/user"
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel,enload,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -587,10 +587,11 @@
export default {
- name: "index",
+ name: "Bainianxinyuan",
dicts: ['sys_normal_disable'],
data() {
return {
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -895,25 +896,40 @@
},
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;
- }
- );
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2027).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ 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')
+ this.loading1 = false;
+ }
+ );
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 0b0cb0e..a63d8be 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// 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://192.168.1.7:8080/`,
+ //target: `https://192.168.1.7:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1