修改部分接口参数及接口路径，完善部分页面逻辑

src/api/modules/exam.js

@@ -2,7 +2,7 @@
 export default {
   API_LIST_EXAM: {
     // 查询考试列表信息
-    INTERFACE_GET_EXAMS: "exams",
+    INTERFACE_GET_EXAMS: "admin/exams",
     // 删除某个考试
     INTERFACE_DELETE_EXAM: "exams/{examId}",
     // 批量删除考试

src/components/layout/components/AppMain.vue

@@ -4,10 +4,9 @@
   >
     <transition name="fade-transform" mode="out-in">
       <!-- :include="cachedViews" -->
-      <!-- <keep-alive>
-        <router-view v-if="active" :key="key" />
-      </keep-alive> -->
-      <router-view :key="key" />
+      <!-- <keep-alive> -->
+      <router-view v-if="active" :key="key" />
+      <!-- </keep-alive> -->
     </transition>
   </section>
 </template>

src/components/layout/components/Sider.vue

@@ -138,7 +138,12 @@ export default {
     },
     // 操作：点击了某个路由菜单
     handleMenuRouterFun(item) {
-      this.$router.push({ path: item.path });
+      // 路径相同就刷新，否则就跳转
+      if (this.$route.path === item.path) {
+        this.$emit('reload');
+      } else {
+        this.$router.push({ path: item.path });
+      }
     },
   },
 };

src/components/layout/index.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout id="components-layout-demo-custom-trigger">
     <a-layout-sider v-model="collapsed" :trigger="null" collapsible>
-      <Sider />
+      <Sider @reload="reload" />
     </a-layout-sider>
     <a-layout>
       <a-layout-header style="background: #fff; padding: 0">

src/plugins/modules/axios.js

