From 12e90cca31d377e28cfe5c6442509841991308e9 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 25 二月 2021 11:00:57 +0800
Subject: [PATCH] ztree分析图标着色；应用中心产品详情弹框初步搭建
---
src/pages/shuohuangMonitorAnalyze/components/memberManage.vue | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
index fb52efc..bfe6e92 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/memberManage.vue
@@ -33,11 +33,12 @@
<el-option
v-for="item in genders"
:key="item.id"
- :value="item.id"
+ :value="item.name=='鍏ㄩ儴'?'':item.name"
:label="item.name"
>{{item.name}}</el-option>
</el-select>
<el-button type="primary" size="small" @click="renderMemberTable">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="resetFilter">閲嶇疆</el-button>
</div>
<div class="table-area">
<div class="actions">
@@ -157,7 +158,7 @@
<el-form-item label="韬唤璇佸彿:">
<el-input v-model="memberEditForm.OwnerID" size="mini"></el-input>
</el-form-item>
- <el-form-item label="鎵嬫満鍙�:">
+ <el-form-item label="鎵嬫満鍙�:" prop="Tel">
<el-input v-model="memberEditForm.Tel" size="mini"></el-input>
</el-form-item>
<div class="btns">
@@ -220,9 +221,9 @@
</div>
<el-table class="thbg" :data="batchImportTableData" fit>
<el-table-column type="index" label="搴忓彿"></el-table-column>
- <el-table-column prop="filename" label="鏂囦欢鍚嶇О"></el-table-column>
- <el-table-column prop="time" label="涓婁紶鏃堕棿"></el-table-column>
- <el-table-column prop="state" label="鐘舵��"></el-table-column>
+ <el-table-column prop="Name" label="鏂囦欢鍚嶇О"></el-table-column>
+ <el-table-column prop="UploadTime" label="涓婁紶鏃堕棿"></el-table-column>
+ <el-table-column prop="Status" label="鐘舵��"></el-table-column>
</el-table>
</div>
</el-dialog>
@@ -232,7 +233,6 @@
<script>
import { getShuohuangDepartTree, getOrganizeTree, getMemberList, updateMemberInfo, addMember, updateUnit, uploadMemberPic, uploadDirectory, uploadFile } from '@/api/shuohuang'
-
export default {
data () {
return {
@@ -247,7 +247,7 @@
menuLeft: 0,
keyword: '',
gender: '',
- genders: [{ name: '鐢�', id: 'g0' }, { name: '濂�', id: 'g1' }],
+ genders: [{id:'g3',name:'鍏ㄩ儴'},{ name: '鐢�', id: 'g0' }, { name: '濂�', id: 'g1' }],
tableData: [],
multipleTableSelection: [],
PageIndex: 1,
@@ -265,7 +265,8 @@
memberEditFormRule: {
Name: [{ required: true, message: '璇疯緭鍏ュ鍚�', trigger: 'change' }],
UserName: [{ required: true, message: '璇疯緭鍏ュ鍚�', trigger: 'change' }],
- Sex: [{ required: true, message: '璇烽�夋嫨鎬у埆', trigger: 'change' }]
+ Sex: [{ required: true, message: '璇烽�夋嫨鎬у埆', trigger: 'change' }],
+ Tel: [{ validator: this.isPhone, trigger: 'change' }],
},
memberPicUrl: '',
showDemo: false,
@@ -279,6 +280,20 @@
},
methods: {
+ resetFilter(){
+ this.keyword = '';
+ this.gender = '';
+ this.renderMemberTable();
+ },
+ isPhone (rule, value, callback) {
+ 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;
this.menuTop = e.pageY;
@@ -313,7 +328,7 @@
memberSave () {
this.$refs['memberForm'].validate((valid) => {
if (valid) {
- let params = Object.assign({DeptID:this.curLeftTreeNode.id},this.memberEditForm);
+ let params = Object.assign({ DeptID: this.curLeftTreeNode.id }, this.memberEditForm);
if (this.memberEditForm.ID) {
updateMemberInfo(params).then(res => {
if (res.success) {
@@ -379,7 +394,7 @@
let _this = this;
let params = {
DeptID: this.deptId,
- keyword: this.keyword,
+ Keyword: this.keyword,
Sex: this.gender,
PageIndex: this.PageIndex,
PageSize: this.PageSize
@@ -396,16 +411,18 @@
this.$refs['directoryInput'].click();
},
importDirectory () {
+ let _this = this;
//this.$refs['directoryInput'].files //鏂囦欢澶筸ap
let formData = new FormData;
- for(var file in this.$refs['directoryInput'].files){
+ for (var file in this.$refs['directoryInput'].files) {
formData.append('files', this.$refs['directoryInput'].files[file])
}
//formData.append('files', this.$refs['directoryInput'].files)
- uploadDirectory(formData).then(res=>{
+ uploadDirectory(formData).then(res => {
debugger
-
+ _this.batchImportTableData = res.data;
+ _this.renderMemberTable();
})
},
@@ -483,10 +500,10 @@
return obj
});
this.$nextTick(() => {
- if(!Object.keys(_this.curLeftTreeNode).length){
+ if (!Object.keys(_this.curLeftTreeNode).length) {
_this.curLeftTreeNode = _this.treeData[0];
_this.$refs['leftTreeNodes'].setCurrentNode(_this.treeData[0]);
- }else{
+ } else {
_this.$refs['leftTreeNodes'].setCurrentNode(_this.curLeftTreeNode);
}
_this.checkNode(_this.curLeftTreeNode);
--
Gitblit v1.8.0