合并冲突

src/views/projectcenter/TaskPage.vue

@@ -366,12 +366,13 @@
                 :key="item.stageId"
                 @click="stageChange(item, index)"
               >
-                {{ item.name || "无阶段" }}
+                <div v-if="item.id === '0'">无阶段</div>
+                <div v-else>{{ "阶段" + (index + 1) }}</div>
               </div>
               <!-- <div class="stage1">阶段1</div>
                     <div class="stage2">阶段2</div> -->
             </div>
-            <div class="stagesecond">
+            <div class="stagesecond" v-if="choosedStageName">
               <div class="staname">阶段名称：</div>
               <div class="stamess">{{ choosedStageName }}</div>
             </div>
@@ -465,7 +466,7 @@
                 <button class="edit">
                   <img
                     class="editimg"
-                    src="../../assets/images/projectadd/edit.png"
+                    src="../../assets/images/projectadd/edit1.png"
                   />
                   <span class="editext">编辑</span>
                 </button>
@@ -2918,13 +2919,16 @@ export default {
           }
         }
         levelList.stageList = res.data.data.stageList;
-        if (levelList.stageList.length === 1) {
+        if (
+          levelList.stageList.length === 1 &&
+          levelList.stageList[0].id === "0"
+        ) {
           // 无解段任务
           state.rankjieduan = [{ value: 0, label: "无阶段" }];
           state.valuestu2 = 0;
         } else {
           // 有阶段任务
-          console.log(levelList.stageList);
+          console.log("有阶段任务", levelList.stageList);
           let arrStage = [];
           for (let i = 0; i < levelList.stageList.length; i++) {
             if (levelList.stageList[i].id !== "0") {
@@ -3925,7 +3929,7 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
-      debugger
+      debugger;
       console.log("state.groupPageList" + state.groupPageList);
       const id = state.groupInfo.id;
       const d = state.groupPageList
@@ -4513,7 +4517,7 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/faceteach?type=2&courseId=" +
+          "/faceteach?type=1&courseId=" +
           item.courseId +
           "&id=" +
           item.id;
@@ -4540,7 +4544,7 @@ export default {
           codeUrl =
             window.location.protocol +
             process.env.VUE_APP_H5 +
-            "/externalexam?courseId=" +
+            "/externalexam?type=1&courseId=" +
             item.courseId;
         } else {
           codeUrl =
@@ -4607,7 +4611,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/evaluation?courseId=" +
           item.courseId +
-          "&evaType=" +
+          "&type=1&evaType=" +
           item.evaType +
           "&targetId=" +
           item.targetId;
@@ -4638,7 +4642,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/ballotpage?courseId=" +
           item.courseId +
-          "&btype=2&id=" +
+          "&type=1&btype=2&id=" +
           item.id +
           "&chapterOrStageId=" +
           item.stageId +
@@ -4663,7 +4667,7 @@ export default {
         url:
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/projectdetails?projectId=" +
+          "/projectdetails?type=1&projectId=" +
           state.projectId,
       };
       state.codeInfo = obj;
@@ -4678,8 +4682,14 @@ export default {
     }
     // 共享文档文件下载
     const downloadFile = (url) => {
-        debugger
       url && window.open(url);
+      console.log(url);
+      window.open(
+        window.location.protocol +
+          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_FILE_PATH +
+          url
+      );
     };
     function stageChange(item, index) {
       state.choosedStageName = item.name;
@@ -5955,12 +5965,13 @@ export default {
         position: absolute;
         right: 38px;
         top: 0;
-        color: #4ea6ff;
-        background: #ffffff;
+        color: #fff;
+        background: #4ea6ff;
         width: 100px;
         height: 40px;
         border: 1px solid #4ea6ff;
         border-radius: 8px;
+        cursor: pointer;
 
         .editimg {
           width: 15px;
@@ -5974,15 +5985,15 @@ export default {
         }
       }
 
-      .edit:hover {
-        color: #ffffff;
-        background-color: #4ea6ff;
-        cursor: pointer;
+      // .edit:hover {
+      //   color: #ffffff;
+      //   background-color: #4ea6ff;
+      //   cursor: pointer;
 
-        .editimg {
-          background-image: url("../../assets/images/projectadd/edit1.png");
-        }
-      }
+      //   .editimg {
+      //     background-image: url("../../assets/images/projectadd/edit1.png");
+      //   }
+      // }
     }
 
     .second {