From 966ef940769c558c5a3ccb67a4abc2f5c1c882d5 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 30 Apr 2021 14:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/breadcrumb/index.vue    |  6 +++---
 src/layouts/navbar/index.vue           |  2 +-
 src/pages/client/list/index.vue        | 11 ++---------
 src/pages/quesBank/list/index.vue      |  6 +++---
 src/pages/quesBank/list/myQuesBank.vue |  2 +-
 src/pages/quesBank/list/quesDialog.vue | 13 +++----------
 src/pages/system/list/index.vue        |  5 ++---
 src/pages/system/list/role.vue         |  6 +++---
 src/pages/system/list/staff.vue        |  6 +++---
 src/pages/user/list/index.vue          |  8 ++++----
 src/styles/common.scss                 | 11 +++++++++--
 11 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index 67c760d..df66284 100644
--- a/src/components/breadcrumb/index.vue
+++ b/src/components/breadcrumb/index.vue
@@ -3,7 +3,7 @@
         <span class="cur">当前位置：</span>
         <el-breadcrumb separator="/">
             <el-breadcrumb-item :to="{ path: '/' }">超竞企业端</el-breadcrumb-item>
-            <el-breadcrumb-item v-for="(item,index) in pages" :key="index" :to="{ path: index == pages.length - 1 ? curRoute : route }">{{item}}</el-breadcrumb-item>
+            <el-breadcrumb-item v-for="(item,index) in pages" :key="index" :to="{ path: index == pages.length - 1 ? curRoute : path }">{{item}}</el-breadcrumb-item>
         </el-breadcrumb>
     </div>
 </template>
@@ -14,12 +14,12 @@ export default {
     data() {
         return {
             pages: this.data.split('/'),
-            curRoute: this.$route.path
+            curRoute: this.$route.path,
+            path: this.route ? this.route : 'list'
         };
     },
     methods: {
         update(data){
-            console.log(2222,data)
             this.pages = data.split('/')
         }
     }
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 0241776..8967795 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -92,7 +92,7 @@ export default {
         onRoutes() {
             let actives = this.actives
             for(let i in this.actives){
-                if(actives[i].includes(this.$route.name)) return `/${i}`
+                if(actives[i].includes(this.$route.name)) return `/${i}/list`
             }
             return this.$route.path
         },
diff --git a/src/pages/client/list/index.vue b/src/pages/client/list/index.vue
index 454c9e2..c9afbd9 100644
--- a/src/pages/client/list/index.vue
+++ b/src/pages/client/list/index.vue
@@ -57,14 +57,7 @@
                             <el-button type="text" @click="show(scope.row)" v-auth>查看</el-button>
                             <el-button type="text" @click="edit(scope.row)" v-auth>编辑</el-button>
                             <el-button type="text" @click="handleDelete(scope.row)" v-auth>删除</el-button>
-                            <el-switch
-                                v-model="scope.row.isDisable"
-                                :active-value="0"
-                                :inactive-value="1"
-                                style="margin: 0 10px 0 5px"
-                                @change="switchOff($event,scope.row,scope.$index)"
-                                v-auth="'/index/list:禁用'"
-                            ></el-switch>
+                            <el-switch v-model="scope.row.isDisable" :active-value="0" :inactive-value="1" style="margin: 0 10px 0 5px" @change="switchOff($event,scope.row,scope.$index)" v-auth="'/index/list:禁用'"></el-switch>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -197,7 +190,7 @@ export default {
                 isDisable: val
             }
             this.$post(this.api.updateClient,data).then((res) => {
-                    val == 1 ? util.successMsg('禁用成功') : util.successMsg('启用成功')
+                    val == 1 ? util.warningMsg('该院校系统使用权限已关闭') : util.successMsg('该院校系统使用权限已激活')
                 }).catch((res) => {
             })
         },
diff --git a/src/pages/quesBank/list/index.vue b/src/pages/quesBank/list/index.vue
index ffc9acd..e0f1ffc 100644
--- a/src/pages/quesBank/list/index.vue
+++ b/src/pages/quesBank/list/index.vue
@@ -60,9 +60,9 @@ export default {
             }else if(!tab1 && !tab2 && tab3){
                 this.active = 'type'
             }
-            if(!tab1) delete this.tabs.type
-            if(!tab2) delete this.tabs.my
-            if(!tab3) delete this.tabs.global
+            if(!tab1) delete this.tabs.my
+            if(!tab2) delete this.tabs.global
+            if(!tab3) delete this.tabs.type
         }
     }
 };