@@ -75,7 +75,7 @@ _axios.interceptors.request.use(
 _axios.interceptors.response.use(
   response => {
     // 用来判断是否请求成功
-    const success = response.status === 200;
+    const success = response.status === 200 || response.status === 201; // 201是为了新建用户接口
     let messages = "";
     if (!success) {
       if (typeof response.data === "string") {

src/utils/tools.js

@@ -50,7 +50,6 @@ export function getSession (key) {
  */
 export function drag (dom) {
   var drag = document.querySelector(dom);
-  console.log(drag)
   if (!drag) return false;
   // //点击某物体时，用drag对象即可，move和up是全局区域，
   // 也就是整个文档通用，应该使用document对象而不是drag对象(否则，采用drag对象时物体只能往右方或下方移动)

src/views/articleManagement/articleList.vue

@@ -95,7 +95,7 @@
               </div> -->
               <!-- 工种 -->
               <div class="article-list-item-info-engineeringWork">
-                {{ item.engineeringWorkTxt }}
+                {{ item.engineerTypeTxt }}
               </div>
             </div>
             <div class="article-list-item-info-right">
@@ -226,6 +226,15 @@ export default {
                 item.engineeringWorkTxt = it.name;
               }
             });
+            if (
+              item.engineerTypes &&
+              item.engineerTypes[0] &&
+              item.engineerTypes[0].id
+            ) {
+              item.engineerTypeTxt = item.engineerTypes[0].name;
+            } else {
+              item.engineerTypeTxt = '不限';
+            }
           });
           this.articleList = res.data.content;
           this.pagination.total = res.data.totalElements;

src/views/examManagement/examAutomaticVolumeFormation.vue

@@ -595,6 +595,8 @@ export default {
             resData.engineerTypes[0].id
           ) {
             resData.engineeringWork = resData.engineerTypes[0].id;
+          } else {
+            resData.engineerTypeTxt = '不限';
           }
           this.examDetailData = {
             id: resData.id || '',

src/views/examManagement/examManagementDetail.vue

@@ -257,12 +257,9 @@ export default {
             resData.engineerTypes[0].id
           ) {
             resData.engineerTypesTxt = resData.engineerTypes[0].name;
+          } else {
+            resData.engineerTypeTxt = '不限';
           }
-          // this.engineeringWorkList.forEach((item) => {
-          //   if (item.id === resData.engineerTypes[0].id) {
-          //     resData.engineerTypeTxt = item.name;
-          //   }
-          // });
           let obj = formateExamStatesFun(resData.startTime, resData.deadline);
           resData.examStatus = obj.examStatus;
           resData.examStatusTxt = obj.examStatusTxt;
@@ -298,7 +295,6 @@ export default {
           { params }
         )
         .then((res) => {
-          console.log(res);
           let resData = res.data.content;
           resData.forEach((item) => {
             // 试题类别
@@ -314,12 +310,9 @@ export default {
               item.engineerTypes[0].id
             ) {
               item.engineerTypesTxt = item.engineerTypes[0].name;
+            } else {
+              item.engineerTypeTxt = '不限';
             }
-            // this.engineeringWorkList.forEach((it) => {
-            //   if (item.engineerTypes === it.id) {
-            //     resData.engineerTypeTxt = it.name;
-            //   }
-            // });
           });
           this.tableData = resData;
           this.pagination.total = res.data.totalElements; // 总条数

src/views/examManagement/examManualVolumeFormation.vue

@@ -206,6 +206,7 @@
             selectedRowKeys: current_selectedRowKeys,
             onChange: onCurrentTableSelectChange,
           }"
+          :loading="loading"
           :pagination="current_pagination"
           @change="handleCurrentTableChangePage"
         >
@@ -350,6 +351,7 @@
                 },
               }),
             }"
+            :loading="loading"
             :pagination="false"
           >
             <template slot="action" slot-scope="text, record">
@@ -659,7 +661,6 @@ export default {
       this.$_http
         .get(formatePathParams(this.$_API.INTERFACE_GET_EXAM_DETAIL, params))
         .then((res) => {
-          console.log(res.data);
           let resData = res.data;
           // 考试时长
           let tarTime = formatTimeHoursMinuteSecondsFun(resData.duration);
@@ -670,6 +671,8 @@ export default {
             resData.engineerTypes[0].id
           ) {
             resData.engineeringWork = resData.engineerTypes[0].id;
+          } else {
+            resData.engineerTypeTxt = '不限';
           }
           this.examDetailData = {
             id: resData.id || '',
@@ -683,7 +686,6 @@ export default {
             engineeringWork:
               resData.engineeringWork || this.examTypeList[0].code, // 工种类别
           };
-          console.log('基础数据', this.examDetailData);
           this.loading = false;
         })
         .catch(() => {
@@ -722,17 +724,14 @@ export default {
               }
             });
             // 工种
-            // this.engineeringWorkList.forEach((it) => {
-            //   if (item.engineerTypes === it.id) {
-            //     resData.engineerTypeTxt = it.name;
-            //   }
-            // });
             if (
               item.engineerTypes &&
               item.engineerTypes[0] &&
               item.engineerTypes[0].id
             ) {
-              item.engineerTypesTxt = item.engineerTypes[0].name;
+              item.engineerTypeTxt = item.engineerTypes[0].name;
+            } else {
+              item.engineerTypeTxt = '不限';
             }
           });
           this.current_tableData = resData;
@@ -925,13 +924,14 @@ export default {
               item.engineerTypes[0] &&
               item.engineerTypes[0].id
             ) {
-              item.engineerTypesTxt = item.engineerTypes[0].name;
+              item.engineerTypeTxt = item.engineerTypes[0].name;
+            } else {
+              item.engineerTypeTxt = '不限';
             }
           });
           this.bank_pagination.total = res.data.totalElements; // 总条数
           this.bank_tableData = [...resData];
           if (this.current_tableData.length > 0) {
-            console.log('in');
             this.formateBankTableDisabledRowFun(); // 禁用
           }
           this.loading = false;

src/views/examQuestionManagement/examQuestionList.vue

@@ -319,6 +319,8 @@ export default {
               item.engineerTypes[0].id
             ) {
               item.engineerTypeTxt = item.engineerTypes[0].name;
+            } else {
+              item.engineerTypeTxt = '不限';
             }
           });
           this.pagination.total = res.data.totalElements; // 总条数

src/views/examQuestionManagement/examQusetionCreateGapFilling.vue

@@ -224,7 +224,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          console.log(values);
           let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
             values.engineeringWorkChooseValue
           ); // 获取工种信息

src/views/examQuestionManagement/examQusetionCreateMultiple.vue

@@ -253,7 +253,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          console.log(values);
           let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
             values.engineeringWorkChooseValue
           ); // 获取工种信息

src/views/examQuestionManagement/examQusetionCreateTrueOrFalse.vue

@@ -237,7 +237,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          console.log(values);
           let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
             values.engineeringWorkChooseValue
           ); // 获取工种信息

src/views/login/index.vue

@@ -84,7 +84,6 @@ export default {
       e.preventDefault();
       this.loginForm.validateFields((err, values) => {
         if (!err) {
-          console.log(values);
           let params = {
             userName: values.loginUserName,
             password: values.loginPassword,