刘洋 hace 2 años
padre
commit
a67cf4c3f1

+ 9 - 0
src/layout/main/LeftMenu.vue

@@ -84,6 +84,15 @@ const onHandle = () => {
   :deep(.el-sub-menu .el-menu-item) {
     height: 34px !important;
   }
+  :deep(> .el-menu-item) {
+    & > .main-layout-sub-menu-title {
+      & > .router-link-active {
+        color: #fff;
+        background: $color--primary;
+      }
+    }
+  }
+
   :deep(.el-menu) {
     background-color: #333;
     .el-menu-item {

+ 4 - 1
src/modules/quality/ending-check/components/SubjectProgress.vue

@@ -211,7 +211,10 @@ const columns: EpTableColumn<SubjectProgress>[] = [
   {
     label: '科目',
     formatter() {
-      return mainStore.myUserInfo?.subjectCode + '-' + mainStore.myUserInfo?.subjectName
+      let sName = (subjectList.value || []).find((item: any) => item.code == model.subjectCode)?.name
+      return (
+        (mainStore.myUserInfo?.subjectCode || model.subjectCode) + '-' + (mainStore.myUserInfo?.subjectName || sName)
+      )
     },
     minWidth: 100,
   },

+ 3 - 3
src/modules/quality/self-check/index.vue

@@ -187,7 +187,7 @@ watch(currentSelfCheckAnalysis, () => {
 })
 
 function onSearch() {
-  selfCheckAnalysis({ ...omit(model, 'time'), startTime: model.time[0], endTime: model.time[1] })
+  selfCheckAnalysis({ ...omit(model, 'time'), startTime: model.time?.[0], endTime: model.time?.[1] })
 }
 
 /** 自查一致性列表双击 */
@@ -196,8 +196,8 @@ const onSelfCheckAnalysisDBClick = () => {
     name: 'QualitySelfCheckDetail',
     query: {
       ...omit(model, 'time'),
-      startTime: model.time[0],
-      endTime: model.time[1],
+      startTime: model.time?.[0],
+      endTime: model.time?.[1],
     },
   })
 }

+ 2 - 1
src/router/expert.ts

@@ -17,7 +17,8 @@ const routes: RouteRecordRaw[] = [
     children: [
       {
         name: 'ExpertNav',
-        path: 'nav',
+        // path: 'nav',
+        path: '',
         component: () => import('@/modules/expert/nav/index.vue'),
         meta: {
           label: '专家卷浏览导航',