diff --git a/src/pages/quesBank/list/myQuesBank.vue b/src/pages/quesBank/list/myQuesBank.vue
index fffd1fe..a30fae9 100644
--- a/src/pages/quesBank/list/myQuesBank.vue
+++ b/src/pages/quesBank/list/myQuesBank.vue
@@ -96,7 +96,7 @@
         <el-dialog title="批量导入" :visible.sync="importVisible" width="400px" @close="closeImport" :close-on-click-modal="false">
             <div class="upload-wrap" :class="{lg: uploadFaild}">
                 <el-button class="download" size="small" @click="downLoad"><img src="../../../assets/img/download.png" alt=""> 模板下载</el-button>
-                <el-upload accept=".xls,.xlsx" :on-remove="handleRemove" :on-error="uploadError" :on-success="uploadSuccess" :before-remove="beforeRemove" :limit="1" :on-exceed="handleExceed" :action="this.api.impExcel" :file-list="uploadList" :data="{userId: this.userId}" name="file"> 
+                <el-upload ref="upload" accept=".xls,.xlsx" :on-remove="handleRemove" :on-error="uploadError" :on-success="uploadSuccess" :before-remove="beforeRemove" :limit="1" :on-exceed="handleExceed" :action="this.api.impExcel" :file-list="uploadList" :data="{userId: this.userId}" name="file" :auto-upload="false"> 
                     <el-button size="small"><img src="../../../assets/img/upload.png" alt=""> 上传文件</el-button>
                 </el-upload>
                 <div class="link" v-if="uploadFaild">
diff --git a/src/pages/quesBank/list/quesDialog.vue b/src/pages/quesBank/list/quesDialog.vue
index 1cf9a78..e1be55e 100644
--- a/src/pages/quesBank/list/quesDialog.vue
+++ b/src/pages/quesBank/list/quesDialog.vue
@@ -1,14 +1,7 @@
 <template>
     <div>
         <el-dialog :title="title" :visible.sync="visible" width="1160px" @close="closeTopics" :close-on-click-modal="false">
-            <el-form
-                :model="topicForm"
-                :rules="rules"
-                :disabled.sync="isDetail"
-                ref="topicForm"
-                label-width="100px"
-                class="topic-form"
-            >
+            <el-form :model="topicForm" :rules="rules" :disabled.sync="isDetail" ref="topicForm" label-width="100px" class="topic-form" label-suffix="：">
                 <el-form-item label="所属题库" prop="cid">
                     <el-select v-model="topicForm.cid" clearable placeholder="请选择所属题库">
                         <template v-for="(item,index) in quesBankList">
@@ -124,8 +117,8 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer" v-show="!isDetail">
-                <el-button v-throttle @click="closeDialog">取消</el-button>
-                <el-button type="primary" @click="saveTopics" v-throttle>确定</el-button>
+                <el-button size="small" v-throttle @click="closeDialog">取消</el-button>
+                <el-button size="small" type="primary" @click="saveTopics" v-throttle>确定</el-button>
             </div>
         </el-dialog>
     </div>
diff --git a/src/pages/system/list/index.vue b/src/pages/system/list/index.vue
index 5109879..377c1b4 100644
--- a/src/pages/system/list/index.vue
+++ b/src/pages/system/list/index.vue
@@ -2,7 +2,7 @@
     <div>
         <breadcrumb :data="'系统分管设置/' + tabs[active]" ref="breadcrumb"></breadcrumb>
         <div class="page">
-            <div class="tabs" v-if="showTabs">
+            <div class="tabs">
                 <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{item}}</a>
             </div>
             <div class="page-content">
