From 1c3933b20438da1d858dda2161f058dfa1b36f1e Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 22 六月 2022 15:01:29 +0800
Subject: [PATCH] 联动场景新增算法
---
src/views/personalCenter/components/SubAccount.vue | 581 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 315 insertions(+), 266 deletions(-)
diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue
index 4721b7c..dc001bc 100644
--- a/src/views/personalCenter/components/SubAccount.vue
+++ b/src/views/personalCenter/components/SubAccount.vue
@@ -10,7 +10,7 @@
<div class="cluster">
鎺堟潈鏃堕暱
- <el-select v-model="cluster" placeholder="璇烽�夋嫨">
+ <el-select v-model="timeLength" placeholder="璇烽�夋嫨">
<el-option
v-for="item in durationArr"
:key="item.value"
@@ -23,13 +23,13 @@
</div>
<div class="right">
- <div class="button searchBtn" @click="save">鎼滅储</div>
- <div class="button resetBtn" @click="save">閲嶇疆</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>
@@ -43,11 +43,9 @@
<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">{{
@@ -55,19 +53,31 @@
}}</template>
</el-table-column>
<el-table-column
- prop="name"
+ prop="trueName"
label="濮撳悕"
show-overflow-tooltip
></el-table-column>
<el-table-column
- prop="phone"
- label="鎵嬫満鍙�"
+ prop="username"
+ 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 prop="userType" label="鐢ㄦ埛绫诲瀷">
+ <template slot-scope="scope">
+ <span>{{ scope.row.userType == 1 ? "涓汉" : "鍏徃" }}</span>
+ </template>
+ </el-table-column>
+
+ <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">
<div v-if="scope.row.isBind == 1" class="status green">宸茬粦瀹�</div>
@@ -77,13 +87,8 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <!-- 缂栬緫 -->
- <span class="iconfont option" @click="joinCluster(scope.row)"
- ></span
- >
- <!-- 瑙ｇ粦 -->
- <span class="iconfont option" @click="Untying(scope.row)"
- ></span
+ <span class="iconfont option" @click="editUser(scope.row)"
+ >缂栬緫</span
>
</template>
</el-table-column>
@@ -101,34 +106,9 @@
></el-pagination>
</div>
</div>
-
- <!-- 瑙ｇ粦寮圭獥 -->
- <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">
+ <div class="add-title" @click="isShowAdd = false">
<span class="iconfont"></span>
<span>娣诲姞瀛愯处鎴�</span>
</div>
@@ -140,57 +120,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="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="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="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <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.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="save">鎼滅储</div>
- <div class="button resetBtn" @click="save">閲嶇疆</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">
@@ -207,23 +225,29 @@
</template>
<script>
-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"),
@@ -234,205 +258,233 @@
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, //鏄惁灞曠ず瑙ｇ粦寮圭獥
isShowRelate: false,
+ isEditing: false,
unbindId: "",
durationArr: [
{
- value: 0,
+ value: 1,
label: "涓�骞�",
},
{
- value: 1,
+ value: 2,
label: "涓ゅ勾",
},
+ {
+ value: 3,
+ label: "涓夊勾",
+ },
], //鎵�灞為泦缇や笅鎷夋
- 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: "",
+ 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: "",
+ };
+ 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,
+ };
+ 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,
+ })
+ .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.isShowAdd = false;
+ this.isEditing = false;
this.isShowRelate = false;
this.activeIndex = 0;
},
goto(i) {
this.activeIndex = i;
+ },
+ reset() {
+ this.inputText = "";
+ this.timeLength = null;
},
// 璺冲埌璁惧璇︽儏
checkDetail(row) {
@@ -460,17 +512,17 @@
},
// 鏌ヨ鍒楄〃
-
- save(){
- },
+ save() {},
//鍒嗛〉鍔熻兘
handleSizeChange(size) {
this.size = size;
+ this.findUserList();
},
//鍒嗛〉鍔熻兘
refrash(page) {
this.page = page;
+ this.findUserList();
},
//瑙ｇ粦鎸夐挳
@@ -498,10 +550,6 @@
];
},
- //鍏抽棴鏂板寮圭獥
- closeAddBox() {
- this.isShowAdd = false;
- },
// 鍏抽棴瑙ｇ粦寮圭獥
closeUnbindBox() {
this.isShowUnbind = false;
@@ -528,9 +576,6 @@
this.activeEquipment = equipment;
this.showJoin = true;
},
- },
- mounted() {
-
},
};
</script>
@@ -561,7 +606,6 @@
}
.add-ruleForm::v-deep {
.el-input__inner {
- width: 350px;
color: #3d3d3d;
border-radius: 4px;
border-color: #c0c5cc;
@@ -570,6 +614,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 {
@@ -771,7 +820,7 @@
.option {
margin-right: 10px;
- font-size: 24px;
+ font-size: 14px;
color: rgb(0, 101, 255);
cursor: pointer;
}
--
Gitblit v1.8.0