feat:合并

2025-12-19 07:46:46 +08:00 · 2023-02-27 21:04:53 +08:00
parent 8f7a3305e5 41f7c90982
commit 945efc9cc6
13 changed files with 93 additions and 41 deletions
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -4,9 +4,11 @@ export const USER_LIST_PAGE = '/userbasic/user/list post'
 export const USER_LIST = '/userbasic/user/searchList post'
 export const ORG_LIST = '/userbasic/org/list post'
 export const ORG_CHILD_LIST = '/userbasic/org/info post'
-export const AUDIENCE_LIST = '/userbasic/audience/list post'
+// export const AUDIENCE_LIST = '/userbasic/audience/list post'
+//当前用户可以查看的受众接口
+export const AUDIENCE_LIST = '/userbasic/audience/userAudiencesFilter post'
 export const USER_PERMISSION = '/userbasic/permission/listByUser post'
 export const CASE_PAGE = '/systemapi/xboe/m/boe/cases/pagelist post formData'
 export const EXAM_PAPER_PAGE = '/systemapi/xboe/m/exam/paper/querylist post formData'
 export const TEST_PAGE = '/api/b1/system/quiz/quiz-list post formData'
-export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData'
+export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData'
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -258,6 +258,7 @@ const formData = ref({
  assessmentId: "",
  assessmentName: "",
  livePlayback: "",
+  liveExplain: ""
 });
 const emit = defineEmits({});
 const taskIndex = ref(-1);
