feat:合并

src/api/apis.js

@@ -1,7 +1,7 @@
 export const STUDENT_LIST = '/admin/student/getStudent';
 export const ONLINE_COURSE_PAGE = '/onlineClasses/queryOnlineList';
 export const ASSESSMENT_PAGE = '/assessment/queryAssessmentDetailList post';
-export const PROJECT_AUDIT_PAGE = '/admin/project/auditedlist post';
+export const PROJECT_AUDIT_PAGE = '/admin/project/auditedlistV2 post';
 export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post';
 export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post';
 export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post';

src/views/DownLoad.vue

@@ -211,6 +211,8 @@ export default {
     // 搜索
     function searchDownloadList() {
       getData()
+      // 获取当前用户容量
+      getDownLoadTotalSize()
     }
 
     // 重置
@@ -218,6 +220,8 @@ export default {
       state.name = "";
       state.currentPage = 1;
       getData()
+      // 获取当前用户容量
+      getDownLoadTotalSize()
     }
 
     // 分页

src/views/projectcenter/TaskAdd.vue

@@ -442,6 +442,7 @@ function changeStageIndex(index) {
 const getTask = async () => {
   await api.getDraftTask({projectId: route.query.projectId}).then((res) => {
     projectInfo.value = res.data.data
+    console.log("获取任务列表:" + JSON.stringify(projectInfo.value) )
   });
 };
 

src/views/projectcenter/TaskPage.vue

@@ -382,7 +382,7 @@
             </div>
             <div class="stagesecond">
               <div class="staname">阶段名称：</div>
-              <div class="stamess">管理者进阶-腾飞班1第一阶段</div>
+              <div class="stamess">{{ choosedStageName }}</div>
             </div>
             <div class="stagelast">
               <div class="stagepro">
@@ -2354,6 +2354,7 @@ export default {
       ],
       changeGoods: [], //更改是否优秀的id数组
       choosedStageId: 1, // 选择的阶段id
+      choosedStageName:"",//阶段名称
       activeSetKey: "12", //12-基础信息 13-共享文档
       docChecked: true,
       //学员信息列表
@@ -2943,6 +2944,7 @@ export default {
               }
               state.rankjieduan = arrStage;
               state.valuestu2 = arrStage[0].value;
+              state.choosedStageName = levelList.stageList[0].name;
             }
             console.log(
               "----------------------------------->",
@@ -3104,6 +3106,7 @@ export default {
       state.stugroup = false;
       state.groupInfo = {};
       state.groupMemberCountContrast = null;
+      getGroup();
     };
     //点击确定创建小组
     const createG = () => {
@@ -3935,6 +3938,7 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
+      debugger
       console.log("state.groupPageList" + state.groupPageList);
       const id = state.groupInfo.id;
       const d = state.groupPageList
@@ -4685,6 +4689,7 @@ export default {
       url && window.open(url);
     };
     function stageChange(item, index) {
+      state.choosedStageName = item.name;
       state.choosedStageId = item.stageId;
       state.choosedStageIndex = index;
     }

src/views/projectcenter/temTask.vue

@@ -281,7 +281,7 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定</a-button>
+        <a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定11</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
@@ -541,7 +541,16 @@ const cancelModal = ref(false);
 const deleteStageModal = ref(false);
 const templateLoading = ref(false);
 const cancleLoading = ref(false);
-const projectInfo = ref({stageList: [{taskTemplateList: [{}]}], projectTemplateInfo: {}});
+const projectInfo = ref({
+  stageList: [{
+    "id":"0",
+    taskTemplateList: [{
+    }]
+  }], 
+  projectTemplateInfo: {
+
+  }  
+});
 const activeIndex = ref(0);
 const moveChapterIndex = ref(0);
 const deleteIndex = ref(0);
@@ -576,6 +585,13 @@ function changeStageIndex(index) {
 const getTask = async () => {
   await api.templateEditDetail(route.query.projectId).then((res) => {
     projectInfo.value = res.data.data
+    if(projectInfo.value.stageList.length == 0){
+      projectInfo.value.stageList = [{
+        "id":"0",
+        taskTemplateList: []
+      }]
+    }
+    console.log("获取任务列表信息：" + JSON.stringify(projectInfo.value));
   });
 };
 
@@ -721,7 +737,7 @@ const closeDeAll = () => {
 const submitStorage = async () => {
   templateLoading.value = true
   await request(PROJECT_TEMPLATE_DETAIL_MODIFY, projectInfo.value)
-  await getTask()
+  // await getTask()
   message.success("保存成功");
   templateLoading.value = false
 };

src/views/projectcenter/templateAdd.vue

@@ -246,6 +246,36 @@
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
     </div>
+    <!-- 更多背景图 v-model:visible="learnBgMore"  -->
+    <a-modal :closable="sh" centered="true" v-model:visible="learnBgMore" :footer="null" :width="650"
+      wrapClassName="learnBgMoreModal" :z-index="9999">
+      <div class="main">
+        <div class="top">
+          <div class="topc">封面图</div>
+        </div>
+        <div class="imagesBox">
+        <!-- <div
+                  @click="() => (projectInfo.picUrl = src.value)"
+                  v-for="item in projectPic"
+                  :key="item.code"
+                  class="learnBgItem"
+            > -->
+          <div @click="chooseImg2(item)" v-for="item in projectPic" :key="item.code" class="learnBgItem" :style="{
+            border:
+              projectInfo.picUrl === item.value
+                ? '3px solid rgba(78, 166, 255, 1)'
+                : '1px solid #ccc',
+            'background-image': 'url(' + item.value.split(',')[0] + ')',
+          }">
+            <!-- <img class="im" :src="item.source" /> -->
+          </div>
+        </div>
+        <div class="btn">
+          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script setup>
@@ -263,13 +293,16 @@ const route = useRoute();
 const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
+const learnBgMore = ref(false);
 const projectPic = ref([]);
 const courseSyncFlag = ref(true);
 onMounted(() => {
   getDetail();
+  console.log(JSON.stringify(store.state.project_pic));
   projectPic.value = store.state.project_pic.map((e) => ({
-    value: e.dictValue,
+    code: e.id,
-    label: e.dictName,
+    value: e.value,
+    label: e.name
   }));
 });
 
@@ -320,6 +353,24 @@ const errorMsgs = {
   boeFlag: "请选择是否BOE实施",
 };
 
+//显示更多路径背景弹窗s
+const showLearnBgMore = () => {
+  learnBgMore.value = true;
+};
+
+//关闭更多路径背景弹窗
+const closeLearnBgMore = () => {
+  learnBgMore.value = false;
+};
+
+const chooseImg2 = (item) => {
+  // console.log(item);
+  projectInfo.value.picUrl = item.value;
+  projectInfo.value.pathBgId = item.code;
+  projectInfo.value.pathBg = item.value.split(",")[0];
+  projectInfo.value.mobilePicUrl = item.value.split(",")[1];
+};
+
 const createProject = () => {
   for (let i in errorMsgs) {
     if (projectInfo.value[i] === "" || projectInfo.value[i] === undefined) {