From fa7044f3ccc9a91bc2bc117d1a06f650d86554f2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 15 六月 2021 16:07:16 +0800
Subject: [PATCH] 优化联动规则加载场景列表的操作
---
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
index bfe6e92..f254def 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
@@ -211,7 +211,7 @@
@mouseover="showDemo=true"
@mouseout="showDemo=false"
>绀轰緥</a>),鐐瑰嚮
- <a href="javascript:;">涓嬭浇妯℃澘.excel</a>
+ <a href="javascript:;" @click="downloadExcel">涓嬭浇妯℃澘.excel</a>
<img class="tip-demo" v-if="showDemo" :src="`${publicPath}images/shuohuang/tip.jpg`" alt />
</p>
<div class="flex-box">
@@ -232,7 +232,7 @@
<script>
-import { getShuohuangDepartTree, getOrganizeTree, getMemberList, updateMemberInfo, addMember, updateUnit, uploadMemberPic, uploadDirectory, uploadFile } from '@/api/shuohuang'
+import { getShuohuangDepartTree, getOrganizeTree, getMemberList, updateMemberInfo, addMember, updateUnit, uploadMemberPic, uploadDirectory, uploadFile,downloadFile } from '@/api/shuohuang'
export default {
data () {
return {
@@ -255,7 +255,8 @@
tableTotal: 0,
PageSize: 8,
organizeData: [],
- checkedOrg: '',
+ checkedOrgID: '',
+ checkedOrgName:"",
organizeKeyword: '',
memberEditDialogVisible: false,
toggleOrganizeDialogVisible: false,
@@ -286,13 +287,22 @@
this.renderMemberTable();
},
isPhone (rule, value, callback) {
- if (value.trim()) {
- var pattern = /^1[345789]\d{9}$/
+ if (!value) {
+ return callback()
+ } else if (value.trim()) {
+ var pattern = /^1[345789]\d{9}$/
if (pattern.test(value)) {
return callback()
}
return callback(new Error('杈撳叆鐨勬墜鏈哄彿閿欒'))
}
+ // if (value.trim()) {
+ // var pattern = /^1[345789]\d{9}$/
+ // if (pattern.test(value)) {
+ // return callback()
+ // }
+ // return callback(new Error('杈撳叆鐨勬墜鏈哄彿閿欒'))
+ // }
},
nodeContextMenu (e, data, node, comp) {
this.showMenu = true;
@@ -300,14 +310,22 @@
this.menuLeft = e.pageX;
},
checkOrgNode (a, b, c) {
- this.checkedOrg = a.id
+ this.checkedOrgID = a.id
+ this.checkedOrgName = a.label
+ },
+ downloadExcel(){
+ downloadFile().then(function (res) {
+ // debugger
+ console.log(res);
+ })
},
updateOrg () {
let ids = this.multipleTableSelection.map(row => {
return row.ID
});
let params = {
- DeptID: this.checkedOrg,
+ DeptID: this.checkedOrgID,
+ DeptName:this.checkedOrgName,
Users: ids.join(',')
}
updateUnit(params).then(res => {
@@ -318,6 +336,7 @@
});
this.toggleOrganizeDialogVisible = false;
this.renderMemberTable();
+ this.searchLeftTreeData()
}
})
@@ -420,7 +439,6 @@
//formData.append('files', this.$refs['directoryInput'].files)
uploadDirectory(formData).then(res => {
- debugger
_this.batchImportTableData = res.data;
_this.renderMemberTable();
})
--
Gitblit v1.8.0