From f20a554bdb24e9dfde9dc6a69d78595944f61d15 Mon Sep 17 00:00:00 2001 From: mark <mark18340872469@163.com> Date: 星期二, 25 十月 2022 14:53:57 +0800 Subject: [PATCH] 设备管理 样式调整 --- src/views/personalCenter/components/SubAccount.vue | 650 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 333 insertions(+), 317 deletions(-) diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue index 380ef3a..996cc34 100644 --- a/src/views/personalCenter/components/SubAccount.vue +++ b/src/views/personalCenter/components/SubAccount.vue @@ -10,7 +10,11 @@ <div class="cluster"> 鎺堟潈鏃堕暱 - <el-select v-model="cluster" placeholder="璇烽�夋嫨"> + <el-select + @change="findUserList" + v-model="timeLength" + placeholder="璇烽�夋嫨" + > <el-option v-for="item in durationArr" :key="item.value" @@ -23,72 +27,65 @@ </div> <div class="right"> - <div class="button searchBtn" @click="searchingBtn">鎼滅储</div> - <div class="button resetBtn" @click="clearSearch">閲嶇疆</div> + <div class="button searchBtn" @click="findUserList">鎼滅储</div> + <div class="button resetBtn" @click="reset">閲嶇疆</div> </div> </div> <div class="btns"> - <div class="button add" @click="isShowAdd = true"> + <div class="button add" @click="addSubCount"> <span class="iconfont"></span> <span>娣诲姞瀛愯处鍙�</span> </div> - <div class="button export" @click="isShowRelate = true"> + <!-- <div class="button export" @click="isShowRelate = true"> <span class="iconfont"></span> <span>鍏宠仈瀛愯处鍙�</span> - </div> + </div> --> </div> <div class="table-area"> <el-table id="multipleTable" ref="multipleTable" - tooltip-effect="dark" :data="dataList" :fit="true" :default-sort="{ prop: 'createTime', order: 'descending' }" - :stripe="true" > <el-table-column label="搴忓彿" width="55" class-name="index"> <template slot-scope="scope">{{ scope.$index + 1 + (page - 1) * size }}</template> </el-table-column> - <el-table-column - prop="name" + <!-- <el-table-column + prop="trueName" label="濮撳悕" + show-overflow-tooltip + ></el-table-column> --> + <el-table-column + prop="username" + label="鐢ㄦ埛鍚�" show-overflow-tooltip ></el-table-column> <el-table-column - prop="phone" + prop="phoneNum" label="鎵嬫満鍙�" show-overflow-tooltip ></el-table-column> - <el-table-column prop="userType" label="鐢ㄦ埛绫诲瀷"></el-table-column> - <el-table-column prop="duration" label="鎺堟潈鏃堕暱"></el-table-column> - <el-table-column prop="authList" label="鏉冮檺"></el-table-column> - <!-- <el-table-column label="瀹夎鏃堕棿" > + <el-table-column prop="userType" label="鐢ㄦ埛绫诲瀷"> <template slot-scope="scope"> - <div v-if="scope.row.installTime.length > 1"> - <div>{{ scope.row.installTime[0] }}</div> - <div>{{ scope.row.installTime[1] }}</div> - </div> - <div v-else>--</div> - </template> - </el-table-column> --> - <!-- <el-table-column label="棣栨浣跨敤鏃堕棿" > - <template slot-scope="scope"> - <div v-if="scope.row.firstUseTime.length > 1"> - <div>{{ scope.row.firstUseTime[0] }}</div> - <div>{{ scope.row.firstUseTime[1] }}</div> - </div> - <div v-else>--</div> + <span>{{ scope.row.userType == 1 ? "涓汉" : "鍏徃" }}</span> </template> </el-table-column> - <el-table-column label="鎵�灞為泦缇�" show-overflow-tooltip > - <template> -- </template> + <el-table-column prop="authDuration" label="鎺堟潈鏃堕暱"> + <template slot-scope="scope"> + <span>{{ scope.row.authDuration + " 骞�" }} </span> + </template> + </el-table-column> + + <!-- <el-table-column prop="authDuration" label="鎺堟潈鏃堕暱"> </el-table-column> --> + <el-table-column prop="dataNames" label="鏉冮檺"> </el-table-column> <el-table-column label="鐘舵��"> <template slot-scope="scope"> @@ -99,14 +96,8 @@ <el-table-column label="鎿嶄綔"> <template slot-scope="scope"> - <!-- 缂栬緫 --> - <span class="iconfont option" @click="joinCluster(scope.row)" - ></span - > - - <!-- 瑙g粦 --> - <span class="iconfont option" @click="Untying(scope.row)" - ></span + <span class="iconfont option" @click="editUser(scope.row)" + >缂栬緫</span > </template> </el-table-column> @@ -124,31 +115,6 @@ ></el-pagination> </div> </div> - - <!-- 瑙g粦寮圭獥 --> - <UnbindBox - @close="closeUnbindBox" - v-if="isShowUnbind" - :id="unbindId" - @reflash="reflash" - ></UnbindBox> - - <!-- 娣诲姞璁惧寮圭獥 --> - <!-- <AddBox @close="closeAddBox" v-if="isShowAdd"></AddBox> --> - - <!-- 閫�鍑洪泦缇ゅ脊绐� --> - <QuitClusterBox - :equipment="activeEquipment" - v-if="showQuit" - @close="showQuit = false" - ></QuitClusterBox> - - <!-- 鍔犲叆闆嗙兢寮圭獥 --> - <JoinClusterBox - :equipment="activeEquipment" - v-if="showJoin" - @close="showJoin = false" - ></JoinClusterBox> </div> <div class="sub-account" v-else-if="isShowAdd"> <div class="add-title" @click="isShowAdd = false"> @@ -163,57 +129,95 @@ label-width="100px" class="add-ruleForm" > - <el-form-item label="鐢ㄦ埛鍚�" prop="name"> - <el-input v-model="ruleForm.name"></el-input> + <el-form-item label="鐢ㄦ埛鍚�" prop="username"> + <el-input v-model="ruleForm.username" style="width: 350px"></el-input> </el-form-item> - <el-form-item label="瀵嗙爜" prop="name"> - <el-input v-model="ruleForm.password"></el-input> + <el-form-item label="瀵嗙爜" prop="password"> + <el-input v-model="ruleForm.password" style="width: 350px"></el-input> </el-form-item> - <el-form-item label="閲嶇疆瀵嗙爜" prop="delivery"> - <el-checkbox v-model="ruleForm.delivery">棣栨鐧婚檰淇敼瀵嗙爜</el-checkbox> + <!-- <el-form-item label="閲嶇疆瀵嗙爜"> + <el-checkbox v-model="ruleForm.isChangePwd" + >棣栨鐧婚檰淇敼瀵嗙爜</el-checkbox + > + </el-form-item> --> + <el-form-item label="鐢ㄦ埛绫诲瀷" prop="userType"> + <el-radio v-model="ruleForm.userType" :label="1">涓汉</el-radio> + <el-radio v-model="ruleForm.userType" :label="2">鍏徃</el-radio> </el-form-item> - <el-form-item label="鐢ㄦ埛绫诲瀷" prop="type"> - <el-radio v-model="ruleForm.type" label="1">涓汉</el-radio> - <el-radio v-model="ruleForm.type" label="2">鍏徃</el-radio> + <el-form-item label="濮撳悕" prop="trueName"> + <el-input v-model="ruleForm.trueName" style="width: 350px"></el-input> </el-form-item> - <el-form-item label="濮撳悕" prop="name"> - <el-input v-model="ruleForm.name"></el-input> - </el-form-item> - <el-form-item label="閭" prop="name"> - <el-input v-model="ruleForm.password"></el-input> + <el-form-item label="閭"> + <el-input v-model="ruleForm.email" style="width: 350px"></el-input> </el-form-item> - <el-form-item label="琛屼笟" prop="region"> - <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨琛屼笟"> - <el-option label="鍖哄煙涓�" value="shanghai"></el-option> - <el-option label="鍖哄煙浜�" value="beijing"></el-option> + <el-form-item label="琛屼笟"> + <el-select + v-model="ruleForm.industryId" + placeholder="璇烽�夋嫨琛屼笟" + style="width: 350px" + > + <el-option + v-for="(item, index) in industrys" + :label="item.name" + :value="item.id" + :key="index" + ></el-option> </el-select> </el-form-item> - <el-form-item label="鍦板尯" prop="region"> - <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨琛屼笟"> - <el-option label="鍖哄煙涓�" value="shanghai"></el-option> - <el-option label="鍖哄煙浜�" value="beijing"></el-option> - </el-select> + <el-form-item label="鍦板尯"> + <el-cascader + v-model="ruleForm.address" + :props="options" + style="width: 350px" + ></el-cascader> </el-form-item> - <el-form-item label="鎺堟潈鏃堕暱" prop="region"> - <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨琛屼笟"> - <el-option label="鍖哄煙涓�" value="shanghai"></el-option> - <el-option label="鍖哄煙浜�" value="beijing"></el-option> + <el-form-item label="鎺堟潈鏃堕暱"> + <el-select + v-model="ruleForm.authDuration" + style="width: 350px" + placeholder="璇烽�夋嫨鎺堟潈鏃堕暱" + > + <el-option label="涓�骞�" :value="1"></el-option> + <el-option label="涓ゅ勾" :value="2"></el-option> + <el-option label="涓夊勾" :value="3"></el-option> </el-select> </el-form-item> - <el-form-item label="鐢ㄦ埛鏉冮檺" prop="authList" class="user-tree"> - - <TreeBox :defaultProp="defaultProp1" :treeData="data1"></TreeBox> - - - <TreeBox :defaultProp="defaultProp2" :treeData="data2"></TreeBox> + <el-form-item label="鐢ㄦ埛鏉冮檺" prop="menuIds" class="user-tree"> + <div class="tree-box"> + <div class="t">鑿滃崟鏉冮檺</div> + <el-tree + ref="treeMenus" + :data="sysMenus" + show-checkbox + default-expand-all + node-key="id" + :props="defaultProp" + :default-checked-keys="checkedMenu" + check-on-click-node + > + </el-tree> + </div> + <div class="tree-box"> + <div class="t">鏁版嵁鏉冮檺</div> + <el-tree + ref="treeData" + :data="DataTree" + show-checkbox + default-expand-all + node-key="id" + :props="defaultProp" + :default-checked-keys="checkedData" + check-on-click-node + > + </el-tree> + </div> </el-form-item> - </el-form> <div class="right"> - <div class="button searchBtn" @click="searchingBtn">鎼滅储</div> - <div class="button resetBtn" @click="clearSearch">閲嶇疆</div> + <div class="button searchBtn" @click="saveSubUser">淇濆瓨</div> + <div class="button resetBtn" @click="resetUser">閲嶇疆</div> </div> </div> <div class="sub-account" v-else-if="isShowRelate"> @@ -230,25 +234,29 @@ </template> <script> -import { findDevList } from "@/api/device"; -// import AddBox from "@/views/equipmentManagement/equipmentList/components/AddBox"; -import UnbindBox from "@/views/equipmentManagement/equipmentDetail/components/UnbindBox"; -import QuitClusterBox from "@/views/equipmentManagement/equipmentList/components/QuitClusterBox"; -import JoinClusterBox from "@/views/equipmentManagement/equipmentList/components/JoinClusterBox"; +import { findUserList, saveSubUser, getMenu, getDataTree } from "@/api/user"; +import { getAreas, getDic } from "@/api/login"; + import Steps from "./Steps"; import StepsCard from "./StepCard"; -import TreeBox from "./TreeBox"; export default { components: { - // AddBox, - UnbindBox, - QuitClusterBox, - JoinClusterBox, Steps, StepsCard, - TreeBox, }, data() { + const validateTree = (rule, value, callback) => { + if ( + this.ruleForm.menuIds && + this.ruleForm.dataIds && + this.ruleForm.menuIds.length > 0 && + this.ruleForm.dataIds.length > 0 + ) { + callback(); + } else { + callback(new Error("璇烽�夎彍鍗曟潈闄愬拰鏁版嵁鏉冮檺")); + } + }; return { searchTime: [ this.$moment().format("YYYY-MM-DD 00:00:00"), @@ -259,204 +267,243 @@ inputText: "", //杈撳叆妗嗗唴瀹� activeStep: 0, activeIndex: 0, + industrys: [], total: 0, //鎬绘暟 - dataList: [ - { - name: "basic", - phone: "1121313232", - userType: "涓汉", - duration: "姘镐箙", - authList: "闆嗙兢1锛岄泦缇�2", - isBind: 1, + options: { + lazy: true, + lazyLoad(node, resolve) { + // 鎳掑姞杞借妭鐐圭渷甯傛暟鎹� + const { level } = node; + let nodes; + getAreas({ parentId: level == 0 ? 0 : node.value }) + .then((json) => { + nodes = json.data.list; + nodes = nodes.map((item) => ({ + value: item.id, + label: item.name, + level: item.level, + leaf: level >= 1, + })); + resolve(nodes); + }) + .catch((err) => { + console.log(err); + }); }, - ], + }, + dataList: [], isShowAdd: false, //鏄惁灞曠ず鏂板寮圭獥 isShowUnbind: false, //鏄惁灞曠ず瑙g粦寮圭獥 isShowRelate: false, + isEditing: false, unbindId: "", durationArr: [ { - value: 0, - label: "涓�骞�", + value: 1, + label: "1骞�", }, { - value: 1, - label: "涓ゅ勾", + value: 2, + label: "2骞�", + }, + { + value: 3, + label: "3骞�", }, ], //鎵�灞為泦缇や笅鎷夋 - cluster: null, //閫変腑鐨勯泦缇ょ被鍨� + timeLength: null, //閫変腑鐨勬巿鏉冩椂闀� showQuit: false, //灞曠ず閫�鍑洪泦缇ょ殑寮圭獥 showJoin: false, //灞曠ず鍔犲叆闆嗙兢鐨勫脊绐� activeEquipment: null, //澶勭悊涓殑璁惧 + checkedData: [], + checkedMenu: [], ruleForm: { - name: "", - region: "", + id: "", + username: "", + userType: "", password: "", - date1: "", - date2: "", - delivery: false, - type: [], - resource: "", - desc: "", - authList: { - menuAuth: [], - dataAuth: [], - }, + trueName: "", + email: "", + isChangePwd: false, + industryId: "", + address: [], + authDuration: 1, + areaId: "", + provinceId: "", + menuIds: [], + dataIds: [], }, rules: { - name: [ - { required: true, message: "璇疯緭鍏ユ椿鍔ㄥ悕绉�", trigger: "blur" }, - { min: 3, max: 5, message: "闀垮害鍦� 3 鍒� 5 涓瓧绗�", trigger: "blur" }, + username: [ + { required: true, message: "璇疯緭鍏ョ敤鎴峰悕", trigger: "blur" }, ], - region: [ - { required: true, message: "璇烽�夋嫨娲诲姩鍖哄煙", trigger: "change" }, + password: [{ required: true, message: "璇疯緭鍏ュ瘑鐮�", trigger: "blur" }], + userType: [ + { required: true, message: "璇烽�夋嫨鐢ㄦ埛绫诲瀷", trigger: "blur" }, ], - date1: [ - { - type: "date", - required: true, - message: "璇烽�夋嫨鏃ユ湡", - trigger: "change", - }, - ], - date2: [ - { - type: "date", - required: true, - message: "璇烽�夋嫨鏃堕棿", - trigger: "change", - }, - ], - type: [ - { - type: "array", - required: true, - message: "璇疯嚦灏戦�夋嫨涓�涓椿鍔ㄦ�ц川", - trigger: "change", - }, - ], - resource: [ - { required: true, message: "璇烽�夋嫨娲诲姩璧勬簮", trigger: "change" }, - ], - desc: [{ required: true, message: "璇峰~鍐欐椿鍔ㄥ舰寮�", trigger: "blur" }], + trueName: [{ required: true, message: "璇疯緭鍏ュ鍚�", trigger: "blur" }], + menuIds: [{ validator: validateTree, trigger: "blur" }], }, - data1: [ - { - id: 1, - label: "涓�绾� 1", - children: [ - { - id: 4, - label: "浜岀骇 1-1", - children: [ - { - id: 9, - label: "涓夌骇 1-1-1", - }, - { - id: 10, - label: "涓夌骇 1-1-2", - }, - ], - }, - ], - }, - { - id: 2, - label: "涓�绾� 2", - children: [ - { - id: 5, - label: "浜岀骇 2-1", - }, - { - id: 6, - label: "浜岀骇 2-2", - }, - ], - }, - { - id: 3, - label: "涓�绾� 3", - children: [ - { - id: 7, - label: "浜岀骇 3-1", - }, - { - id: 8, - label: "浜岀骇 3-2", - }, - ], - }, - ], - defaultProps1: { + sysMenus: [], + DataTree: [], + userInfo: {}, + curEditId: "", + defaultProp: { children: "children", - label: "label", - }, - data2: [ - { - id: 1, - label: "涓�绾� 1", - children: [ - { - id: 4, - label: "浜岀骇 1-1", - children: [ - { - id: 9, - label: "涓夌骇 1-1-1", - }, - { - id: 10, - label: "涓夌骇 1-1-2", - }, - ], - }, - ], - }, - { - id: 2, - label: "涓�绾� 2", - children: [ - { - id: 5, - label: "浜岀骇 2-1", - }, - { - id: 6, - label: "浜岀骇 2-2", - }, - ], - }, - { - id: 3, - label: "涓�绾� 3", - children: [ - { - id: 7, - label: "浜岀骇 3-1", - }, - { - id: 8, - label: "浜岀骇 3-2", - }, - ], - }, - ], - defaultProps2: { - children: "children", - label: "label", + label: "name", }, }; }, + created() { + this.userInfo = JSON.parse(sessionStorage.getItem("userInfo")); + this.findUserList(); + this.getIndustrys(); + this.fetchSysMenus(); + this.fetchDataTree(); + }, methods: { + fetchDataTree() { + getDataTree({ userId: this.userInfo.id }).then((res) => { + this.DataTree = res.data.dataTree; + }); + }, + fetchSysMenus() { + getMenu().then((rsp) => { + if (rsp && rsp.success) { + this.sysMenus = rsp.data.menus; + // this.userMenus = []; + } + }); + }, + addSubCount() { + this.isShowAdd = true; + this.resetUser(); + }, + editUser(row) { + this.isShowAdd = true; + this.isEditing = true; + this.ruleForm.id = row.id; + this.ruleForm.username = row.username; + this.ruleForm.userType = row.userType; + this.ruleForm.password = row.password; + this.ruleForm.trueName = row.trueName; + this.ruleForm.email = row.email; + this.ruleForm.isChangePwd = row.isChangePwd; + this.ruleForm.industryId = row.industryId; + this.ruleForm.areaId = row.areaId; + this.ruleForm.address = [row.provinceId, row.areaId]; + this.ruleForm.provinceId = row.provinceId; + this.ruleForm.authDuration = row.authDuration; + this.checkedMenu = row.menuIds; + this.checkedData = row.dataIds; + }, + resetUser() { + this.ruleForm = { + id: "", + username: "", + userType: "", + password: "", + trueName: "", + email: "", + isChangePwd: false, + address: [], + industryId: "", + areaId: "", + provinceId: "", + authDuration: 1, + }; + this.$nextTick(() => { + this.$refs.treeMenus.setCheckedKeys([]); + this.$refs.treeData.setCheckedKeys([]); + }); + }, + async getIndustrys() { + let res = await getDic(); + if (res.success) { + this.industrys = res.data.dics; + } else { + console.log("鏌ヨ琛屼笟鍒楄〃澶辫触锛�"); + } + }, + saveSubUser() { + this.ruleForm.menuIds = this.$refs.treeMenus.getCheckedKeys(); + this.ruleForm.dataIds = this.$refs.treeData.getCheckedKeys(); + this.$refs["ruleForm"].validate((valid) => { + if (valid) { + let json = { + id: this.isEditing ? this.ruleForm.id : "", + username: this.ruleForm.username, + password: this.ruleForm.password, + isChangePwd: this.ruleForm.isChangePwd, + userType: this.ruleForm.userType, + trueName: this.ruleForm.trueName, + email: this.ruleForm.email, + industryId: this.ruleForm.industryId, + areaId: + this.ruleForm.address.length == 2 ? this.ruleForm.address[1] : "", + authDuration: this.ruleForm.authDuration, + menuIds: this.ruleForm.menuIds, + dataIds: this.ruleForm.dataIds, + }; + + if (typeof json.areaId === "string") { + delete json.areaId; + } + + if (typeof json.authDuration === "string") { + delete json.authDuration; + } + + saveSubUser(json) + .then((res) => { + if (res.success) { + this.$notify.success(res.data); + this.isShowAdd = false; + this.isEditing = false; + this.findUserList(); + } else { + this.$notify.error(res.msg); + } + }) + .catch((err) => { + this.$notify.error(err.data.msg); + }); + } else { + return false; + } + }); + }, + findUserList() { + findUserList({ + inputText: this.inputText, + page: this.page, + size: this.size, + authDuration: this.timeLength, + }) + .then((res) => { + if (res.success) { + this.dataList = res.data.dataList; + this.total = res.data.total; + } else { + this.$notify.error("鍔犺浇瀛愯处鎴峰垪琛ㄥけ璐�"); + } + }) + .catch((e) => { + this.$notify.error(e.msg); + }); + }, goback() { + this.isShowAdd = false; + this.isEditing = false; this.isShowRelate = false; this.activeIndex = 0; }, goto(i) { this.activeIndex = i; + }, + reset() { + this.inputText = ""; + this.timeLength = null; }, // 璺冲埌璁惧璇︽儏 checkDetail(row) { @@ -484,42 +531,17 @@ }, // 鏌ヨ鍒楄〃 - searchingBtn() { - let param = { - page: this.page, - size: this.size, - // startTime: this.searchTime[0], - // endTime: this.searchTime[1], - inputText: this.inputText, - }; - findDevList(param) - .then((res) => { - this.dataList = res.data.list; - //鏃堕棿鍒嗚鏄剧ず - this.dataList.forEach((item) => { - item.installTime = item.installTime.split(" "); - item.firstUseTime = item.firstUseTime.split(" "); - }); - this.total = res.data.total; - if (res.data.total <= this.size) { - this.page = 1; - } - }) - .catch((err) => { - console.log(err); - }); - }, - + save() {}, //鍒嗛〉鍔熻兘 handleSizeChange(size) { this.size = size; - this.searchingBtn(); + this.findUserList(); }, //鍒嗛〉鍔熻兘 refrash(page) { this.page = page; - this.searchingBtn(); + this.findUserList(); }, //瑙g粦鎸夐挳 @@ -547,10 +569,6 @@ ]; }, - //鍏抽棴鏂板寮圭獥 - closeAddBox() { - this.isShowAdd = false; - }, // 鍏抽棴瑙g粦寮圭獥 closeUnbindBox() { this.isShowUnbind = false; @@ -559,13 +577,11 @@ //瑙g粦鎴愬姛鍥炶皟 reflash() { this.isShowUnbind = false; - this.searchingBtn(); }, clearSearch() { this.searchTime = this.getDateInit(); this.inputText = ""; - this.searchingBtn(); }, //閫�鍑洪泦缇� @@ -579,10 +595,6 @@ this.activeEquipment = equipment; this.showJoin = true; }, - }, - mounted() { - this.searchTime = this.getDateInit(); - this.searchingBtn(); }, }; </script> @@ -613,7 +625,6 @@ } .add-ruleForm::v-deep { .el-input__inner { - width: 350px; color: #3d3d3d; border-radius: 4px; border-color: #c0c5cc; @@ -622,6 +633,11 @@ border-color: #c0c5cc; } .user-tree { + .el-form-item__label:before { + content: "*"; + color: #f52323; + margin-right: 4px; + } .el-form-item__content { display: flex; .tree-box { @@ -823,7 +839,7 @@ .option { margin-right: 10px; - font-size: 24px; + font-size: 14px; color: rgb(0, 101, 255); cursor: pointer; } @@ -884,4 +900,4 @@ color: #0065ff; border-color: #0065ff; } -</style> \ No newline at end of file +</style> -- Gitblit v1.8.0