@@ -375,9 +376,9 @@ async function confirm() {
  } else {
    const data = props.taskList[taskIndex.value];
    data.name = formData.value.liveName;
-    data.info = formData.value;
+    data.info = {...formData.value};
    data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
-
+    console.log(data)
  }
  emit("update:taskList", [...props.taskList]);
  closeDrawer();
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -195,7 +195,7 @@ export default {
        console.log('我是传递过来的参数2', props.basicdata)
        api.QueryAssessmentDetail({
          "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds,
-          "courseId": props.basicdata.id,
+          "courseId": props.datasource.courseId,
          "studentId": props.datasource.studentId
        }).then(res=>{
          console.log(res)
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -169,13 +169,13 @@ export default {
        },
        {
          id: 2,
-          value: "10",
-          label: "未通过",
+          value: "9",
+          label: "已完成",
        },
        {
          id: 3,
          value: "1",
-          label: "已通过",
+          label: "进行中",
        },
      ],
      selectedRowKeys: [],
@@ -305,7 +305,7 @@ export default {
          align: "center",
          ellipsis: true,
          className: "h",
-          customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
+          customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'),
        },
        {
          title: "操作",
--- a/src/components/drawers/project/ProjectVoteManage.vue
+++ b/src/components/drawers/project/ProjectVoteManage.vue
@@ -360,7 +360,7 @@
            "studentName": state.name,
            "targetId":props.datasource.projectId,
            "taskId": props.datasource.courseId,
-            "type": 2
+            "type": 1
          });
          api.QueryVoteManagementDetail({
            "pageNo": state.currentPage,
@@ -370,7 +370,7 @@
            "studentName": state.name,
            "targetId":props.datasource.routerId,
            "taskId": props.datasource.courseId,
-            "type": 2
+            "type": 1
          }).then(res=>{
            console.log('投票数据获取', res)
            if(res.data.code==200){
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -128,16 +128,19 @@
      </div>-->
    </div>
  </a-drawer>
+  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
+    :basicdata="datasource.info" />
 </template>

 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
+import ViewAssess from "../ViewAssess";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
 export default {
  name: "RouterCommonManage",
-
+  components: { ViewAssess },
  props: {
    CommonModelVisible: {
      type: Boolean,
@@ -200,6 +203,8 @@ export default {
      ],
      tabledata: [],
      tableDataTotalLoading: true, // 表格loading加载配置
+      evalDataSource: "",
+      Assessvisible: false
    });
    const tableDataFunc = () => {
      const columns = [
@@ -317,9 +322,42 @@ export default {
          },
        },
      ];
+
+      let obj = {
+          title: "操作",
+          dataIndex: "finishStatus",
+          key: "finishStatus",
+          width: 60,
+          align: "center",
+          ellipsis: true,
+          className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <a
+                  onClick={()=>{
+                    console.log('iyiy', text.record)
+                    showassess(text.record);
+                  }}>查看</a>
+              </div>
+            );
+          },
+        }
+
+        {/* 评估查看操作 */}
+        if(props.datasource.type==11){
+          columns.push(obj)
+        }
+
      return columns;
    };

+    {/* 查看评估弹框 */}
+    const showassess = (data) => {
+      state.evalDataSource = data;
+      state.Assessvisible = true;
+    };
+
    const closeDrawer = () => {
      ctx.emit("update:CommonModelVisible", false);
      state.currentPage = 1;
@@ -477,6 +515,7 @@ export default {
      ...toRefs(state),
      selectProjectName,
      closeDrawer,
+      showassess,
      afterVisibleChange,
      tableDataFunc,
      godie,
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -286,7 +286,7 @@ export default {
          align: "center",
          ellipsis: true,
          className: "h",
-          customRender: ({ record: { finishStatus } }) => ({ 1: '通过', 2: '未通过' }[finishStatus] || '未开始'),
+          customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'),
        },
        {
          title: "操作",
@@ -299,7 +299,7 @@ export default {
          customRender: (text) => {
            {/* debugger */ }
            console.log("text" + text.record)
-            if (text.record.finishStatus === 1 || text.record.finishStatus === 2) {
+            if (text.record.finishStatus === 1 || text.record.finishStatus === 9) {
              return (
                <div class="racona">
                  <a-button
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -391,7 +391,6 @@ const getStu = () => {
  console.log("获取项目学员", obj);
  getStuPage(obj).then((res) => {
    console.log("获取项目学员", res);
-    if (res.data.code === 200) {
      let arr = res.data.data.records;
      let array = [];
      arr.map((value) => {
@@ -408,7 +407,6 @@ const getStu = () => {
      });
      projectList.value = array;
      projectListTotal.value = res.data.data.total;
-    }
  });
 };
 getStu();
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -318,7 +318,7 @@ export default {
 					key: "name",
 					align: "center",
 					ellipsis: true,
-					width: "20%",
+					width: "22%",
 				},
 				{
 					title: "类型",
@@ -366,7 +366,9 @@ export default {
 											)
 										}}
 								 	style="cursor:pointer;"
-									color="green">转审完成</a-tag>:""
+									color="green">转审完成</a-tag>:
+									value.record.inviteAuditStatus==3?
+									value.record.invitedMsg:""
 								}
 							</div>
 						);
@@ -388,7 +390,6 @@ export default {
 					ellipsis: true,
 					width: "10%",
 				},
-
 				{
 					title: "操作",
 					dataIndex: "opt",
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -4,7 +4,7 @@
      <div class="left clearfix">
        <div class="leftmain">
          <div class="tit" style="margin-left: 18px">关卡</div>
-          <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
+          <div class="btn btn3" @click="showModal({},'add')" style="margin-left: 19px">
            <div class="search"></div>
            <div class="btnText">添加关卡</div>
          </div>
@@ -33,7 +33,7 @@
                          </div>
                        </div>
                      </a-popover>
-                      <div class="imgIcon" @click="showModal(element)"></div>
+                      <div class="imgIcon" @click="showModal(element,'edit')"></div>
                    </div>
                    <div class="boxs_right">
                      <div class="imgIcon" @click="deleteChapter"></div>
@@ -376,6 +376,7 @@ import dialog from "@/utils/dialog";

 const {query: {routerId}} = useRoute();
 const modal = ref(false)
+const ischapterEdit = ref(false)
 const visiblene = ref(false)
 const cancleLoading = ref(false)
 const confirmLoading = ref(false)
@@ -408,7 +409,16 @@ watch(() => routerInfo.value.chapterList, () => {
  })
 }, {deep: true})

-const showModal = () => {
+const showModal = (e,type) => {
+  ischapterEdit.value = (type === "edit");
+  console.log(ischapterEdit.value)
+  if(type == 'edit'){
+    console.log("关卡信息：" + e.name);
+    formValue.value = e;//回传修改的信息
+  }else{
+    //关卡信息初始化
+    formValue.value = {};
+  }
  modal.value = true;
 };
 const closeModal = () => {
@@ -420,10 +430,16 @@ const editChapter = () => {
  if (!formValue.value.name) {
    return message.warning("请输入关卡名称");
  }
-  routerInfo.value.chapterList.push({...formValue.value, draftTaskList: []})
+  if(ischapterEdit.value){
+    routerInfo.value.chapterList = [{...formValue.value, draftTaskList: []}];
+  }
+  else{
+    routerInfo.value.chapterList.push({...formValue.value, draftTaskList: []})
+  }
  formValue.value = {draftTaskList: []}
  closeModal()
 };
+
 //删除关卡
 const deleteChapter = () => {
  dialog({
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1679,5 +1679,6 @@ const cancelStorage = async () => {
 .footBox {
  position: fixed;
  bottom: 0;
+  z-index: 99999;
 }
 </style>
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -262,7 +262,6 @@
                    </div> -->
            </div>
          </div>
-          <!-- 概览（无数据） -->
          <!-- 概览（有数据） -->
          <div v-if="hasTask">
            <div class="onerow">
@@ -2909,10 +2908,7 @@ export default {
      let objtl = {
        projectId: state.projectId,
      };
-      apitl
-        .getProjectDetail(objtl)
-        .then((res) => {
-          if (res.status == 200) {
+      apitl.getProjectDetail(objtl).then((res) => {
            console.log("阶段列表", res);
            for (let i = 0; i < res.data.data.stageList.length; i++) {
              for (
@@ -2927,7 +2923,7 @@ export default {
              }
            }
            levelList.stageList = res.data.data.stageList;
-            if (levelList.stageList.length == 1) {
+            if (levelList.stageList.length === 1) {
              // 无解段任务
              state.rankjieduan = [{ value: 0, label: "无阶段" }];
              state.valuestu2 = 0;
@@ -2948,10 +2944,6 @@ export default {
              state.valuestu2 = arrStage[0].value;
              state.choosedStageName = levelList.stageList[0].name;
            }
-            console.log(
-              "----------------------------------->",
-              res.data.data.stageList
-            );
            //暂时传个固定的id用 到时候看数据里面是否有在更换
            // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
            let leng = res.data.data.stageList.length;
@@ -2959,17 +2951,13 @@ export default {
              let taskarr = res.data.data.stageList;
              console.log("11-22-33", taskarr);
              if (taskarr.length == 1) {
-                if (taskarr[0].stageId == "0") {
+                if (taskarr[0].id == "0") {
                  taskarr[0].name = "无阶段任务";
                }
              }
              state.taskSyllabus = taskarr;
            }
-          }
        })
-        .catch((err) => {
-          console.log("获取任务列表失败", err);
-        });
    };
    //学员学员管理渲染
    // const getTableDate = () => {
@@ -3728,7 +3716,7 @@ export default {
          gangw: value.userInfoBo.jobName, //岗位
          completeStageCnt: value.completeStageCnt, //当前完成阶段数
          totalStageCnt: value.totalStageCnt, //总阶段数
-          excellent: value.topFlag == 1 ? true : false, //是否优秀学员
+          excellent: value.topFlag == 1, //是否优秀学员
          progress: value.completeStageCnt + "/" + value.totalStageCnt,
          putin:
            value.source == 0
@@ -3910,6 +3898,8 @@ export default {
        state.hasTask = !!res.data.data?.stageList.some(
          ({ taskList }) => taskList.length
        );
+        console.log(111111111111);
+        console.log(state.hasTask);
        // state.attach = info.attach;
        // state.templateId = info.templateId;
        state.sourceBelong =
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -281,7 +281,7 @@

    <div class="footbtn">
      <div class="btnbox">
-        <a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定11</a-button>
+        <a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定</a-button>
        <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
      </div>
    </div>
@@ -615,10 +615,14 @@ const closeChangeModal = () => {
 };
 //移动任务到阶段
 const moveTask = () => {
-  projectInfo.value.stageList[moveChapterIndex.value].taskTemplateList.push(...projectInfo.value.projectTemplateInfo.value.stageList[activeIndex.value].taskTemplateList.filter(t => t.checked).map((t) => ({
+  console.log("移动到阶段：" + JSON.stringify(projectInfo.value));
+  alert(projectInfo.value.stageList.length);
+  alert(moveChapterIndex.value);
+  projectInfo.value.stageList[moveChapterIndex.value].taskTemplateList.push(...projectInfo.value.stageList[activeIndex.value].taskTemplateList.filter(t => t.checked).map((t) => ({
    ...t,
    checked: false
  })));
+  alert(projectInfo.value.stageList.length);
  projectInfo.value.stageList[activeIndex.value].taskTemplateList = projectInfo.value.stageList[activeIndex.value].taskTemplateList.filter(t => !t.checked);
  visiblene.value = false;
 };