bug修复

src/api/index.js

@@ -8,7 +8,7 @@ export default {
 
     logins: `${host}users/users/user/login`, //登录
     verification: `${host}users/users/user/captcha`,// 验证码图片
-    isClient: `${host}users/users/user/isClient`,// 验证码图片
+    isClient: `${host}users/users/user/isClient`,// 是否为客户
 
     // 权限管理
     getUserRolesPermissionMenu: `${host}users/user-role/getUserRolesPermissionMenu`,

src/pages/account/login/index.vue

@@ -123,9 +123,6 @@ export default {
                     this.loginForm.distinguish = Number(this.activeName);
                     this.$post(this.api.logins, this.loginForm).then(res => {
                         util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
-                        let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
-                        this.$router.replace(redirect);
-                        util.successMsg("登录成功");
                         this.queryCustomer();
                     }).catch(res => {
                         if (res && res.status == 30001) {
@@ -141,8 +138,11 @@ export default {
         },
         queryCustomer() { // 查询是否是客户
             this.$get(this.api.isClient).then(res => {
+                util.successMsg("登录成功");
                 this.setCustomer(res.customer);
                 this.setCustomerName(res.customerName);
+                let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
+                this.$router.replace(redirect);
             }).catch(res => {});
         },
         phoneCountdown() {

src/pages/assessment/add/index.vue

@@ -140,7 +140,9 @@
                         v-model.trim="filterClassName"
                         class="inline-input m-b-20"
                         clearable
-                    ></el-input>
+                    >
+                        <el-button slot="append" icon="el-icon-search"></el-button>
+                    </el-input>
 
                     <div v-show="tagList.length" class="m-b-20">
                         <el-tag
@@ -353,6 +355,7 @@ export default {
                         i.nodeKey = `${i.id}-${new Date().getTime()}`;
                         i.leaf = false;
                     }
+                    console.log(JSON.stringify(i));
                     result.push(i);
                 });
                 this.$nextTick(() => {
@@ -549,7 +552,7 @@ export default {
 
 <style lang="scss" scoped>
 .inline-input {
-    width: 300px;
+    width: 500px;
 }
 
 .date-inputs {
@@ -561,15 +564,42 @@ export default {
 .tree-con {
     height: 400px;
     max-height: 400px;
-    width: 300px;
+    width: 100%;
     border: 1px solid #DCDFE6;
     border-radius: 4px;
-    padding: 10px 10px 10px 0px;
+    padding: 10px 10px 10px 40px;
     overflow: auto;
 
-    /deep/ .el-icon-caret-right:before {
+    /deep/ .el-tree-node__content{
-        color: #9278FF;
+        height: 30px;
-        font-weight: bold;
+        .el-tree-node__expand-icon{
+            padding: 2px;
+            color: #fff;
+            background-color: #9278FF;
+            border-radius: 30px;
+            margin: 0 10px;
+        }
+        .el-tree-node__expand-icon.is-leaf{
+            background-color: transparent;
+        }
+        .el-icon-caret-right:before{
+            font-size: 14px;
+        }
+        .el-checkbox__inner{
+            width: 18px;
+            height: 18px;
+            border: 1px solid #9278FF;
+            border-radius: 20px;
+        }
+        .el-checkbox__inner::after{
+            position: absolute;
+            top: 3px;
+            left: 6px;
+        }
+        .el-checkbox__input.is-indeterminate .el-checkbox__inner::before{
+            position: absolute;
+            top: 7px;
+        }
     }
 }
 

src/pages/system/list/staff.vue

@@ -23,6 +23,7 @@
                 <el-table-column type="selection" width="55" align="center"></el-table-column>
                 <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
                 <el-table-column prop="userName" label="职工姓名" align="center"></el-table-column>
+                <el-table-column prop="account" label="账号" align="center"></el-table-column>
                 <el-table-column prop="workNumber" label="职工工号" align="center"></el-table-column>
                 <el-table-column prop="dept" label="部门" align="center"></el-table-column>
                 <el-table-column prop="roleName" label="账号角色" align="center"></el-table-column>

src/setting.js

@@ -35,8 +35,8 @@ if (isHh) {
     title = "职站服务端管理系统";
 } else if (isDev) {
     jumpPath = "http://192.168.31.154:8087/";
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://39.108.250.202:9000/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.125:9000/"; // 坤
     // host = 'http://192.168.31.137:9000/'; // 赓
     title = "职站服务端管理系统";