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

# Conflicts:
#	src/api/indexLearningPath.js

src/api/indexLearningPath.js

@@ -5,4 +5,7 @@ export const getRouterOverview = (routerId) => http.get(`/admin/router/overview?
 
 //新建或编辑路径图
 export const editRoutered = (obj) => http.post('/admin/router/edit', obj)
-export const editRouterModel = (obj) => http.post('/admin/router/editModel', obj)
+export const editRouterModel = (obj) => http.post('/admin/router/editModel', obj)
+
+// 新建或编辑路径图共享文档
+export const editRouteredDoc = (obj) => http.post('/admin/router/editShareRouter', obj)

src/api/indexTaskadd.js

@@ -13,6 +13,8 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa
 
 //新建或编辑项目
 export const editProj = (obj) => http.post('/admin/project/edit', obj)
+//编辑项目共享文档
+export const editProjDoc = (obj) => http.post('/admin/project/editShareAttach', obj)
 
 //路径图里的新建或编辑关卡任务
 export const editTask = (obj) => http.post('/admin/router/editTask', obj)

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -169,8 +169,10 @@
   />
   <!-- 查看作业抽屉 -->
   <CKWork v-model:CWvisible="CWvisible" />
+  <!-- 查看答卷抽屉
+  <CQue v-model:CQvisible="CQvisible" /> -->
   <!-- 查看答卷抽屉 -->
-  <CQue v-model:CQvisible="CQvisible" />
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
 
   <!-- 导出作业提示框 -->
   <ExportHomeWork
@@ -184,7 +186,8 @@ import { toRefs, reactive } from "vue";
 import { message } from "ant-design-vue";
 import ASOver from "../AllStuOver.vue";
 import CKWork from "../CheckWork.vue";
-import CQue from "../CheckQue.vue";
+// import CQue from "../CheckQue.vue";
+import CheckAnsware from '../CheckAnsware.vue'
 import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
@@ -194,9 +197,10 @@ export default {
   components: {
     EScore,
     CKWork,
-    CQue,
+    // CQue,
     ASOver,
     ExportHomeWork,
+    CheckAnsware
   },
   props: {
     Fvisible: {
@@ -226,7 +230,7 @@ export default {
       CQvisible: false, //查看答卷抽屉
       ASOvervisible: false, //批量标注完成弹窗
       name: "",
-
+      datasource:'',
       open: false,
       projectName: undefined,
       projectNameList: [
@@ -247,7 +251,7 @@ export default {
        // },
       ],
       selectedRowKeys: [],
-
+      CAvisible: false,
       pageNo: 1,
       pageSize: 10,
       currentPage: 1,
@@ -424,7 +428,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({record:{examStatus,workStatus}}) => {
+          customRender: (text, {record:{examStatus,workStatus}}) => {
             return (examStatus || workStatus) && (<div
                   style={{
                   display: "flex",
@@ -447,7 +451,8 @@ export default {
                   class="operation"
                   style="cursor:pointer;margin-right:10px;"
                   onClick={() => {
-                    state.CQvisible = true;
+                    state.datasource = text.record;
+                    state.CAvisible = true;
                   }}
                 >
                   查看答卷

src/components/drawers/router/RouterFaceTeachManage.vue

@@ -147,7 +147,9 @@
   <!-- 查看作业抽屉 -->
   <CKWork v-model:CWvisible="CWvisible" />
   <!-- 查看答卷抽屉 -->
-  <CQue v-model:CQvisible="CQvisible" />
+  <!-- <CQue v-model:CQvisible="CQvisible" /> -->
+  <!-- 查看答卷抽屉 -->
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
   <!-- 导出作业提示框 -->
   <ExportHomeWork
     v-model:exportHomeWorkV="exportHomeWorkV"
@@ -160,8 +162,9 @@ import { toRefs, reactive } from "vue";
 import { message } from "ant-design-vue";
 import ASOver from "../AllStuOver.vue";
 import CKWork from "../CheckWork.vue";
-import CQue from "../CheckQue.vue";
+// import CQue from "../CheckQue.vue";
 import EScore from "../ExportScore.vue";
+import CheckAnsware from '../CheckAnsware.vue'
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
@@ -170,9 +173,10 @@ export default {
   components: {
     EScore,
     CKWork,
-    CQue,
+    // CQue,
     ASOver,
     ExportHomeWork,
+    CheckAnsware
   },
   props: {
     FaceTeachModelVisible: {
@@ -424,6 +428,7 @@ export default {
       ],
       exportHomeWorkV: false,
       downloadUrl: null,
+      CAvisible: false
     });
     //面授直播管理列表操作
     const ListOpera = () => {
@@ -452,9 +457,9 @@ export default {
                 class="operation"
                 style="cursor:pointer;margin-right:10px;color: rgba(56, 125, 247, 1)"
                 onClick={() => {
-                  state.CQvisible = true;
+                  state.datasource = value;
-                }}
+                  state.CAvisible = true;
-              >
+                }}>
                 查看答卷
               </a-button>}
             </div>)
@@ -526,6 +531,7 @@ export default {
               newData.push(res.data.data.records[i]);
             }
             state.tabledata = newData;
+            state.tabledata = [{name:'小星星',workStatus:1}];
             ListOpera();
             state.tableDataTotal = res.data.data.total;
             state.tableDataTotal2 = res.data.data.total;

src/views/learningpath/LevelAdd.vue

@@ -1374,7 +1374,7 @@ import { getRouterOverview } from "@/api/indexLearningPath";
 import { handleLearnPath } from "../../api/index1";
 import { GetRouterDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
-import { editRoutered } from "../../api/indexLearningPath";
+import { editRouteredDoc } from "../../api/indexLearningPath";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import TableStudent from "@/components/student/TableStudent";
 import { getStuPage, moveStudent } from "@/api/index1";
@@ -2255,12 +2255,12 @@ export default {
         attachSwitch: data ? 1 : -1,
       });
       // 更新开关状态
-      editRoutered({
+      editRouteredDoc({
         attach: JSON.stringify(state.fileList),
         name: state.styTitle,
         picUrl: state.picUrl,
         remark: state.remark,
-        routerId: state.routerId,
+        id: state.routerId,
         status: state.action,
         attachSwitch: data ? 1 : -1,
       })
@@ -2355,12 +2355,12 @@ export default {
         let str = JSON.stringify(list);
         console.log(str);
         //要编辑路径图
-        editRoutered({
+        editRouteredDoc({
           attach: str,
           name: state.styTitle,
           picUrl: state.picUrl,
           remark: state.remark,
-          routerId: state.routerId,
+          id: state.routerId,
           status: state.action,
           attachSwitch: state.docChecked ? 1 : -1,
         })
@@ -2480,12 +2480,12 @@ export default {
       state.fileList.splice(index, 1);
       let str = JSON.stringify(state.fileList);
       //要编辑路径图
-      editRoutered({
+      editRouteredDoc({
         attach: str,
         name: state.styTitle,
         picUrl: state.picUrl,
         remark: state.remark,
-        routerId: state.routerId,
+        id: state.routerId,
         status: state.action,
       })
         .then((res) => {

src/views/projectcenter/TaskPage.vue

@@ -2175,7 +2175,7 @@ import {
 import { message, Modal } from "ant-design-vue";
 import * as apitl from "../../api/index";
 import { getTask } from "../../api/indexTaskadd";
-import { editProj } from "../../api/indexTaskadd";
+import { editProjDoc } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
@@ -4213,7 +4213,7 @@ export default {
       state.docChecked = data;
       state.switchopen = data;
       // 更新开关状态
-      editProj({
+      editProjDoc({
         attachSwitch: state.switchopen ? 1 : -1,
         boeFlag: state.boeFlag,
         category: state.category,
@@ -4275,7 +4275,7 @@ export default {
           templateId: state.templateId || 0,
           type: state.type,
         });
-        editProj({
+        editProjDoc({
           attachSwitch: state.switchopen ? 1 : -1,
           attach: str,
           boeFlag: state.boeFlag,
@@ -4548,7 +4548,7 @@ export default {
       });
       state.fileList.splice(index, 1);
       let str = JSON.stringify(state.fileList);
-      editProj({
+      editProjDoc({
         attach: str,
         beginTime: state.tstartTime.slice(0, 10),
         // beginTime:1668643200,