.

src/api/index.js

@@ -42,8 +42,8 @@ export default {
   getStaff: `management/staff/getStaff`,
   queryStaff: `management/staff/enterpriseList`,
   updateStaff: `management/staff/updateStaff`,
-  exportFailureStaff: `management/staff/exportFailure`,
+  exportFailureStaff: `${Setting.apiBaseURL}/management/staff/exportFailure`,
-  uploadFileStaff: `management/staff/uploadFile`,
+  uploadFileStaff: `${Setting.apiBaseURL}/management/staff/uploadFile`,
   downloadStaffTemp: `http://liuwanr.oss-cn-shenzhen.aliyuncs.com/xlsx/20201102/1604658763812.xlsx`,
 
   // 角色管理
@@ -70,8 +70,8 @@ export default {
   deleteUser: `cjEnterprise/user/deleteUser`,
   queryUser: `cjEnterprise/user/list`,
   updateUser: `cjEnterprise/user/updateUser`,
-  uploadFileUser: `cjEnterprise/user/uploadFile`,
+  uploadFileUser: `${Setting.apiBaseURL}/cjEnterprise/user/uploadFile`,
-  exportFailureUser: `cjEnterprise/user/exportFailure`,
+  exportFailureUser: `${Setting.apiBaseURL}/cjEnterprise/user/exportFailure`,
   downloadUserTemp: 'http://liuwanr.oss-cn-shenzhen.aliyuncs.com/xlsx/20201102/1604658619702.xlsx',
 
   // 题库分类
@@ -92,7 +92,7 @@ export default {
   pageByCondition:`cjEnterprise/questions/pageByCondition`,
   updateQuestions:`cjEnterprise/questions/update`,
   getExcel:`cjEnterprise/questions/getExcel`,
-  impExcel:`cjEnterprise/questions/impExcel`,
+  impExcel:`${Setting.apiBaseURL}/cjEnterprise/questions/impExcel`,
 
   // 共享相关
   batchSave:`cjEnterprise/questionSharing/batchSave`,

src/pages/account/login/index.vue

@@ -92,7 +92,7 @@ export default {
                         password: this.loginForm.password
                     }
                     this.login(data).then(() => {
-                        let redirect = decodeURIComponent(this.$route.query.redirect || '/')
+                        let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : '/index'
                         this.$router.replace(redirect)
                     }).catch(() => {})
                 }

src/pages/client/add/index.vue

@@ -1,7 +1,5 @@
 <template>
     <div>
-       <el-row :gutter="20">
-            <el-col :span="24">
         <el-card shadow="hover" class="m-b-20">
             <div class="flex j-between a-center">
                 <div class="per_title" v-throttle @click="goback()">
@@ -62,9 +60,6 @@
                 </div>
             </div>
         </el-card>
-
-            </el-col>
-        </el-row>
     </div>
 </template>
 

src/pages/client/list/index.vue

@@ -1,7 +1,5 @@
 <template>
     <div>
-        <el-row :gutter="20">
-            <el-col :span="24">
         <el-card shadow="hover" class="m-b-20">
             <div>
                 <div class="p-title m-b-20">筛选</div>
@@ -38,9 +36,7 @@
                 </div>
             </div>  
         </el-card>
-            </el-col>
 
-            <el-col :span="24">
         <el-card shadow="hover">
             <div class="flex j-between m-b-20">
                 <div class="p-title">客户列表</div>
@@ -88,8 +84,6 @@
                 </el-pagination>
             </div>
         </el-card>
-            </el-col>
-        </el-row>
     </div>
 </template>
 

src/pages/exception/error/403/index.vue

@@ -4,7 +4,7 @@
         <div class="error-desc">啊哦~ 你没有权限访问该页面哦</div>
         <div class="error-handle">
             <router-link to="/">
-            <el-button type="primary" size="large">返回首页</el-button>
+                <el-button type="primary" size="large" @click="toIndex">返回首页</el-button>
             </router-link>
             <el-button class="error-btn" type="primary" size="large" @click="goBack">返回上一页</el-button>
         </div>
@@ -14,6 +14,9 @@
 <script>
 export default {
     methods: {
+        toIndex(){
+            this.$router.push('/')
+        },
         goBack(){
             this.$router.go(-1);
         }

src/pages/exception/error/404/index.vue

@@ -4,7 +4,7 @@
             <div class="error-desc">啊哦~ 你所访问的页面不存在</div>
             <div class="error-handle">
                 <router-link to="/">
-            <el-button type="primary" size="large">返回首页</el-button>
+                    <el-button type="primary" size="large" @click="toIndex">返回首页</el-button>
                 </router-link>
                 <el-button class="error-btn" type="primary" size="large" @click="goBack">返回上一页</el-button>
             </div>
@@ -14,6 +14,9 @@
 <script>
 export default {
     methods: {
+        toIndex(){
+            this.$router.push('/')
+        },
         goBack(){
             this.$router.go(-1);
         }

src/pages/quesBank/list/globalQuesBank.vue

@@ -23,7 +23,7 @@
                             </el-form>
                         </div>
                         <div>
-                            <el-input placeholder="请输入题库名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
+                            <el-input placeholder="请输入题干/知识点" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
                         </div>
                     </div>
                 </div>

src/pages/quesBank/list/myQuesBank.vue

@@ -1,7 +1,5 @@
 <template>
     <div>
-        <el-row :gutter="20">
-            <el-col :span="24">
         <el-card shadow="hover" class="m-b-20">
             <div class="p-title m-b-20">测评题库</div>
             
@@ -16,7 +14,7 @@
                 </el-form>
                 <div>
                     <el-input
-                                placeholder="请输入题干"
+                        placeholder="请输入题干/知识点"
                         prefix-icon="el-icon-search"
                         v-model="keyword"
                         clearable
@@ -24,9 +22,7 @@
                 </div>
             </div>
         </el-card>
-            </el-col>
 
-            <el-col :span="24">
         <el-card shadow="hover" class="m-b-20">
             <div class="flex j-between m-b-20">
                 <div class="p-title">题目列表</div>
@@ -113,8 +109,6 @@
                 ></el-pagination>
             </div>
         </el-card>
-            </el-col>
-        </el-row>
 
         <ques-dialog ref="quesDialog" :title="topicsTitle" :visible.sync="visible" :isDetail.sync="isDetail" @getData="dialogGetData" @closeTopics="closeTopics"></ques-dialog>
 
@@ -343,7 +337,6 @@ export default {
             }
         }, 
         downLoad() {
-            // location.href = 'http://192.168.31.152:8001/cjEnterprise/questions/getExcel'
             location.href = 'http://39.108.250.202/cjEnterprise/题库导入模板.xlsx'
         },
         showimportVisible() {

src/pages/quesBank/list/quesDialog.vue

@@ -241,9 +241,18 @@ export default {
             .catch(err => {})
         },
         getQuesBank() {
-            this.$get(this.api.getTypeByOneLever)
+            let data = {
+                pageNum: 1,
+                pageSize: 10000
+            }
+            this.$post(this.api.listByPage,data)
             .then(res => {
-                this.quesBankList = res.data.list
+                let list = res.data.list.list
+                let result = list
+                list.map((n,i) => {
+                    result = result.concat(n.secondColumn)
+                })
+                this.quesBankList = result
             })
             .catch(err => {})
         },

src/pages/user/list/index.vue

@@ -270,7 +270,7 @@ export default {
                     let data = {
                         userInfo: {
                             id: form.id,
-                            isPort: 1,
+                            isPort: 2,
                             userId: form.userId,
                             account: form.account,
                             clientId: form.clientId,
@@ -282,7 +282,7 @@ export default {
                         },
                         userManagement: {
                             id: form.id,
-                            isPort: 1,
+                            isPort: 2,
                             userId: form.userId,
                             account: form.account,
                             clientId: form.clientId,

src/plugins/requests/index.js

@@ -6,7 +6,7 @@ import Setting from '@/setting'
 
 const service = axios.create({
     baseURL: Setting.apiBaseURL,
-    timeout: 5000
+    timeout: 50000
 })
 
 // post请求头

src/router/permission.js

@@ -8,10 +8,14 @@ router.beforeEach((to, from, next) => {
     document.title = to.meta.title ? `${to.meta.title} | ${Setting.titleSuffix}` : Setting.titleSuffix;
     const role = util.session.get(Setting.usernameKey);
     if (!role && to.path !== '/login') {
+        if(to.fullPath == '/'){
+            next('/login')
+        }else{
             next({
                 path: '/login',
                 query: {redirect: to.fullPath}
             })
+        }
     } else if(role && to.path == '/login') {
         next('/index')
     } else {