提交

src/components/NavLeft.vue

@@ -668,7 +668,7 @@
               <div class="img"></div>
             </template>
             <template #title>版块详细数据</template>
-            <a-menu-item key="sub17-2-8" v-if="checkMenu('growthpathmap')">
+            <!-- <a-menu-item key="sub17-2-8" v-if="checkMenu('growthpathmap')">
               <span
                 :class="{
                   circleActive: selectedKeys[0] === 'sub17-2-8' ? true : false,
@@ -676,7 +676,7 @@
                 }"
               ></span>
               <router-link to="/growthpathmap">专业力必修</router-link>
-            </a-menu-item>
+            </a-menu-item> -->
             <a-menu-item key="sub17-2-1" v-if="checkMenu('learningpathmap')">
               <span
                 :class="{

src/components/growthpath/CommonHomework.vue

@@ -164,7 +164,7 @@ async function confirm() {
 
     .main_left {
       flex: 1;
-      border-right: 1px solid #e8e8e8;
+      // border-right: 1px solid #e8e8e8;
       margin-top: 0px !important;
       padding-right: 0px;
 

src/components/growthpath/CommonTest.vue

@@ -550,7 +550,7 @@ defineExpose({ setStep });
       padding-right: 30px;
       margin-top: 0px;
       flex: 1;
-      border-right: 1px solid #e8e8e8;
+      // border-right: 1px solid #e8e8e8;
 
       .main_item {
         display: flex;

src/components/growthpath/CreateVote.vue

@@ -140,7 +140,7 @@ function itemDel(i) {
     margin-left: 50px;
     padding-right: 30px;
     flex: 1;
-    border-right: 1px solid #e8e8e8;
+    // border-right: 1px solid #e8e8e8;
 
     .main_item {
       display: flex;

src/components/growthpath/GrowthActive.vue

@@ -410,7 +410,7 @@ defineExpose({ openDrawer });
         margin-top: 0px;
         padding-right: 30px;
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
 
         .main_item {
           display: flex;

src/components/growthpath/GrowthDiscuss.vue

@@ -190,6 +190,10 @@ defineExpose({ openDrawer });
 }
 
 .growth-discuss {
+  .ant-spin-container,
+  .ant-spin-nested-loading {
+    height: 100%;
+  }
   .drawerMain {
     .header {
       height: 73px;
@@ -216,7 +220,7 @@ defineExpose({ openDrawer });
         margin-top: 0px;
         padding-right: 30px;
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
 
         .main_item {
           display: flex;

src/components/growthpath/GrowthEval.vue

@@ -300,7 +300,12 @@ defineExpose({ openDrawer });
   min-width: 800px !important;
   width: 800px !important;
 }
-
+::v-deep.ant-spin-nested-loading {
+  height: 100%;
+  .ant-spin-container {
+    height: 100%;
+  }
+}
 .growth-eval {
   .drawerMain {
     .header {
@@ -328,7 +333,7 @@ defineExpose({ openDrawer });
         margin-top: 0px;
         padding-right: 0px;
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
 
         .main_item {
           display: flex;

src/components/growthpath/GrowthExa.vue

@@ -679,7 +679,7 @@ defineExpose({ openDrawer });
         padding-right: 30px;
         margin-top: 0px;
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
 
         .main_item {
           display: flex;

src/components/growthpath/GrowthHomework.vue

@@ -198,7 +198,7 @@ async function confirm() {
     formData.value.info.submitStartTime,
     "minutes"
   );
-  spinning.value = true
+  spinning.value = true;
   saveTask(formData.value)
     .then((res) => {
       if (res.data.code == 200) {
@@ -238,6 +238,10 @@ defineExpose({ openDrawer });
 }
 
 .growth-homework {
+  .ant-spin-container,
+  .ant-spin-nested-loading {
+    height: 100%;
+  }
   .drawerMain {
     .header {
       height: 73px;
@@ -262,7 +266,7 @@ defineExpose({ openDrawer });
 
       .main_left {
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
         margin-top: 0px;
         padding-right: 0px;
 

src/components/growthpath/GrowthLive.vue

@@ -612,7 +612,7 @@ const beforeUpload = (file) => {
     .contentMain {
       .main_left {
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
         margin-top: 0px;
 
         .main_item {

src/components/growthpath/GrowthRef.vue

@@ -191,6 +191,10 @@ defineExpose({ openDrawer });
 }
 
 .growth-ref {
+  .ant-spin-container,
+  .ant-spin-nested-loading {
+    height: 100%;
+  }
   .drawerMain {
     .header {
       height: 73px;
@@ -216,7 +220,7 @@ defineExpose({ openDrawer });
       .main_left {
         padding-right: 30px;
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
         margin-top: 0px;
 
         .main_item {

src/components/growthpath/GrowthVote.vue

@@ -277,7 +277,12 @@ defineExpose({ openDrawer });
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
-
+::v-deep.ant-spin-nested-loading {
+  height: 100%;
+  .ant-spin-container {
+    height: 100%;
+  }
+}
 .growth-vote {
   .drawerMain {
     .header {
@@ -304,7 +309,7 @@ defineExpose({ openDrawer });
       .main_left {
         padding-right: 30px;
         flex: 1;
-        border-right: 1px solid #e8e8e8;
+        // border-right: 1px solid #e8e8e8;
         margin-top: 0px;
 
         .main_item {

src/views/growthpath/PathManage.vue

@@ -1131,7 +1131,7 @@ export default {
           codeUrl =
             window.location.protocol +
             process.env.VUE_APP_EXAM_DETAIL_URL +
-            item.info.examinationPaperId;
+            item.info.examinationTestId;
         }
       }
       // 直播结束时间

src/views/report/Employeelearning.vue

@@ -363,14 +363,14 @@ export default {
         width: 120,
         align: "center",
       },
-      {
+      // {
-        title: "专业力学习",
+      //   title: "专业力学习",
-        dataIndex: "growthStudy",
+      //   dataIndex: "growthStudy",
-        ellipsis: true,
+      //   ellipsis: true,
-        key: "growthStudy",
+      //   key: "growthStudy",
-        width: 120,
+      //   width: 120,
-        align: "center",
+      //   align: "center",
-      },
+      // },
       {
         title: "学习时长",
         dataIndex: "learningDuration",

src/views/report/Operational.vue

@@ -106,10 +106,10 @@
                   label: '学习路径图',
                   value: 6,
                 },
-                {
+                // {
-                  label: '专业力必修',
+                //   label: '专业力必修',
-                  value: 7,
+                //   value: 7,
-                },
+                // },
               ]"
             ></a-select>
           </div>

src/views/report/Overvoew.vue

@@ -392,7 +392,7 @@ export default {
           { text: "课程", num: res.data.result?.courseTotal },
           { text: "考试", num: res.data.result?.examTotal },
           { text: "案例", num: res.data.result?.caseTotal },
-          { text: "专业力", num: res.data.result?.growthTotal },
+          // { text: "专业力", num: res.data.result?.growthTotal },
         ];
         tabData.value = list;
       });
@@ -1009,7 +1009,7 @@ export default {
       { text: "课程", num: "11" },
       { text: "考试", num: "10" },
       { text: "案例", num: "10" },
-      { text: "专业力必修", num: "10" },
+      // { text: "专业力必修", num: "10" },
     ]);
     const tabClick = (index) => {
       state.selectedRowKeys = [];