From e2bb6ac06fd08dbeed769efd18bc9b5ba3577bdd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 12 Apr 2023 08:44:29 +0800 Subject: [PATCH] =?UTF-8?q?refector:=20=E5=8E=BB=E9=99=A4getuserrange?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/userRegister.vue | 55 ------------------------ pages/workSpace/newWork/userList.vue | 17 -------- pages/workSpace/operation/workerList.vue | 18 ++------ pages/workSpace/opls/high.vue | 20 --------- pages/workSpace/opls/soil.vue | 20 --------- pages/workSpace/opls/space.vue | 20 --------- pages/workSpace/opls/usecl.vue | 20 --------- pages/workSpace/visit/vpeopleSelect.vue | 4 +- 8 files changed, 6 insertions(+), 168 deletions(-) diff --git a/pages/login/userRegister.vue b/pages/login/userRegister.vue index 248a43d..9f16989 100644 --- a/pages/login/userRegister.vue +++ b/pages/login/userRegister.vue @@ -169,7 +169,6 @@ uni.setStorageSync('mySecret', JSON.stringify(mySecret)) }).catch(e => {}) // #endif - that.getUserRange(); }) }, ranStr(e) { @@ -190,60 +189,6 @@ codeChange(text) { this.codeTips = text; }, - getUserRange() { - let that = this; - that.$u.api.deptList({ - page: 0, - type__in: 'rparty,dept', - query: '{id, name, parent, type}' - }).then(res => { - let list1 = res; - let list2 = []; - let reqList = []; - list1.forEach(function(item) { - reqList.push(that.$u.api.userList({ - page: 0, - belong_dept: item.id, - is_active: true, - query: '{id, name, belong_dept}' - })) - }) - Promise.all(reqList).then(res => { - for (let i = 0; i < res.length; i++) { - list1[i].children = res[i] - } - list1.forEach(item => { - if (item.type == 'dept') { - list2.push({ - ...item - }) - } - }) - that.$u.vuex('vuex_userRange', that.parseData(list1)) - that.$u.vuex('vuex_userRange2', that.parseData(list2)) - }) - }) - }, - parseData(data) { - // * 先生成parent建立父子关系 - const obj = {}; - data.forEach((item) => { - obj[item.id] = item; - }); - const parentList = []; - data.forEach((item) => { - const parent = obj[item.parent]; - if (parent) { - // * 当前项有父节点 - parent.children = parent.children || []; - parent.children.unshift(item); - } else { - parentList.push(item); - } - }); - return parentList; - }, - // 获取验证码 getCode(e) { // debugger; diff --git a/pages/workSpace/newWork/userList.vue b/pages/workSpace/newWork/userList.vue index 4e3c822..253c584 100644 --- a/pages/workSpace/newWork/userList.vue +++ b/pages/workSpace/newWork/userList.vue @@ -84,25 +84,8 @@ }, onShow() { - // this.getUserRange(); }, methods: { - //获取用户 - getUserRange() { - let that = this; - this.$u.api.vmVisitor({ - page: 0 - }).then(res => { - that.userRange = []; - res.forEach(item => { - let obj = {}; - obj = item; - obj.checked = false; - that.userRange.push(obj) - }) - - }) - }, select(row) {}, goBack() { uni.navigateBack({ diff --git a/pages/workSpace/operation/workerList.vue b/pages/workSpace/operation/workerList.vue index 4041897..60f6ca7 100644 --- a/pages/workSpace/operation/workerList.vue +++ b/pages/workSpace/operation/workerList.vue @@ -34,10 +34,6 @@ {{worker_name}} - @@ -63,7 +59,7 @@ - + @@ -390,21 +386,15 @@ } .dialogCont { - /* width: 80vw; + width: 90vw; position: absolute; top: 50%; margin: auto; background-color: #ffffff; - left: 10vw; + left: 5vw; transform: translateY(-50%); padding: 20rpx; - border-radius: 20rpx; */ - width: 100vw; - position: absolute; - top: 61px; - height: 100vh; - padding: 30rpx; - background-color: #ffffff; + border-radius: 20rpx; } .dialogTitle { diff --git a/pages/workSpace/opls/high.vue b/pages/workSpace/opls/high.vue index 525ad4c..cd72540 100644 --- a/pages/workSpace/opls/high.vue +++ b/pages/workSpace/opls/high.vue @@ -248,7 +248,6 @@ this.getOplcates(); this.getdept(); this.getRange(); - // this.getUserRange(); this.getHeader(); }, methods: { @@ -397,25 +396,6 @@ this.range = range }) }, - //获取用户 - getUserRange() { - this.$u.api.userList({ - page: 0 - }).then(res => { - let user = []; - let obj = {}; - res.forEach(item => { - obj = { - value: null, - text: '' - }; - obj.value = item.id; - obj.text = item.name; - user.push(obj); - }) - this.userRange = user - }) - }, //获取dept getdept() { let that = this; diff --git a/pages/workSpace/opls/soil.vue b/pages/workSpace/opls/soil.vue index 47eff9d..3e7726e 100644 --- a/pages/workSpace/opls/soil.vue +++ b/pages/workSpace/opls/soil.vue @@ -240,7 +240,6 @@ this.getOplcates(); this.getdept(); this.getRange(); - // this.getUserRange(); this.getHeader(); }, methods: { @@ -390,25 +389,6 @@ this.range = range }) }, - //获取用户 - getUserRange() { - this.$u.api.userList({ - page: 0 - }).then(res => { - let user = []; - let obj = {}; - res.forEach(item => { - obj = { - value: null, - text: '' - }; - obj.value = item.id; - obj.text = item.name; - user.push(obj); - }) - this.userRange = user - }) - }, //获取dept getdept() { let that = this; diff --git a/pages/workSpace/opls/space.vue b/pages/workSpace/opls/space.vue index 529935e..f1da2da 100644 --- a/pages/workSpace/opls/space.vue +++ b/pages/workSpace/opls/space.vue @@ -243,7 +243,6 @@ this.getOplcates(); this.getdept(); this.getRange(); - // this.getUserRange(); this.getHeader(); }, methods: { @@ -392,25 +391,6 @@ this.range = range }) }, - //获取用户 - getUserRange() { - this.$u.api.userList({ - page: 0 - }).then(res => { - let user = []; - let obj = {}; - res.forEach(item => { - obj = { - value: null, - text: '' - }; - obj.value = item.id; - obj.text = item.name; - user.push(obj); - }) - this.userRange = user - }) - }, //获取dept getdept() { let that = this; diff --git a/pages/workSpace/opls/usecl.vue b/pages/workSpace/opls/usecl.vue index 0e8777c..634e395 100644 --- a/pages/workSpace/opls/usecl.vue +++ b/pages/workSpace/opls/usecl.vue @@ -350,7 +350,6 @@ this.getOplcates(); this.getdept(); this.getRange(); - // this.getUserRange(); this.getHeader(); }, methods: { @@ -502,25 +501,6 @@ this.range = range }) }, - //获取用户 - getUserRange() { - this.$u.api.userList({ - page: 0 - }).then(res => { - let user = []; - let obj = {}; - res.forEach(item => { - obj = { - value: null, - text: '' - }; - obj.value = item.id; - obj.text = item.name; - user.push(obj); - }) - this.userRange = user - }) - }, //获取dept getdept() { let that = this; diff --git a/pages/workSpace/visit/vpeopleSelect.vue b/pages/workSpace/visit/vpeopleSelect.vue index 4b384e1..0a32bd4 100644 --- a/pages/workSpace/visit/vpeopleSelect.vue +++ b/pages/workSpace/visit/vpeopleSelect.vue @@ -172,7 +172,7 @@ }, onShow() { this.getHeader(); - this.getUserRange(); + this.getVisitorRange(); }, methods: { getHeader() { @@ -190,7 +190,7 @@ this.formData.test_report = data.path; }, //获取所有已注册游客 - getUserRange() { + getVisitorRange() { let that = this; that.$u.api.vmVisitor({ page: 0