Merge branch 'dongwu_develop' into develop

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.3.0------------");
+console.log("版本2.3.1------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/views/courselibrary/CoursewareManage.vue

@@ -3614,6 +3614,7 @@ export default defineComponent({
     };
     const createkk = () => {
       state.offcoursePlanId = null;
+      state.itemType = 3;
       state.member = {};
       state.cstm_hs = true;
     };
@@ -3885,7 +3886,7 @@ export default defineComponent({
           customRender: ({ record }) => {
             return (
               <div class="racona">
-                {record.workScore === -2 ? (
+                {record.workScore === -2 || record.workScore === -1 || record.workScore < 0? (
                   "-"
                 ) : record.workScore ? (
                   <span>{record.workScore}</span>

src/views/learningpath/LevelAddDetail.vue

@@ -60,7 +60,7 @@
           </div>
         </div>
       </div>
-      <a-modal v-model:visible="modal" :centered="true" :footer="null" wrapClassName="AddLevell" @cancel="closeModal">
+      <a-modal v-model:visible="modal" :centered="true" :footer="null" wrapClassName="AddLevell" @cancel="closeModal" :closable="false">
         <div class="header">
           <div class="headmain">
             <div class="add">编辑/添加关卡</div>

src/views/projectcenter/LibraryAdd.vue

@@ -60,7 +60,7 @@
               <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
               <router-link
                 class="edit"
-                :to="{ path: `/temTask`, query: { projectId: projectTemplateId } }"
+                :to="{ path: `/temTask`, query: { projectId: projectId } }"
               >
                 <img
                   class="editimg"
@@ -927,7 +927,7 @@ export default defineComponent({
     const value = ref("");
     const textnum = "150";
     const routered = useRouter();
-    const {query: {projectTemplateId}} = useRoute();
+    const {query: {projectTemplateId,projectId}} = useRoute();
     const changeopclo = () => {
       state.projectInfo.noticeFlag = state.checked ? 1 : 0;
       api
@@ -999,7 +999,7 @@ export default defineComponent({
     });
     // 获取详情
     const getDetail = () => {
-      api.templateEditDetail(projectTemplateId).then((res) => {
+      api.templateEditDetail(projectId).then((res) => {
         state.templateInfo = res.data.data
         state.taskSyllabus = [];
         state.projectInfo = res.data.data.projectTemplateInfo;
@@ -1023,7 +1023,7 @@ export default defineComponent({
           console.log("what ------ > ", i, data);
           // if (data[i].taskTemplateList.length !== 0) {
           if (!data[i].name) {
-            continue;
+            // continue;
           }
           state.taskSyllabus.push({
             text: data[i].name ? data[i].name : "无阶段任务",
@@ -1097,7 +1097,7 @@ export default defineComponent({
       routered.push({
         path: "/templateAdd",
         query: {
-          projectTemplateId: projectTemplateId,
+          projectTemplateId: projectId,
         },
       });
     };
@@ -1106,7 +1106,7 @@ export default defineComponent({
     const stateEdit = () => {
       let obj = {
         name: "",
-        projectTemplateId: localStorage.getItem("projectTemplateId"),
+        projectTemplateId: projectId,
         remark: "",
         stageId: 0,
       };
@@ -1129,7 +1129,7 @@ export default defineComponent({
         flag: true,
         name: "",
         projectTaskId: 0,
-        projectTemplateId: localStorage.getItem("projectTemplateId"),
+        projectTemplateId: projectId,
         stageId: 0,
         type: 0
       };
@@ -1146,7 +1146,7 @@ export default defineComponent({
     };
     const getScoreRule = () => {
       scoreRule({
-        projectId: projectTemplateId,
+        projectId: Number(projectId),
       })
         .then((res) => {
           let result = res.data.data;
@@ -1203,7 +1203,7 @@ export default defineComponent({
           courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
           notice: state.projectInfo.notice,
           noticeFlag: state.projectInfo.noticeFlag,
-          projectTemplateId: localStorage.getItem("projectTemplateId"),
+          projectTemplateId: projectId,
           remark: state.projectInfo.remark,
           status: state.projectInfo.status,
           attach: str,
@@ -1211,6 +1211,7 @@ export default defineComponent({
         //要编辑项目
         api
           .templateEdit({
+            id: projectId,
             name: state.projectInfo.name,
             category: state.projectInfo.category,
             picUrl: state.projectInfo.picUrl,
@@ -1223,7 +1224,7 @@ export default defineComponent({
             courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
             notice: state.projectInfo.notice,
             noticeFlag: state.projectInfo.noticeFlag,
-            projectTemplateId: localStorage.getItem("projectTemplateId"),
+            projectTemplateId: projectId,
             remark: state.projectInfo.remark,
             status: state.projectInfo.status,
             attach: str,
@@ -1255,7 +1256,7 @@ export default defineComponent({
       api
         .templateEdit({
           sourceBelongId: state.projectInfo.sourceBelongId,
-          projectTemplateId: localStorage.getItem("projectTemplateId"),
+          projectTemplateId: projectId,
           attach: str,
         })
         .then((res) => {
@@ -1275,7 +1276,7 @@ export default defineComponent({
     // 设置上传图片开关
     const checkedClose = (data, a) => {
       console.log(data, a);
-      console.log("模板id：" + projectTemplateId);
+      console.log("模板id：" + projectId);
       console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a))
       state.attachSwitch = data;
 
@@ -1283,7 +1284,7 @@ export default defineComponent({
       api
         .templateEdit({
           sourceBelongId: state.projectInfo.sourceBelongId,
-          projectTemplateId: projectTemplateId,
+          projectTemplateId: projectId,
           attachSwitch: state.attachSwitch ? 1 : -1,
         })
         .then((res) => {
@@ -1297,7 +1298,7 @@ export default defineComponent({
     //设置积分规则
     const editRule = () => {
       let obj = {
-        projectId: projectTemplateId,
+        projectId: projectId,
         datas:[
           {
             "type": 1,