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,6 +346,7 @@ textarea {
 
 //抽屉--------------------------------------------------------
 .drawerStyle {
+
   // transform: translateX(0px) !important;
   .ant-drawer-content-wrapper {
     max-width: 1050px;
@@ -441,13 +459,16 @@ textarea {
   .modalHeader {
     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;
   }
 }
+
 //弹窗--------------------------------------------------------
 
 //loading--------------------------------------------------------
@@ -460,6 +481,8 @@ align-items: center;
   justify-content: center;
   position: absolute;
   left: 0;
-top:0,
+  top: 0;
+  z-index: 100
 }
+
 //loading--------------------------------------------------------

src/views/learningpath/LevelAdd.vue

@@ -17,11 +17,12 @@
           @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 }}
@@ -29,7 +30,7 @@
         </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>
@@ -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: {
@@ -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) {
@@ -1701,8 +1702,7 @@ export default {
       } 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
@@ -4262,7 +4265,5 @@ export default {
       }
     }
   }
-
-
 }
 </style>

src/views/projectcenter/TaskPage.vue

@@ -691,7 +691,12 @@
           <div class="content3">
             <a-tabs v-model:activeKey="activeKey1">
               <a-tab-pane key="8" tab="学员管理">
-                <TableStudent :type="1" :id="projectId" :columns="stuColumns" :stage="stage"></TableStudent>
+                <TableStudent
+                  :type="1"
+                  :id="projectId"
+                  :columns="stuColumns"
+                  :stage="stage"
+                ></TableStudent>
               </a-tab-pane>
             </a-tabs>
           </div>
@@ -1688,7 +1693,7 @@ import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import TableStudent from "@/components/student/TableStudent";
-
+import { getStuPage } from "@/api/index1";
 export default {
   name: "taskPage",
   components: {
@@ -1714,14 +1719,15 @@ export default {
     NoticeHis,
     TwoDimensionalCode,
     ProjectManager,
-    TableStudent
+    TableStudent,
   },
   setup() {
     const store = useStore();
     const route = useRoute();
     const state = reactive({
       stage: [],
-      stuColumns: [{
+      stuColumns: [
+        {
           title: "进度",
           dataIndex: "progress",
           key: "progress",
@@ -1729,8 +1735,11 @@ export default {
           align: "center",
           className: "h",
           ellipsis: true,
-        customRender: ({record}) => <div>{record.finishTaskNum}/{record.totalTaskNum}</div>
+          customRender: ({ record }) => (
-
+            <div>
+              {record.finishTaskNum}/{record.totalTaskNum}
+            </div>
+          ),
         },
         {
           title: "最近学习时间",
@@ -1739,7 +1748,8 @@ export default {
           width: 80,
           align: "center",
           className: "h",
-        }],
+        },
+      ],
       loading: false,
       projectId: route.query.projectId,
       isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
@@ -3343,7 +3353,10 @@ export default {
         console.log("get task", res.data.data);
         if (res.data.code === 200) {
           // 判断当前审核是否通过
-          if (res.data.data.status == -5 && res.data.data.projectAuditLogDtoList !== null) {
+          if (
+            res.data.data.status == -5 &&
+            res.data.data.projectAuditLogDtoList !== null
+          ) {
             console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
             let dataset = res.data.data.projectAuditLogDtoList;
             state.passInfo = dataset[dataset.length - 1];
@@ -3358,7 +3371,10 @@ export default {
             }
              */
           }
-          state.stage = res.data.data.stageList.map(e => ({id: e.stageId, name: e.name}))
+          state.stage = res.data.data.stageList.map((e) => ({
+            id: e.stageId,
+            name: e.name,
+          }));
           let info = res.data.data.projectInfo;
           // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
           let start = info.beginTime;
@@ -3727,10 +3743,10 @@ export default {
       let obj = {
         pageNo: 0,
         pageSize: 0,
-        projectId: state.projectId,
+        pid: state.projectId,
+        type: 1,
       };
-      apiproj
+      getStuPage(obj)
-          .projectStudent(obj)
         .then((res) => {
           if (res.data.code === 200) {
             // console.log("res", res.data);
@@ -5629,7 +5645,6 @@ export default {
     .group {
       display: flex;
 
-
       .groupleft {
         display: flex;
         flex-wrap: wrap;

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>