diff --git a/src/assets/images/headerImg/icon1.png b/src/assets/images/headerImg/icon1.png new file mode 100644 index 00000000..c148dc8c Binary files /dev/null and b/src/assets/images/headerImg/icon1.png differ diff --git a/src/assets/images/headerImg/icon2.png b/src/assets/images/headerImg/icon2.png new file mode 100644 index 00000000..9fc9852a Binary files /dev/null and b/src/assets/images/headerImg/icon2.png differ diff --git a/src/assets/images/headerImg/icon3.png b/src/assets/images/headerImg/icon3.png new file mode 100644 index 00000000..e09f5321 Binary files /dev/null and b/src/assets/images/headerImg/icon3.png differ diff --git a/src/assets/images/headerImg/icon4.png b/src/assets/images/headerImg/icon4.png new file mode 100644 index 00000000..b158f4b9 Binary files /dev/null and b/src/assets/images/headerImg/icon4.png differ diff --git a/src/assets/images/headerImg/icon5-active.png b/src/assets/images/headerImg/icon5-active.png new file mode 100644 index 00000000..f83fc756 Binary files /dev/null and b/src/assets/images/headerImg/icon5-active.png differ diff --git a/src/assets/images/headerImg/icon5.png b/src/assets/images/headerImg/icon5.png new file mode 100644 index 00000000..80fe7531 Binary files /dev/null and b/src/assets/images/headerImg/icon5.png differ diff --git a/src/assets/images/headerImg/icon6-active.png b/src/assets/images/headerImg/icon6-active.png new file mode 100644 index 00000000..f90c1d0e Binary files /dev/null and b/src/assets/images/headerImg/icon6-active.png differ diff --git a/src/assets/images/headerImg/icon6.png b/src/assets/images/headerImg/icon6.png new file mode 100644 index 00000000..1906d1c9 Binary files /dev/null and b/src/assets/images/headerImg/icon6.png differ diff --git a/src/components/centerChange.vue b/src/components/centerChange.vue index 803b1aae..a5344031 100644 --- a/src/components/centerChange.vue +++ b/src/components/centerChange.vue @@ -5,6 +5,7 @@ trigger="click" width="450" class="popover" + :visible-arrow="false" v-model="visible" >
@@ -20,7 +21,8 @@
- + + 工作台
@@ -85,6 +87,10 @@ export default { .click-content{ cursor: pointer; .flexStyle(); + img{ + width: 20px; + height: 20px; + } >span{ margin: 0px 10px; } diff --git a/src/components/header.vue b/src/components/header.vue index 26f3ae80..3bbc3356 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -618,7 +618,7 @@ p { /deep/.header-btn { display: inline-flex; align-items: center; - margin: 0px 0px 0 30px; + // margin: 0px 0px 0 30px; font-size: 14px; cursor: pointer; min-width: 100px; diff --git a/src/components/userChange.vue b/src/components/userChange.vue index 162091e0..80d9a3bb 100644 --- a/src/components/userChange.vue +++ b/src/components/userChange.vue @@ -3,14 +3,34 @@
- {{ isUserList ? "切换用户" : "用户组织" }} - {{ isUserList ? "切换用户" : "所选组织架构" }} + + + + +
- + + {{ item.companyName }}
+
+ + + {{ $store.state.userInfo.account }} +
个人租户
+ +
@@ -60,8 +88,18 @@
- - {{$store.state.currentProDetail.name}} + + + {{ $store.state.currentProDetail.name }} + {{ + $store.state.userInfo.account + }}
@@ -80,7 +118,7 @@ export default { }, groupListData: [], selectedGroupData: [], - selectedProjectSn: "" + selectedProjectSn: "", }; }, created() { @@ -90,13 +128,15 @@ export default { methods: { // 选中组织中的项目级 selectProject(obj) { - if(!obj.list) return; + console.log(obj, "111222333"); + if (!obj || !obj.list) return; if (obj.list && obj.list.length > 0) { obj.list.map((item) => { this.selectProject(item); }); } else { - if(!this.selectedProjectSn){ // 加判断是为了在循环中只选中第一个 + if (!this.selectedProjectSn) { + // 加判断是为了在循环中只选中第一个 this.selectedProjectSn = obj.sn; // 修改全局projectSn this.$store.commit("setProjectSn", obj.sn); @@ -106,7 +146,13 @@ export default { }, // 选中组织 selectGroup(item) { - this.selectedGroupData = [item]; + if (item) { + this.selectedGroupData = [item]; + } else { + this.selectedGroupData = []; + this.$store.commit("setProjectSn", ""); + this.$store.commit("setProDetail", null); + } this.isUserList = false; this.$nextTick(() => { this.selectProject(item); @@ -115,24 +161,26 @@ export default { // 获取组织树数据 getGroupTreeData() { this.groupListData = this.$store.state.groupTreeList; - if(!this.groupListData) return; + if (!this.groupListData) return; this.isUserList = false; - let findItem = this.groupListData.find( - (item) => item.sn == this.$store.state.selectedGroupSn - ); - this.selectedGroupData = [findItem]; - this.$nextTick(() => { - this.selectProject(findItem); + let findItem = this.groupListData.find((item) => { + return item.sn == this.$store.state.selectedGroupSn; }); + if (findItem) { + this.selectedGroupData = [findItem]; + this.$nextTick(() => { + this.selectProject(findItem); + }); + } }, // 树形控件点击 treeClick(data) { console.log(data); - if(data.projectSn){ + if (data.projectSn) { this.selectedProjectSn = data.projectSn; // 修改全局projectSn this.$store.commit("setProjectSn", data.projectSn); - this.$store.commit("setProDetail", data); + this.$store.commit("setProDetail", data); // 收起popover this.visible = false; } @@ -165,6 +213,12 @@ export default { color: #000000; margin-right: auto; } + img { + width: 15px; + height: 15px; + cursor: pointer; + margin-left: 5px; + } } .content-list { margin-top: 15px; @@ -174,15 +228,27 @@ export default { border: 1px solid #dadbdb; border-radius: 5px; cursor: pointer; + img { + width: 30px; + height: 30px; + } + // >div{ + // border: 1px solid #7299F8; + // border-radius: 5px; + // background-color: #E3F6FF; + // padding: 5px 15px; + // color: #5A88F7; + // } > span:nth-child(2) { margin: 2px 10px 0px 10px; } - > span:nth-child(3) { + > div { padding: 3px 10px; color: #79acfa; background-color: #e4f5ff; border: 1px solid #99c3fb; border-radius: 5px; + margin-top: 2px; font-size: 10px; } /deep/.el-icon-arrow-right { @@ -208,9 +274,13 @@ export default { .click-content { cursor: pointer; .flexStyle(); + img { + width: 20px; + height: 20px; + } > span { display: inline-block; - width: 77px; + max-width: 77px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -219,7 +289,8 @@ export default { } diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index 995b3391..e92bad44 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -3094,6 +3094,9 @@ export default { relativeGroupFn(item) { this.selectRowObj = item; this.relativeGroupDialog = true; + this.$nextTick(() => { + this.$refs.relativeTree.setCheckedKeys([]); + }) }, transformGroup(){ let item = this.selectRowObj; diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index df21f90c..237c84b8 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -487,7 +487,7 @@ export default { pw: [ { required: true, - message: "请输入正确的密码格式", + message: "密码至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", trigger: "blur", pattern: /(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z]).{8,30}/, }, @@ -930,7 +930,11 @@ export default { headquartersSn: this.headquartersSnData, accountType: this.registerType, }).then((res) => { - this.$message.success("注册成功"); + if(this.registerType == 1){ + this.$message.success("注册成功，等待审核"); + } else { + this.$message.success("注册成功"); + } this.goLogin(); }); } else { diff --git a/src/views/userCenter/userCenter/componentsModule/dataFormData.vue b/src/views/userCenter/userCenter/componentsModule/dataFormData.vue index a754b452..f0247c1c 100644 --- a/src/views/userCenter/userCenter/componentsModule/dataFormData.vue +++ b/src/views/userCenter/userCenter/componentsModule/dataFormData.vue @@ -72,7 +72,7 @@ export default { newPassword: [ { required: true, - message: "请输入正确的密码格式", + message: "必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", trigger: "blur", pattern: /(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z]).{8,30}/, }, @@ -80,7 +80,7 @@ export default { confirmParssword: [ { required: true, - message: "请输入正确的密码格式", + message: "必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", trigger: "blur", pattern: /(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z]).{8,30}/, }, diff --git a/src/views/userCenter/userCenter/index.vue b/src/views/userCenter/userCenter/index.vue index cfed0aaf..8763d0f0 100644 --- a/src/views/userCenter/userCenter/index.vue +++ b/src/views/userCenter/userCenter/index.vue @@ -1,7 +1,6 @@ - - - \ No newline at end of file +} +/deep/.el-dialog { + width: 25%; + .el-dialog__body { + padding-top: 10px; + padding-bottom: 15px; + } +} +