@@ -29,8 +29,7 @@ export default {
                 staff: '员工管理',
                 role: '角色权限',
                 organization: '架构管理'
-            },
-            showTabs: true
+            }
         };
     },
     components: {
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
index e23fd0f..1952392 100644
--- a/src/pages/system/list/role.vue
+++ b/src/pages/system/list/role.vue
@@ -33,7 +33,7 @@
         </div>
 
         <el-dialog :title="isDetail ? '查看角色' : (isAdd ? '新增角色' : '编辑角色')" :visible.sync="roleVisible" width="500px" @close="closeRole" class="dialog" :close-on-click-modal="false">
-             <el-form ref="form" :model="form" label-width="100px" :disabled="isDetail">
+             <el-form ref="form" :model="form" label-width="100px" label-suffix="：" :disabled="isDetail">
                  <el-form-item label="角色名称">
                     <el-input v-model="form.roleName " ref="account" placeholder="请输入角色名称"></el-input>
                 </el-form-item>
@@ -55,8 +55,8 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="roleVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveData">确 定</el-button>
+                <el-button size="small" @click="roleVisible = false">取 消</el-button>
+                <el-button size="small" type="primary" @click="saveData">确 定</el-button>
             </span>
         </el-dialog>
     </div>
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index 086bd79..1240580 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -52,7 +52,7 @@
         </div>
 
         <el-dialog :title="isDetail ? '查看员工' : (isAddManage ? '新增员工' : '编辑员工')" :visible.sync="manageVisible" width="500px" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
-             <el-form ref="manageForm" :model="manageForm" :rules="rules" label-width="100px" :disabled="isDetail">
+             <el-form ref="manageForm" :model="manageForm" :rules="rules" label-width="100px" label-suffix="：" :disabled="isDetail">
                  <el-form-item prop="userAccount" label="账号">
                     <el-input v-model="manageForm.userAccount" ref="account" placeholder="请输入职工账号" @change="accountChange"></el-input>
                 </el-form-item>
@@ -94,8 +94,8 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="manageVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveSure('manageForm')">确 定</el-button>
+                <el-button size="small" @click="manageVisible = false">取 消</el-button>
+                <el-button size="small" type="primary" @click="saveSure('manageForm')">确 定</el-button>
             </span>
         </el-dialog>
 
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index cb48472..5d41054 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -8,7 +8,7 @@
                     <ul class="filter">
                         <li>
                             <label>搜索：</label>
-                            <el-input placeholder="请输入用户姓名" prefix-icon="el-icon-search" v-model="keyword" clearable size="small"></el-input>
+                            <el-input placeholder="请输入所属院校、管理员姓名、账号" style="width: 300px" prefix-icon="el-icon-search" v-model="keyword" clearable size="small"></el-input>
                         </li>
                     </ul>
                     <div>
@@ -58,7 +58,7 @@
 
         <el-dialog :title="isDetail ? '查看用户' : (isAdd ? '新增用户' : '编辑用户')" :visible.sync="userVisible"
          width="500px" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
-             <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="isDetail">
+             <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-suffix="：" :disabled="isDetail">
                  <el-form-item prop="account" label="账号">
                     <el-input v-model="form.account" ref="account" placeholder="请输入账号" @change="accountChange"></el-input>
                 </el-form-item>
@@ -77,8 +77,8 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="userVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveData">确 定</el-button>
+                <el-button size="small" @click="userVisible = false">取 消</el-button>
+                <el-button size="small" type="primary" @click="saveData">确 定</el-button>
             </span>
         </el-dialog>
 
diff --git a/src/styles/common.scss b/src/styles/common.scss
index ae907fe..e8dcf0c 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -284,8 +284,15 @@
             color: #ffa900;
         }
     }
-    .el-button--primary,.el-button--primary:hover, .el-button--primary:focus{
-        background: #CC221C;
+    .el-button--primary{
+        color: #606266;
+        background: #fff;
+        border-color: #DCDFE6;
+        &:hover{
+            color: $--color-primary;
+            border-color: #efbdbb;
+            background-color: #fae9e8;
+        }
     }
 }