From 67ff22602500a4dae22e638ec4e04f0a287c7c31 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期日, 04 二月 2024 08:38:29 +0800 Subject: [PATCH] 登录调取接口 --- src/views/Login.vue | 57 ++++++++++++++++++++++++++++ src/views/Admin/notice.vue | 8 +-- 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/src/views/Admin/notice.vue b/src/views/Admin/notice.vue index 4401a79..3b8c67e 100644 --- a/src/views/Admin/notice.vue +++ b/src/views/Admin/notice.vue @@ -301,6 +301,8 @@ components: {}, created() { const t = this + t.getAreaUsers() + t.areaUsers = JSON.parse(localStorage.getItem('areaUsers')) const { baseUrl } = require('../../../config/env.' + process.env.NODE_ENV) @@ -310,7 +312,6 @@ t.form.districtId = t.userInfo.districtId t.form.publishingUnit = t.userInfo.company t.getSameLevel() - t.getAreaUsers() t.getLeaders() }, computed: {}, @@ -336,11 +337,9 @@ let res = await getAreaWithUserIfo() if (res.data.code == 100) { if (res.data.data) { - // const treeD = [] t.userTitTree(res.data.data) - // treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId)) const treeD = t.findNodeById(res.data.data, t.userInfo.districtId) - t.areaUsers = treeD.children + // t.areaUsers = treeD.children t.unittype = treeD.type } else { console.log('暂无数据') @@ -479,7 +478,6 @@ if (valid) { this.form.acceptingUnitIds = [] this.form.peerRecipientIds = [] - const aList = this.form.receiver.map(item => this.findNodeById(this.areaUsers, item.value) ?.users) if (aList.includes(null)) { diff --git a/src/views/Login.vue b/src/views/Login.vue index 44925d8..9eb9abe 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -107,6 +107,8 @@ import { login, getMenuAdmin } from "@/api/login"; import Cookies from 'js-cookie'; import {Base64} from "js-base64"; +import {getAreaWithUserIfo} from "@/api/user"; + export default { name: "login", @@ -156,6 +158,7 @@ Cookies.set('resTk', res.data.data.tk); Cookies.set('resUid', res.data.data.uid); Cookies.set('userInfo',JSON.stringify(res.data.data),{expires: 7}) + await this.getAreaUsers(res.data.data.districtId) if (this.saveAccount) { localStorage.setItem('userName', this.form.name) localStorage.setItem('userPassword', Base64.encode(this.form.pwd)) @@ -173,6 +176,60 @@ return false; } }); + }, + + async getAreaUsers(districtId) { + let t = this + let res = await getAreaWithUserIfo() + if (res.data.code == 100) { + if (res.data.data) { + t.userTitTree(res.data.data) + const areaUsers = t.findNodeById(res.data.data, districtId).children + localStorage.removeItem('areaUsers') + localStorage.setItem('areaUsers',JSON.stringify(areaUsers)) + } else { + console.log('暂无数据') + } + } else { + this.$message.warning(res.data.msg); + } + }, + + // 根据id查对象 + findNodeById(data, value) { + for (const node of data) { + if (node.id === value) { + return node; + } + if (node.children) { + const foundNode = this.findNodeById(node.children, value); + if (foundNode) { + return foundNode; + } + } + } + return null; + }, + + // 将树状数据name字段放入users的姓名电话 + userTitTree(treeData) { + for (const node of treeData) { + if (node.users) { + node.users = node.users.filter(i => i.roleId == 3) + node.users = node.users.map((i) => { + return { + ...i, + unittype: node.type, + districtId: node.id + } + }) + node.name = node.name + '(' + node.users.map(i => i.realName + ' ' + i.phone).join(',') + ')' + } + if (node.children) { + this.userTitTree(node.children) + } + } + return treeData } }, }; -- Gitblit v1.9.2