zhangjie 2 ani în urmă
părinte
comite
dc3133eb28

+ 1 - 1
src/components/base/QuestionTeacherUserSelect.vue

@@ -12,7 +12,7 @@
       v-for="item in optionList"
       :key="item.id"
       :value="item.id"
-      :label="item.name"
+      :label="`${item.name}(${item.loginName})`"
     ></el-option>
   </el-select>
 </template>

+ 0 - 1
src/modules/base/components/ModifyCardRule.vue

@@ -59,7 +59,6 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="modalForm.examNumberStyle === 'FILL'"
         prop="examNumberDigit"
         label="考号位数:"
         class="inline-block"

+ 8 - 8
src/views/Home.vue

@@ -158,7 +158,7 @@ export default {
   watch: {
     $route(val) {
       if (val.name === "Home") return;
-      if (this.$route.name === HOME_PAGE_ROUTE) {
+      if (val.name === HOME_PAGE_ROUTE) {
         return;
       }
 
@@ -362,13 +362,13 @@ export default {
     },
     routerChange() {
       this.updateBreadcrumbs();
-      if (!this.curMenu.url) {
-        // 从HomePage快捷菜单跳转过来的
-        const curMenu = this.menus.find(
-          menu => menu.url === this.breadcrumbs[0].url
-        );
-        this.menuChange(curMenu);
-      }
+      // console.log(this.breadcrumbs);
+      // console.log(this.curMenu);
+
+      const curMenu = this.menus.find(
+        menu => menu.url === this.breadcrumbs[0].url
+      );
+      this.menuChange(curMenu);
 
       if (
         this.validRoutes.includes("WaitTask") &&