Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/learningpath/LearningPath.vue
#	src/views/projectcenter/ProjectManage.vue

src/api/request.js

@@ -138,7 +138,7 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    url = process.env.VUE_APP_BOE_API_URL + url
+    // url = process.env.VUE_APP_BOE_API_URL + url
     return fetch(url, {
         method,
         headers: {

src/assets/scss/common.scss

@@ -51,31 +51,37 @@ body {
   height: 6px;
   /*对水平流动条有效*/
 }
+
 ::-o-scrollbar {
   width: 6px;
   /*对垂直流动条有效*/
   height: 6px;
   /*对水平流动条有效*/
 }
+
 .scrollbar {
   width: 6px;
   /*对垂直流动条有效*/
   height: 6px;
   /*对水平流动条有效*/
 }
+
 /*定义滚动条的轨道颜色、内阴影及圆角*/
 ::-webkit-scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
 }
+
 ::-moz-scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
 }
+
 ::-o-scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
 }
+
 .scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
@@ -86,14 +92,17 @@ body {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
 }
+
 ::-moz-scrollbar-thumb {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
 }
+
 ::-o-scrollbar-thumb {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
 }
+
 .scrollbar-thumb {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
@@ -104,35 +113,43 @@ body {
   background-color: cyan;
   display: none;
 }
+
 ::-moz-scrollbar-button {
   background-color: cyan;
   display: none;
 }
+
 ::-o-scrollbar-button {
   background-color: cyan;
   display: none;
 }
+
 .scrollbar-button {
   background-color: cyan;
   display: none;
 }
+
 /*定义右下角汇合处的样式*/
 ::-webkit-scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 ::-moz-scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 ::-o-scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 .scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 //隐藏滚动条----------------------------------------------------------------
 
 //禁止选中----------------------------------------------------------
@@ -329,7 +346,8 @@ textarea {
 
 //抽屉--------------------------------------------------------
 .drawerStyle {
-	// transform: translateX(0px) !important;
+
+  // transform: translateX(0px) !important;
   .ant-drawer-content-wrapper {
     max-width: 1050px;
 
@@ -437,29 +455,34 @@ textarea {
   }
 }
 
-.ant-modal{
+.ant-modal {
-  .modalHeader{
+  .modalHeader {
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
   }
-  .top{
+
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+  .top {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
   }
-  .del_header{
+
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+  .del_header {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
   }
 }
+
 //弹窗--------------------------------------------------------
 
 //loading--------------------------------------------------------
 .aeLoading {
   width: 100%;
   height: 100%;
-background: rgba(0, 0, 0, 0.2);
+  background: rgba(0, 0, 0, 0.2);
-display: flex;
+  display: flex;
-align-items: center;
+  align-items: center;
-justify-content: center;
+  justify-content: center;
-position: absolute;
+  position: absolute;
-left: 0;
+  left: 0;
-top:0,
+  top: 0;
+  z-index: 100
 }
+
 //loading--------------------------------------------------------

src/views/learningpath/LevelAdd.vue

@@ -10,26 +10,27 @@
         <div class="fort">创建时间：{{ cretime }}</div>
       </div>
       <div class="right">
-       <!--
+        <!--
         <img
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
         />
         <div v-if="action == 1 || action == 0" class="line"></div>-->
-        <div class ="pubIcon" v-if="action == 1 || action == 0"  @click="pubIcon(action)">
+        <div
-        <img
+          class="pubIcon"
-          class="img2"
+          v-if="action == 1 || action == 0"
-          src="../../assets/images/leveladd/pub.png"
+          @click="pubIcon(action)"
-        />
+        >
-        <!-- 已发布的显示 -->
+          <img class="img2" src="../../assets/images/leveladd/pub.png" />
-        <div class="pub" style="width: 28px">
+          <!-- 已发布的显示 -->
-          {{ act }}
+          <div class="pub" style="width: 28px">
+            {{ act }}
+          </div>
         </div>
-       </div>
         <div class="line"></div>
         <router-link to="/learningpath"
-          ><div style="display: flex; ">
+          ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
@@ -507,7 +508,7 @@
         <a-tab-pane key="3" tab="学员管理" force-render>
           <TableStudent :type="2" :id="routerId" :stage="stage"></TableStudent>
         </a-tab-pane>
-            <!--1211注释 待开放
+        <!--1211注释 待开放
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
 
@@ -703,7 +704,6 @@
           </a-tabs>
         </a-tab-pane>
    -->
-
       </a-tabs>
 
       <a-modal
@@ -1114,6 +1114,7 @@ import { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import TableStudent from "@/components/student/TableStudent";
 // import * as student from "@/api/student";
+import { getStuPage } from "@/api/index1";
 export default {
   name: "LevelAdd",
   components: {
@@ -1367,12 +1368,12 @@ export default {
           className: "h",
         },
         //  {
-         //   title: "岗位",
+        //   title: "岗位",
-          //  dataIndex: "gang",
+        //  dataIndex: "gang",
-         //   key: "gang",
+        //   key: "gang",
-         //   width: 110,
+        //   width: 110,
-          //  align: "center",
+        //  align: "center",
-         //   className: "h",
+        //   className: "h",
         //  },
         {
           title: "当前关卡",
@@ -1382,14 +1383,14 @@ export default {
           align: "center",
           className: "h",
         },
-          {
+        {
-            title: "进度",
+          title: "进度",
-           dataIndex: "jin",
+          dataIndex: "jin",
-           key: "jin",
+          key: "jin",
-            width: 110,
+          width: 110,
-           align: "center",
+          align: "center",
-           className: "h",
+          className: "h",
-          },
+        },
         {
           title: "开始时间",
           dataIndex: "time",
@@ -1680,10 +1681,10 @@ export default {
       let stuobj = {
         pageNo: 1,
         pageSize: 10,
-        routerId: state.routerId,
+        pid: state.routerId,
+        type: 2,
       };
-      api
+      getStuPage(stuobj)
-        .getStudent(stuobj)
         .then((res) => {
           console.log("获取学员列表", res.data.data.total);
           if (res.data.code === 200) {
@@ -1695,14 +1696,13 @@ export default {
           console.log("获取学员列表失败", err);
         });
     };
-    const pubIcon =(action)=>{
+    const pubIcon = (action) => {
-      if(action ==1){
+      if (action == 1) {
         showBackModal();
-      }else{
+      } else {
         showPub();
       }
-
+    };
-    }
     //显示撤回弹窗
     const showBackModal = () => {
       state.backModal = true;
@@ -1868,7 +1868,10 @@ export default {
             state.nodata = false;
           }
           let data = res.data.data.chapterList;
-          state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name}))
+          state.stage = res.data.data.chapterList.map((e) => ({
+            id: e.chapterId,
+            name: e.name,
+          }));
           state.taskSyllabus = data;
           // for(let i in data) {
           //   state.taskSyllabus[i].name = data[i].name
@@ -2851,23 +2854,23 @@ export default {
         background-color: #e8effa;
         margin-right: 28px;
       }
-      .pubIcon{
+      .pubIcon {
         display: flex;
         align-items: center;
 
         .img2 {
-        width: 42px;
+          width: 42px;
-        height: 42px;
+          height: 42px;
-        margin-right: 22px;
+          margin-right: 22px;
-      }
+        }
 
-      .pub {
+        .pub {
-        color: #ffb64e;
+          color: #ffb64e;
-        font-size: 14px;
+          font-size: 14px;
-        margin-top: 5px;
+          margin-top: 5px;
-        margin-right: 30px;
+          margin-right: 30px;
-        cursor: pointer;
+          cursor: pointer;
-      }
+        }
       }
 
       .img2 {
@@ -4262,7 +4265,5 @@ export default {
       }
     }
   }
-
-
 }
 </style>

src/views/research/ResearchManage.vue

@@ -174,7 +174,11 @@
     <!--操作弹窗 -->
   </div>
   <!--  加载动画 -->
-  <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+  <div
+    class="aeLoading"
+    style="z-index: 100"
+    :style="{ display: addLoading ? 'flex' : 'none' }"
+  >
     <a-spin :spinning="addLoading" tip="" />
   </div>
 </template>