From b28b78d935600506ba0b85dd78cb092eae3118b5 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 21 Oct 2021 15:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue                  | 24 +++++++-------
 src/pages/account/login/index.vue             |  8 +----
 src/pages/course/add/index.vue                |  3 --
 .../course/list/courseManagement/index.vue    |  1 -
 src/pages/match/add/index.vue                 |  1 -
 src/pages/system/list/staff.vue               | 23 +++++++------
 src/pages/system/list/staffSide.vue           | 14 +-------
 src/pages/system/list/stafftree.vue           |  7 ++--
 src/setting.js                                | 10 ------
 src/store/modules/project.js                  |  2 +-
 src/store/modules/user.js                     | 32 ++++++++++++++++---
 11 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 6f23bfe..291f360 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -7,7 +7,7 @@
         <div class="action">
             <div class="user" @click="toPersonal">
                 <el-avatar :size="40" :src="avatar"></el-avatar>
-                <span class="m-l-10">{{ userName }}</span>
+                <span class="m-l-10">{{ customer ? customerName : userName }}</span>
             </div>
             <el-divider direction="vertical"></el-divider>
             <el-button type="text" class="ml20" @click="logout">退出</el-button>
@@ -21,16 +21,12 @@ import util from "@/libs/util";
 export default {
     data() {
         return {
-            title: "",
-            logoUrl: ""
+
         };
     },
     computed: {
         ...mapState("user", [
-            "avatar", "userName"
-        ]),
-        ...mapState("auth", [
-            "routes"
+            "avatar", "userName", "title", "logoUrl", "customer", "customerName"
         ])
     },
     mounted() {
@@ -38,16 +34,20 @@ export default {
     },
     methods: {
         ...mapActions("user", [
-            "logout"
+            "logout", "setTitle", "setLogoUrl"
         ]),
         toPersonal() {
-            this.$router.push("/setting/person");
+            if (!this.customer) {
+                this.$router.push("/setting/person");
+            }
         },
         getSystemDetail () {
             this.$get(this.api.logoDetail).then(res => {
-                if (res.status === 200 && res.data) {
-                    this.title = res.data.title;
-                    this.logoUrl = res.data.logoUrl;
+                if (res.status === 200) {
+                    if (res.data) {
+                        this.setTitle(res.data.title);
+                        this.setLogoUrl(res.data.logoUrl);
+                    }
                 } else {
                     util.errorMsg(res.message);
                 }
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 6b48fee..a1538e8 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -1,10 +1,5 @@
 <template>
     <div class="wrap">
-        <div class="header">
-            <img class="logo hh" v-if="isHh" src="@/assets/img/logo-hh.png" />
-            <img class="logo" v-else src="@/assets/img/logo.png" />
-        </div>
-
         <div class="main">
             <div class="box">
                 <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -72,7 +67,6 @@ import Setting from "@/setting";
 export default {
     data: function() {
         return {
-            isHh: Setting.isHh,
             activeName: "1",
             loginForm: {
                 account: "",
@@ -111,7 +105,7 @@ export default {
     },
     methods: {
         ...mapActions("user", [
-            "login"
+            "login", "setTitle", "setLogoUrl"
         ]),
         getVerImg() { // 获取验证码图片
             this.loginForm.random = Math.floor(Math.random() * 999999999);
diff --git a/src/pages/course/add/index.vue b/src/pages/course/add/index.vue
index 78bf7de..1d9e5ad 100644
--- a/src/pages/course/add/index.vue
+++ b/src/pages/course/add/index.vue
@@ -69,7 +69,6 @@ export default {
             headers: {
                 token: util.local.get(Setting.tokenKey)
             },
-            schoolId: Setting.schoolId,
             id: this.$route.query.id,
             isDetail: Boolean(this.$route.query.show),
             username: this.$store.state.name,
@@ -107,8 +106,6 @@ export default {
                 coverUrl: this.coverUrl,
                 description: this.description,
                 name: this.name,
-
-                schoolId: this.schoolId,
                 founderId: this.userId,
                 founderName: this.username,
                 distinguish: 1
diff --git a/src/pages/course/list/courseManagement/index.vue b/src/pages/course/list/courseManagement/index.vue
index bc94fde..10b49d8 100644
--- a/src/pages/course/list/courseManagement/index.vue
+++ b/src/pages/course/list/courseManagement/index.vue
@@ -80,7 +80,6 @@ export default {
     name: "courseManagement",
     data() {
         return {
-            schoolId: this.$store.state.schoolId,
             keyword: "",
             classificationId: "",
             courseData: [],
diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue
index 12983bc..0119d8a 100644
--- a/src/pages/match/add/index.vue
+++ b/src/pages/match/add/index.vue
@@ -121,7 +121,6 @@ export default {
             headers: {
                 token: util.local.get(Setting.tokenKey)
             },
-            schoolId: Setting.schoolId,
             id: "",
             coverUrl: "",
             carouselUrl: "",
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index 0e59b78..7e295ac 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -198,9 +198,6 @@ export default {
             uploadList: [], // 上传文件列表
             uploadFaild: false, // 上传失败
 
-            oneDepartmentIds: "",
-            twoDepartmentIds: "",
-
             gradeId: "", // 员工年级ID
             staffArchitectureId: "", // 员工部门ID
         };
@@ -221,6 +218,14 @@ export default {
         this.getData();
     },
     methods: {
+        removeByValue(val) {
+            for (var i = 0; i < this.length; i++) {
+                if (JSON.stringify(this[i]).indexOf(JSON.stringify(val)) != -1) {
+                    this.splice(i, 1);
+                    break;
+                }
+            }
+        },
         handleCheck(data) {
             let oneDepartmentIds = [];
             let twoDepartmentIds = [];
@@ -232,14 +237,14 @@ export default {
                 }
                 e.children.forEach(r => {
                     if (r.ischeck) {
-                        twoDepartmentIds.push(r.staffGradeId);
+                        twoDepartmentIds.push(r.gradeId);
                     } else {
-                        this.removeByValue(twoDepartmentIds, r.staffGradeId);
+                        this.removeByValue(twoDepartmentIds, r.gradeId);
                     }
                 });
             });
-            this.oneDepartmentIds = oneDepartmentIds.toString();
-            this.twoDepartmentIds = twoDepartmentIds.toString();
+            this.staffArchitectureId = oneDepartmentIds.toString();
+            this.gradeId = twoDepartmentIds.toString();
             this.initData();
         },
         fircheck(val, val2) {
@@ -251,7 +256,7 @@ export default {
             val.ischeck = !val.ischeck;
             val2.map(e => {
                 e.children.map(r => {
-                    if (r.staffGradeId == val.staffGradeId) {
+                    if (r.gradeId == val.gradeId) {
                         if (e.children.every(i => i.ischeck)) {
                             e.ischeck = true;
                         } else {
@@ -325,7 +330,7 @@ export default {
         },
         resetPassword(row) { // 重置密码
             this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
-                this.$get(`${this.api.resetPassword}?userId=${row.accountId}&newPwd=111aaa`).then(res => {
+                this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=111aaa`).then(res => {
                     if (res.status === 200) {
                         util.successMsg("重置成功");
                     } else {
diff --git a/src/pages/system/list/staffSide.vue b/src/pages/system/list/staffSide.vue
index 5f1bb2c..69a6507 100644
--- a/src/pages/system/list/staffSide.vue
+++ b/src/pages/system/list/staffSide.vue
@@ -11,7 +11,7 @@
         <el-dialog :title="Form.staffArchitectureId ? '编辑专业' : '新增专业'" :visible.sync="isaddMajor" width="24%" center @close="closeAdd" :close-on-click-modal="false">
             <el-form ref="Form" :model="Form" :rules="rules">
                 <el-form-item prop="staffArchitectureName">
-                    <el-input placeholder="请输入专业名称" v-model="Form.staffArchitectureName" @change="majorChange"></el-input>
+                    <el-input placeholder="请输入专业名称" v-model="Form.staffArchitectureName"></el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
@@ -47,7 +47,6 @@ export default {
             twoactive: 0,
             isaddMajor: false,
             isAddDepartment: false,
-            schoolId: Setting.schoolId,
             Form: {
                 staffArchitectureId: "", // 专业ID
                 staffArchitectureName: "", // // 专业名称
@@ -64,7 +63,6 @@ export default {
             },
             staffstateProfessId: "",
             staffstateId: "",
-            majorNoAdd: true
         };
     },
     components: {
@@ -119,19 +117,9 @@ export default {
             this.Form.staffArchitectureName = item.staffArchitectureName;
             this.isaddMajor = true;
         },
-        async majorChange() {
-            let res = await this.$get(this.api.queryStaffPAN, { name: this.Form.staffArchitectureName, schoolId: this.schoolId });
-            if (res.message.length != 0) {
-                util.warningMsg("该一级部门已存在");
-                this.majorNoAdd = false;
-            } else {
-                this.majorNoAdd = true;
-            }
-        },
         sure(Form) { // 提交新增/修改专业
             this.$refs[Form].validate((valid) => {
                 if (valid) {
-                    if (!this.majorNoAdd) return util.warningMsg("该一级部门已存在");
                     let data = {
                         staffArchitectureName: this.Form.staffArchitectureName,
                         staffArchitectureId: this.Form.staffArchitectureId,
diff --git a/src/pages/system/list/stafftree.vue b/src/pages/system/list/stafftree.vue
index 0212c1e..3bf0ecc 100644
--- a/src/pages/system/list/stafftree.vue
+++ b/src/pages/system/list/stafftree.vue
@@ -106,16 +106,13 @@ export default {
         editDepartment(item) {
             this.$emit("editDepartment", item);
         },
-        delDepart(item, index) {
-            this.$emit("delDepart", item, index);
+        delDepartment(item, index) {
+            this.$emit("delDepartment", item, index);
         },
         // 班级
         addClass(item) {
             this.$emit("addClass", item);
         },
-        delDepartment(item, index) {
-            this.$emit("delDepartment", item, index);
-        },
         //判断数组中是否包含某个对象
         isHasObj(arr, val) {
             var flag = 0; //1为有 0为没有
diff --git a/src/setting.js b/src/setting.js
index 7418221..a0aa5cb 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -13,7 +13,6 @@ let jumpPath = "";
 let host = "";
 let title = "";
 let schoolId = null;
-let systemList = [];
 
 if (isHh) {
     // 河海
@@ -62,15 +61,6 @@ const Setting = {
     showProgressBar: true, // 页面切换时，是否显示模拟的进度条
     apiBaseURL: host, // 接口请求地址
     jumpPath, // 判分点系统前缀
-    isHh, // 是否是河海版本
-    isCH, // 是否是巢湖版本
-    isBeta, // 是否是职站测试
-    isPro, // 是否是职站生产
-    schoolId, // 学校id
-    systemId: systemList.length && systemList[0].id, // 默认系统id
-    // 子系统列表.改的时候留意要改的是哪个环境,别影响到了其他环境
-    // 以后如果卖给了其他学校，要给该学校单独开放子系统的话，就在下面这个数组里加判断就行，然后把需要开放的子系统放出来。不要复制这个职站项目另起一个项目，这样学校一多就很难维护了
-    systemList,
     autoLogoutTime: 3600000, // 长时间未操作，自动退出登录时间
     projectData: "sta_data", // 新增项目跳转判分点数据存储cookie的key
     modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
diff --git a/src/store/modules/project.js b/src/store/modules/project.js
index 007d89c..47b376b 100644
--- a/src/store/modules/project.js
+++ b/src/store/modules/project.js
@@ -4,7 +4,7 @@
 export default {
     namespaced: true,
     state: {
-        lastSystemId: 1,
+        lastSystemId: "",
         projectFields: {},
         assFields: {}
     },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 28696fb..cdda3f8 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,10 +10,13 @@ import addRoutes from "@/libs/route/addRoutes";
 export default {
     namespaced: true,
     state: {
+        customer: false, // true:为客户，没有个人中心
+        customerName: "", // 客户名称
+        title: "",
+        logoUrl: "",
         avatar: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
         userId: 3,
         userName: "",
-        schoolId: "",
         roleId: "",
         dataTime: ""
     },
@@ -21,11 +24,22 @@ export default {
         SET_INFO: (state, info) => {
             if (info.avatar) state.avatar = info.userAvatars;
             state.userId = info.userId;
-            state.schoolId = info.schoolId;
             state.userName = info.userName;
             state.roleId = info.roleId;
             state.dataTime = info.dataTime;
         },
+        SET_CUSTOMER: (state, customer) => {
+            state.customer = customer;
+        },
+        SET_CUSTOMER_NAME: (state, customerName) => {
+            state.customerName = customerName;
+        },
+        SET_TITLE: (state, title) => {
+            state.title = title;
+        },
+        SET_LOGO_URL: (state, logoUrl) => {
+            state.logoUrl = logoUrl;
+        },
         SET_AVATAR: (state, avatar) => {
             state.avatar = avatar;
         },
@@ -46,6 +60,8 @@ export default {
                         // res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
                         // 2021-10-13重做权限，因权限系统封装
                         util.local.set(Setting.tokenKey, data.token, Setting.tokenExpires);
+                        commit("SET_CUSTOMER", data.customer);
+                        commit("SET_CUSTOMER_NAME", data.customerName);
                         util.successMsg("登录成功");
                         console.log(data, "登录保存的数据");
                         commit("SET_INFO", data);
@@ -67,12 +83,18 @@ export default {
                 resolve();
             });
         },
-        setAvatar({ state, commit }, avatar) {
-            commit("SET_AVATAR", avatar);
-        },
         setInfo({ state, commit }, info) {
             commit("SET_INFO", info);
         },
+        setTitle({ state, commit }, title) {
+            commit("SET_TITLE", title);
+        },
+        setLogoUrl({ state, commit }, logoUrl) {
+            commit("SET_LOGO_URL", logoUrl);
+        },
+        setAvatar({ state, commit }, avatar) {
+            commit("SET_AVATAR", avatar);
+        },
         setUserName({ state, commit }, userName) {
             commit("SET_USERNAME", userName);
         }