Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

.env

@@ -27,10 +27,10 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx
 
 #在线
-VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id=
+VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id=
 #案例
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
 #考试
-VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/pc/exam/test?id=
+VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
 #h5的基本url
 VUE_APP_H5=//u-pre.boe.com/student-h5

.env.boe

@@ -11,6 +11,6 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=coursefile/导入学员模版-1677140876274.xls
 # 外部考试导入成绩模板
 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入模板-1677055614438.xlsx
 #在线
-VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id=
+VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
-VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/pc/exam/test?id=
+VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=

.env.prod

@@ -17,6 +17,6 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
 # 外部考试导入成绩模板
 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx
 
-VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc/course/studyindex?id=
+VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc/case/detail?id=
-VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc/exam/test?id=
+VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=

.env.release

@@ -16,6 +16,6 @@ VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id=
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
 # 外部考试导入成绩模板
 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx
-VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc-release/course/studyindex?id=
+VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id=
-VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc-release/exam/test?id=
+VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=

src/components/drawers/ActiveAttendance.vue

@@ -948,7 +948,7 @@ export default {
           process.env.VUE_APP_BASE_API +
           `/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${
             props.datasource.type
-          }&type=${2}`,
+          }&type=${1}`,
       };
       console.log("codeInfo", state.codeInfo);
       state.codeIndex = 0;

src/components/drawers/EvList.vue

@@ -60,87 +60,7 @@
         </div>
       </div>
       <div class="contentMain nolimits" v-else>
-        <div class="limitstext1">
+        <img style="width: 700px" src="../../assets/images/evImg.png" />
-          抱歉，您没有关联测评的权限，您可以联系下方管理员开启权限
-        </div>
-        <div class="limitstext2">测评工具介绍</div>
-        <div class="limitsRow">
-          <div class="limitsRowDrop"></div>
-          <div class="limitsRowText">
-            人才发展项目中恰当运用测评手段可以更为精准地定位培训需求，更有针对性地设计培养项目和课程；同时，也能够帮助学员精准认知自身问题，提高在项目中的参与度。
-          </div>
-        </div>
-        <div class="limitsRow" style="margin-top: 10px">
-          <div class="limitsRowDrop"></div>
-          <div class="limitsRowText">
-            BOEU测评部经过多年的额实践，积累了一套覆盖“能力、性格和动力”三大方面的测评工具，可在人才发展项目中选择使用。
-          </div>
-        </div>
-        <div class="tool" v-for="(item, key) in toolList" :key="key">
-          <div
-            class="toolName"
-            :style="{
-              backgroundColor:
-                key === 0
-                  ? 'rgba(0, 77, 126)'
-                  : key === 1
-                  ? 'rgba(184, 0, 0)'
-                  : 'rgba(46, 129, 83)',
-            }"
-          >
-            <div>{{ item.name[0] }}</div>
-            <div>{{ item.name[1] }}</div>
-          </div>
-          <div class="toolEvery1" v-for="(i, k) in item.children" :key="k">
-            <div
-              class="toolEveryText1"
-              :style="{
-                color:
-                  key === 0
-                    ? 'rgba(5,75,120)'
-                    : key === 1
-                    ? 'rgba(169,3,3)'
-                    : 'rgba(44,120,79)',
-              }"
-            >
-              {{ i.text1 }}
-            </div>
-            <div class="toolEveryText2">{{ i.text2 }}</div>
-            <div
-              class="toolEveryText3"
-              v-if="i.text3"
-              :style="{
-                color:
-                  key === 0
-                    ? 'rgba(5,75,120)'
-                    : key === 1
-                    ? 'rgba(169,3,3)'
-                    : 'rgba(44,120,79)',
-              }"
-            >
-              {{ i.text3 }}
-            </div>
-            <div class="toolEveryText4" v-if="i.text4">{{ i.text4 }}</div>
-          </div>
-        </div>
-        <div class="limitsRow">
-          <div class="limitsRowDrop"></div>
-          <div class="limitsRowText">
-            如项目中有测评需求，请您联系BOEU测评部
-          </div>
-        </div>
-        <div class="limitsRow" style="align-items: flex-start">
-          <div class="limitsRowDrop"></div>
-          <div style="margin-top: 10px">
-            <div class="limitsRowText">联系人：</div>
-            <div class="limitsRowText">
-              王逸（10167304） 联系电话：010-60965646
-            </div>
-            <div class="limitsRowText">
-              宋哲（10157955） 联系电话：010-60965435
-            </div>
-          </div>
-        </div>
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
@@ -155,67 +75,67 @@ import { useBoeApiPage } from "@/api/request";
 import { TEST_PAGE } from "@/api/ThirdApi";
 import { message } from "ant-design-vue";
 import { useStore } from "vuex";
-const toolList = ref([
+// const toolList = ref([
-  {
+//   {
-    name: ["能力类", "测验工具"],
+//     name: ["能力类", "测验工具"],
-    children: [
+//     children: [
-      {
+//       {
-        text1: "职场准备度测评",
+//         text1: "职场准备度测评",
-        text2: "无工作经验学生",
+//         text2: "无工作经验学生",
-        text3: "职业能力成熟度测评",
+//         text3: "职业能力成熟度测评",
-        text4: "五年以内工龄员工",
+//         text4: "五年以内工龄员工",
-      },
+//       },
-      {
+//       {
-        text1: "职业认知能力测评",
+//         text1: "职业认知能力测评",
-        text2: "五年内工龄员工",
+//         text2: "五年内工龄员工",
-        text3: "商业推荐测评",
+//         text3: "商业推荐测评",
-        text4: "五年内工龄员工",
+//         text4: "五年内工龄员工",
-      },
+//       },
-      {
+//       {
-        text1: "沟通能力测评",
+//         text1: "沟通能力测评",
-        text2: "五年内工龄员工",
+//         text2: "五年内工龄员工",
-        text3: "情商测评",
+//         text3: "情商测评",
-        text4: "各层级人员",
+//         text4: "各层级人员",
-      },
+//       },
-      {
+//       {
-        text1: "管理行为自检问卷",
+//         text1: "管理行为自检问卷",
-        text2: "基/中/高层管理者",
+//         text2: "基/中/高层管理者",
-        text3: "管理者情境判断测评",
+//         text3: "管理者情境判断测评",
-        text4: "基/中高层管理者",
+//         text4: "基/中高层管理者",
-      },
+//       },
-    ],
+//     ],
-  },
+//   },
-  {
+//   {
-    name: ["性格/风格", "测验工具"],
+//     name: ["性格/风格", "测验工具"],
-    children: [
+//     children: [
-      {
+//       {
-        text1: "PDP性格类型测验",
+//         text1: "PDP性格类型测验",
-        text2: "各层级人员",
+//         text2: "各层级人员",
-      },
+//       },
-      {
+//       {
-        text1: "大五职业性格测评",
+//         text1: "大五职业性格测评",
-        text2: "各层级人员",
+//         text2: "各层级人员",
-      },
+//       },
-      {
+//       {
-        text1: "领导风格测验",
+//         text1: "领导风格测验",
-        text2: "各层级人员",
+//         text2: "各层级人员",
-      },
+//       },
-    ],
+//     ],
-  },
+//   },
-  {
+//   {
-    name: ["动机/价值观", "测验工具"],
+//     name: ["动机/价值观", "测验工具"],
-    children: [
+//     children: [
-      {
+//       {
-        text1: "动机测验（内隐&外显）",
+//         text1: "动机测验（内隐&外显）",
-        text2: "各层级人员",
+//         text2: "各层级人员",
-      },
+//       },
-      {
+//       {
-        text1: "职业兴趣测验",
+//         text1: "职业兴趣测验",
-        text2: "各层级人员",
+//         text2: "各层级人员",
-      },
+//       },
-    ],
+//     ],
-  },
+//   },
-]);
+// ]);
 const props = defineProps({
   taskList: [],
   evaluationTypeId: String,

src/components/drawers/MemberList.vue

@@ -358,7 +358,6 @@ export default {
     };
     //把数据放到state里
     const getTableDataList = (tableData) => {
-      debugger
       let data = tableData;
       let array = [];
       data.map((value) => {

src/components/drawers/project/ProjectExamManage.vue

@@ -402,8 +402,8 @@ export default {
         taskId: props.datasource.courseId,
         targetId: props.datasource.projectId
       }).then(res=>{
-        state.tabledata = res.data.data.managementDtoList;
+        state.tabledata = res.data.data.managementDtoList.records;
-        state.tableDataTotal = res.data.data.total;
+        state.tableDataTotal = res.data.data.managementDtoList.total;
         state.loadingData = false;
       })
     }

src/components/drawers/router/RouterExaminationManage.vue

@@ -403,8 +403,8 @@ export default {
         taskId: props.datasource.courseId,
         targetId: props.datasource.routerId
       }).then(res => {
-        state.tabledata = res.data.data.managementDtoList;
+        state.tabledata = res.data.data.managementDtoList.records;
-        state.tableDataTotal = res.data.data.total;
+        state.tableDataTotal = res.data.data.managementDtoList.total;
         state.loadingData = false;
       })
     }

src/components/project/NameInput.vue

@@ -1,20 +1,18 @@
 <template>
   <a-input
-      v-model:value="modelV"
+    v-model:value="modelV.value"
-      :placeholder="placeholder"
+    :placeholder="placeholder"
-      :show-count="showCount"
+    :show-count="showCount"
-      :maxlength="maxlength"
+    :maxlength="maxlength"
-      :validate="validate"
-      @change="validateProName"
   />
-  <div style="color: red; font-size: 10px" v-if="modelV && !validated">
+  <div style="color: red; font-size: 10px" v-if="modelV.value && validated===0">
     名称重复，请重新输入
   </div>
 </template>
 <script setup>
-import {defineProps, defineEmits, watch, ref, onMounted} from "vue";
+import {defineProps, defineEmits, watch, ref} from "vue";
 import {validateName} from "@/api/index1";
-import {throttle} from "@/api/method";
+import {Form} from "ant-design-vue";
 
 const props = defineProps({
   value: {
@@ -38,70 +36,70 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  validated: {
+    type: Number,
+    default: 0,
+  }
 });
 
-const emit = defineEmits({});
+const emit = defineEmits(["update:value",'update:validated']);
 
-const modelV = ref();
+const modelV = ref({
-
+  value: props.value
-const validating = ref(false)
-const validated = ref(true)
-
-onMounted(() => {
-  modelV.value = props.value;
 });
 
-watch(
+const rulesRef = ref({
-    () => props.value,
+  value: [{
-    () => {
+    required: true,
-      if (props.value !== modelV.value) {
+    validator: validateValue,
-        modelV.value = props.value;
+    trigger: "change",
+    message: "请输入名称",
+  },
+  ],
+});
+
+Form.useForm(modelV, rulesRef, { debounce: { wait: 800 } });
+
+watch(props, () => {
+  modelV.value.value = props.value;
+});
+
+watch(() => modelV.value.value, () => {
+  emit("update:validated", 1);
+  emit("update:value", modelV.value.value);
+});
+
+async function validateValue() {
+  if (!modelV.value.value) {
+    return Promise.reject("请输入名称");
+  }
+  return validateName({ name: modelV.value.value, type: props.type, id: props.id }).then(res => {
+      if (res.data.data === 1) {
+        emit("update:validated", 0);
+        return Promise.reject("名称重复");
       }
+      emit("update:validated", 2);
+      return Promise.resolve();
     }
-);
+  );
-
-watch(modelV, () => {
-  emit("update:value", modelV.value);
-});
-
-function validate() {
-  console.log('validate')
-  ;
-}
-
-function validateNameFun() {
-  validateName({name: props.value, type: props.type, id: props.id}).then(res => {
-        validating.value = false
-        validated.value = res.data.data !== 1
-      }
-  )
-}
-
-const throttleValidateName = throttle(validateNameFun, 500)
-
-function validateProName() {
-  validating.value = true
-  validated.value = true
-  props.value && throttleValidateName()
 }
 </script>
 <style lang="scss">
 
-  .pro {
+.pro {
-    .ant-input-affix-wrapper {
+  .ant-input-affix-wrapper {
-      padding: 4px 8px;
+    padding: 4px 8px;
-      border-radius: 8px;
+    border-radius: 8px;
 
-    }
   }
-  .road {
+}
+
+.road {
   .ant-input-affix-wrapper {
     padding: 0px 8px;
     border-radius: 8px;
   }
-  }
+}
-
-
 
 
 .b_input,

src/components/student/CommonStudent.vue

@@ -401,8 +401,9 @@ const getStu = () => {
     arr.map((value) => {
       let obj = {
         id: value.id,
+        studentId: value.studentId,
         realName: value.studentName,
-        userNo: value.studentId,
+        userNo: value.studentUserNo,
         isLeader: value.isLeader,
         groupId: value.groupId,
         orgName: value.studentOrgName ? value.studentOrgName : "-",
@@ -792,7 +793,6 @@ function handleDialogOk() {
 }
 
 function handleStageOk() {
-  // debugger
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
     if (props.groupMemberCount !== null) {  // 只有添加组员的时候判断
@@ -804,21 +804,26 @@ function handleStageOk() {
         if (haveGroupNum.length > 0) {
           message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
         }
+        // 判断是否是组长，组长不能添加
+        const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
+        if (leaderArray.length > 0) {
+          return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
+        }
       } else if (activeKey.value === 1) {
         selectMember = selectsData.value.studentList.length;
+
+
       } else if (activeKey.value === 2) {
         selectMember = selectsData.value.groupList.length;
       } else if (activeKey.value === 3) {
         selectMember = selectsData.value.deptList.length;
       }
+
+
       if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
         return message.warning("添加小组学员超过最大值");
       }
-      // 判断是否是组长，组长不能添加
+
-      const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
-      if (leaderArray.length > 0) {
-        return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
-      }
 
     }
   }

src/components/student/TableCertificateStudent.vue

@@ -93,7 +93,6 @@ import { reactive, toRefs } from "vue";
 import * as api from "@/api/index1";
 import OrgClass from "@/components/project/OrgClass";
 import { message } from "ant-design-vue";
-import { toDate } from "@/api/method";
 import dayjs from "dayjs";
 export default {
   name: "TableCertificateStudent",
@@ -160,17 +159,7 @@ export default {
           key: "createTime",
           width: 60,
           align: "center",
-          className: "h",
+          className: "h"
-          customRender: (record) => {
-            // console.log(text.record.checked1);
-            return (
-              <div>
-                {record.record.createTime
-                  ? toDate(record.record.createTime / 1000, "Y-M-D h:m")
-                  : "-"}
-              </div>
-            );
-          },
         },
         {
           title: "操作",

src/store/index.js

@@ -9,70 +9,70 @@
 import {createStore} from "vuex";
 // import * as api from '../api/index1'
 export default createStore({
-    state: {
+  state: {
-        openpages: localStorage.getItem("openpages")
+    openpages: localStorage.getItem("openpages")
-            ? JSON.parse(localStorage.getItem("openpages"))
+      ? JSON.parse(localStorage.getItem("openpages"))
-            : [
+      : [
-                {
+        {
-                    pagename: "学习路径图",
+          pagename: "学习路径图",
-                    href: "/learningpath",
+          href: "/learningpath",
-                    active: true,
+          active: true,
-                },
+        },
-            ],
+      ],
 
-        assessmentName: "",
+    assessmentName: "",
-        routerId: null,
+    routerId: null,
-        projectTemplateId: null,
+    projectTemplateId: null,
-        userInfo: {},
+    userInfo: {},
-        orgtreeList: [],
+    orgtreeList: [],
-        faceclassPic: null,
+    faceclassPic: null,
-        faceclassClass: [],
+    faceclassClass: [],
-        faceclassScene: [],
+    faceclassScene: [],
-        projectLevel: [],//项目级别
+    projectLevel: [],//项目级别
-        projectSys: [],//培训分类
+    projectSys: [],//培训分类
-        pathmapPic: [],//学习路径背景图
+    pathmapPic: [],//学习路径背景图
-        memberInitInfo: [],//学员默认
+    memberInitInfo: [],//学员默认
-        sysType: [],//学员默认
+    sysType: [],//学员默认
-        menus:[]
+    menus: []
+  },
+  getters: {},
+  mutations: {
+    chengeOpenpages(state, list) {
+      // console.log('list', list)
+      state.openpages = list;
     },
-    getters: {},
+    chengeRouterId(state, routerId) {
-    mutations: {
+      // console.log('list', list)
-        chengeOpenpages(state, list) {
+      state.routerId = routerId;
-            // console.log('list', list)
-            state.openpages = list;
-        },
-        chengeRouterId(state, routerId) {
-            // console.log('list', list)
-            state.routerId = routerId;
-        },
-
-        SET_assessmentName(state, name) {
-            state.assessmentName = name;
-            console.log("state.assessmentName");
-            console.log(state.assessmentName);
-        },
-        //获取组织树
-        getOrgtreeList(state, data) {
-            state.orgtreeList = data
-        },
-        SET_DICT(state, {key, data}) {
-            state[key] = data
-        },
-        SET_MEMBER_INFO(state, data) {
-            state.memberInitInfo = data
-        },
-        SET_USER(state, userInfo) {
-            state.userInfo = userInfo
-        },
-        SET_projectTemplateId(state, projectTemplateId) {
-            state.projectTemplateId = projectTemplateId;
-        },
-        SET_PERMISSION(state,permissions){
-            state.menus = permissions;
-        }
-
-
     },
-    actions: {},
+
-    modules: {},
+    SET_assessmentName(state, name) {
+      state.assessmentName = name;
+      console.log("state.assessmentName");
+      console.log(state.assessmentName);
+    },
+    //获取组织树
+    getOrgtreeList(state, data) {
+      state.orgtreeList = data;
+    },
+    SET_DICT(state, { key, data }) {
+      state[key] = data;
+    },
+    SET_MEMBER_INFO(state, data) {
+      state.memberInitInfo = data;
+    },
+    SET_USER(state, userInfo) {
+      userInfo.avatar = userInfo.avatar?.includes(process.env.VUE_APP_FILE_PATH) ? userInfo.avatar : (process.env.VUE_APP_FILE_PATH + userInfo.avatar);
+      state.userInfo = userInfo;
+    },
+    SET_projectTemplateId(state, projectTemplateId) {
+      state.projectTemplateId = projectTemplateId;
+    },
+    SET_PERMISSION(state, permissions) {
+      state.menus = permissions;
+    }
+
+  },
+  actions: {},
+  modules: {},
 });

src/views/courselibrary/CoursewareManage.vue

@@ -135,10 +135,11 @@
                 <NameInput
                   placeholder="请输入课程名称"
                   v-model:value="xzinputV1"
-                  v-model:validate="validate"
+                  v-model:validated="validated"
+                  :id="offcourseId"
                   :maxlength="20"
                   show-count
-                  :type="3"
+                  :type="2"
                 ></NameInput>
                 <!--                <a-input-->
                 <!--                  v-model:value="xzinputV1"-->
@@ -286,9 +287,9 @@
               <div class="btn btn5" @click="of_exit1">
                 <div class="btnText">取消</div>
               </div>
-              <div class="btn btn6" @click="createft">
+              <a-button class="btn btn6" @click="createft" :loading="validated===1">
-                <div class="btnText">确定</div>
+                确定
-              </div>
+              </a-button>
             </div>
           </div>
         </div>
@@ -918,10 +919,10 @@
               <NameInput
                 maxlength="30"
                 v-model:value="xjkkinputV1"
-                v-model:validate="validate"
+                v-model:validated="validated"
                 show-count
-                :id="offcourseId"
+                :id="offcoursePlanId"
-                :type="2"
+                :type="5"
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入开课名称"
               ></NameInput>
@@ -1168,9 +1169,9 @@
             <div class="cstm_btn btn5" @click="handleCancelStu">
               <div class="btnText">取消</div>
             </div>
-            <div class="cstm_btn btn6" @click="handleSureStu">
+            <a-button class="cstm_btn btn6" @click="handleSureStu" :loading="validated===1">
-              <div class="btnText">确定</div>
+              确定
-            </div>
+            </a-button>
           </div>
         </div>
       </div>
@@ -2575,7 +2576,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate: true,
+      validated: 0,
       attach: "",
       pageSize2: 10,
       currentPage2: 0,
@@ -3501,9 +3502,7 @@ export default defineComponent({
         return message.warning("请输入必填项");
       }
 
-      console.log("state.validate", state.validate);
+      if (!state.validated == 2) {
-
-      if (!state.validate) {
         message.destroy();
         return message.warning("该课程名称已存在");
       }

src/views/courselibrary/OnlineManage.vue

@@ -13,16 +13,13 @@
     <iframe
         id="iframe"
         style="width: 100%; height: 100%"
-        :src="iframeUrl + '/course/manages'"
+        :src="iframeUrl + '/course/manages?page=manage'"
         frameborder="0"
         name="myframe"
         security="restricted"
         sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
     ></iframe>
     <OnlineClassModelStudent ref="stuRef"></OnlineClassModelStudent>
-    <div @click="test">
-      测试
-    </div>
   </div>
 </template>
 <script setup>
@@ -35,10 +32,6 @@ const stuRef = ref()
 onMounted(() => {
   window.openSelectStu = stuRef.value.openDrawer
 })
-
-function test() {
-  window.openSelectStu()
-}
 </script>
 <style lang="scss">
 .courseManage {

src/views/courselibrary/courseModal.vue

@@ -54,7 +54,7 @@
                       ref="inputRef"
                       placeholder="请输入课程名称"
                       v-model:value="qdms_inputV1"
-                      v-model:validate="validate"
+                      v-model:validated="validated"
                       :maxlength="20"
                       show-count
                       :type="2"
@@ -457,9 +457,9 @@
             <div class="btn btn5" @click="noEditClose">
               <div class="btnText">取消</div>
             </div>
-            <div class="btn btn6" @click="handlePush">
+            <a-button class="btn btn6" @click="handlePush" :loading="validated===1">
               <div class="btnText">保存</div>
-            </div>
+            </a-button>
           </div>
         </div>
       </div>
@@ -507,7 +507,7 @@
       </div>
       <div class="btn">
         <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
-        <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        <a-button class="samtn btn2" @click="closeLearnBgMore">确定</a-button>
       </div>
     </div>
   </a-modal>
@@ -556,7 +556,7 @@ export default defineComponent({
       hideshow: true,
       ft_eidt: false,
       attach: "",
-      validate: true,
+      validated: 0,
       ft_hs: false,
       addLoading: false,
       statusJuJue: 0,

src/views/examine/OnlineReviewed.vue

@@ -3,7 +3,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 100%"
-      :src="iframeUrl + '/iframe/course/reviewed'"
+      :src="iframeUrl + '/pc/iframe/course/reviewed'"
       frameborder="0"
       name="myframe"
       security="restricted"

src/views/examine/TobeOnlineReviewed.vue

@@ -3,7 +3,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 100%"
-      :src="iframeUrl + '/iframe/course/noapproved'"
+      :src="iframeUrl + '/pc/iframe/course/noapproved'"
       frameborder="0"
       name="myframe"
       security="restricted"

src/views/learningpath/LearningPath.vue

@@ -210,7 +210,7 @@
               <NameInput
                 placeholder="请输入路径名称"
                 v-model:value="pathName"
-                v-model:validate="validate"
+                v-model:validated="validated"
                 :maxlength="20"
                 show-count
                 :type="3"
@@ -285,7 +285,7 @@
             <a-button
               class="samtn btn2"
               @click="createLearnPath"
-              :loading="confirmLoading"
+              :loading="confirmLoading || validated === 1"
               >确定</a-button
             >
           </div>
@@ -780,6 +780,7 @@ export default {
       selectTime: null,
       sh: false,
       validate: true,
+      validated: 0,
       tableData: [
         // {
         //   key: 1,

src/views/learningpath/LevelAdd.vue

@@ -2595,13 +2595,10 @@ export default {
       if (item.type == 1) {
         if (item.taskStatus == 1 || item.taskStatus == 2)
           return message.error("该任务无法学习，请联系管理员进行替换。");
-        window.open(
+        codeUrl =
           window.location.protocol +
-            import.meta.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_ONLINE_CLASS_URL +
-            "/mobile/pages/study/courseStudy?id=" +
+          item.targetId;
-            item.targetId,
-          "_top"
-        );
       }
       if (item.type == 2) {
         let date1 = new Date(item.endTime).getTime();
@@ -2629,7 +2626,7 @@ export default {
           "/homeworkpage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.routerTaskId;
+          item.id;
       }
       // 考试 停用
       if (item.type == 5) {
@@ -2642,6 +2639,11 @@ export default {
             process.env.VUE_APP_H5 +
             "/externalexam?courseId=" +
             item.courseId;
+        } else {
+          codeUrl =
+            window.location.protocol +
+            process.env.VUE_APP_EXAM_DETAIL_URL +
+            item.targetId;
         }
       }
       // 直播结束时间
@@ -2652,10 +2654,10 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/livebroadcast?courseId=" +
+          "/liveboradcast?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.routerTaskId;
+          item.id;
       }
       // 外链
       if (item.type == 7) {
@@ -2665,7 +2667,7 @@ export default {
           "/outerchain?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.routerTaskId +
+          item.id +
           "&chapterOrStageId=" +
           item.chapterId +
           "&infoId=" +
@@ -2679,7 +2681,7 @@ export default {
           "/discusspage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.routerTaskId;
+          item.id;
       }
       //活动
       if (item.type == 9) {
@@ -2692,7 +2694,7 @@ export default {
           "/activitiespage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.routerTaskId;
+          item.id;
       }
       //活动
       if (item.type == 10) {
@@ -2711,13 +2713,14 @@ export default {
       if (item.type == 11) {
         if (item.taskStatus == 1 || item.taskStatus == 2)
           return message.error("该任务无法学习，请联系管理员进行替换。");
+        console.log("item", item);
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/investigatage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.routerTaskId +
+          item.id +
           "&chapterOrStageId=" +
           item.chapterId +
           "&infoId=" +
@@ -2731,7 +2734,7 @@ export default {
           "/ballotpage?courseId=" +
           item.courseId +
           "&btype=2&id=" +
-          item.routerTaskId +
+          item.id +
           "&chapterOrStageId=" +
           item.chapterId +
           "&infoId=" +

src/views/learningpath/LevelAddDetail.vue

@@ -261,7 +261,7 @@
                                     size="small" active-color="red"/>
                           <div class="showt clearfix">
                             <div class="bi" :style="{
-                              'z-index': element.flag ? 999 : 998,
+                              'z-index': element.flag ? 889 : 887,
                             }">
                               必修
                             </div>
@@ -1946,7 +1946,7 @@ const cancelStorage = async () => {
           background-color: #5dc988;
           line-height: 23px;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #ffffff;
           border-radius: 4px;
         }
@@ -1958,7 +1958,7 @@ const cancelStorage = async () => {
           line-height: 23px;
           // display: none;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #5dc988;
           border-radius: 4px;
         }

src/views/projectcenter/ProjectAdd.vue

@@ -2,8 +2,9 @@
 <template xmlns:display="http://www.w3.org/1999/xhtml">
   <div class="projectAdd">
     <div class="header">
-      <span class="title">{{ projectInfo.id ? "编辑" : "创建"
+      <span class="title">{{
-      }}{{ ptojectType == "3" ? "班级" : "项目" }}</span>
+          projectInfo.id ? "编辑" : "创建"
+        }}{{ ptojectType == "3" ? "班级" : "项目" }}</span>
       <div @click="backPage" style="cursor: pointer" to="/projectmanage" class="goback">
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -12,7 +13,7 @@
       <div class="main">
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
@@ -23,19 +24,20 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
             </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate"
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
-              :maxlength="30" show-count :id="projectInfo.id"></NameInput>
+                       v-model:validated="projectInfo.validated" :type="1"
+                       :maxlength="30" show-count :id="projectInfo.id"></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
@@ -54,7 +56,7 @@
                     height: 100px;
                     margin-bottom: 4px;
                     margin-right: 4px;
-                  " :src="src.value" alt="avatar" />
+                  " :src="src.value" alt="avatar"/>
             </div>
             <div @click="showLearnBgMore" v-if="projectPic.length > 3" style="
                   width: 100px;
@@ -74,47 +76,49 @@
                   line-height: 36px;
                 ">
               查看更多
-              <img src="../../assets/images/projectadd/go.png" alt="" />
+              <img src="../../assets/images/projectadd/go.png" alt=""/>
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
-            <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }" :placeholder="['      开始时间', '        结束时间']"
+            <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }"
-              :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
+                            :placeholder="['      开始时间', '        结束时间']"
-              style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false" format="YYYY-MM-DD HH:mm"
+                            :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
-              valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail" />
+                            style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false"
+                            format="YYYY-MM-DD HH:mm"
+                            valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail"/>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
-              @onChange="managerChange" mode="multiple"></ProjectManager>
+                            @onChange="managerChange" mode="multiple"></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"
-              v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
+                      v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
@@ -123,7 +127,7 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
@@ -132,7 +136,7 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
@@ -177,7 +181,7 @@
           </div>
           <div class="in">
             <a-textarea v-model:value="projectInfo.remark" style="height: 80px" placeholder="请输入说明" show-count
-              :maxlength="200" :disabled="viewDetail ? true : false" />
+                        :maxlength="200" :disabled="viewDetail ? true : false"/>
           </div>
         </div>
 
@@ -197,7 +201,7 @@
             <a-select :getPopupContainer="
               (triggerNode) => triggerNode.parentNode || document.body
             " placeholder="请选择模版" style="width: 100%" :options="classifyList5" @change="classificationChange5"
-              @popupScroll="templateScroll" :fieldNames="{
+                      @popupScroll="templateScroll" :fieldNames="{
                 label: 'name',
                 value: 'id',
               }">
@@ -215,18 +219,18 @@
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
     <a-modal :closable="sh" centered="true" v-model:visible="learnBgMore" :footer="null" :width="650"
-      wrapClassName="learnBgMoreModal" :z-index="9999">
+             wrapClassName="learnBgMoreModal" :z-index="9999">
       <div class="main">
         <div class="top">
           <div class="topc">封面图</div>
         </div>
         <div class="imagesBox">
-        <!-- <div
+          <!-- <div
-                  @click="() => (projectInfo.picUrl = src.value)"
+                    @click="() => (projectInfo.picUrl = src.value)"
-                  v-for="item in projectPic"
+                    v-for="item in projectPic"
-                  :key="item.code"
+                    :key="item.code"
-                  class="learnBgItem"
+                    class="learnBgItem"
-            > -->
+              > -->
           <div @click="chooseImg2(item)" v-for="item in projectPic" :key="item.code" class="learnBgItem" :style="{
             border:
               projectInfo.picUrl === item.value
@@ -239,27 +243,27 @@
         </div>
         <div class="btn">
           <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
-          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+          <a-button class="samtn btn2" @click="closeLearnBgMore" :loading="projectInfo.validated===1">确定</a-button>
         </div>
       </div>
     </a-modal>
   </div>
 </template>
 <script>
-import { onMounted, reactive, toRefs, watch } from "vue";
+import {onMounted, reactive, toRefs, watch} from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import * as api from "../../api/index";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import * as api2 from "../../api/indexAudit";
-import { validateName } from "@/api/index1";
+import {validateName} from "@/api/index1";
 import dayjs from "dayjs";
-import { scrollLoad } from "@/api/method";
+import {scrollLoad} from "@/api/method";
 
 export default {
   name: "projectAdd",
@@ -283,7 +287,7 @@ export default {
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
       viewDetail: null,
-      projectInfo: { id: "" },
+      projectInfo: { id: "", validated: 0 },
       projectPic: [],
       memberParam: {
         pageNo: 1,
@@ -330,43 +334,43 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.id = routers.query.projectId;
       (state.projectInfo.id || state.projectInfo.parentId) &&
-        api
+      api
-          .getProjectDetail({
+        .getProjectDetail({
-            projectId: state.projectInfo.id || state.projectInfo.parentId,
+          projectId: state.projectInfo.id || state.projectInfo.parentId,
-          })
+        })
-          .then((res) => {
+        .then((res) => {
-            state.projectInfo = {
+          state.projectInfo = {
-              ...res.data.data.projectInfo,
+            ...res.data.data.projectInfo,
-              ...state.projectInfo,
+            ...state.projectInfo,
+          };
+          !routers.query.projectId &&
+          !!routers.query.parentId &&
+          (state.projectInfo.name = "");
+          state.timeRange = [
+            state.projectInfo.beginTime,
+            state.projectInfo.endTime,
+          ];
+          state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+          if (Number(state.projectInfo.status) === -5) {
+            let obj = {
+              project_id: state.projectInfo.id,
+              type: 1,
+              pageNo: 1,
+              pageSize: 1,
             };
-            !routers.query.projectId &&
+            api2.auditList(obj).then((d) => {
-              !!routers.query.parentId &&
+              if (d.data.code === 200) {
-              (state.projectInfo.name = "");
+                let res = d.data.data;
-            state.timeRange = [
+                if (res.rows && res.rows.length > 0) {
-              state.projectInfo.beginTime,
+                  let i = res.rows.length;
-              state.projectInfo.endTime,
+                  state.auditDescription = res.rows[i - 1].description
-            ];
+                    ? res.rows[i - 1].description
-            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+                    : "-";
-            if (Number(state.projectInfo.status) === -5) {
-              let obj = {
-                project_id: state.projectInfo.id,
-                type: 1,
-                pageNo: 1,
-                pageSize: 1,
-              };
-              api2.auditList(obj).then((d) => {
-                if (d.data.code === 200) {
-                  let res = d.data.data;
-                  if (res.rows && res.rows.length > 0) {
-                    let i = res.rows.length;
-                    state.auditDescription = res.rows[i - 1].description
-                      ? res.rows[i - 1].description
-                      : "-";
-                  }
                 }
-              });
+              }
-            }
+            });
-          });
+          }
+        });
     }
 
     const backPage = () => {
@@ -453,7 +457,7 @@ export default {
       /**
        if (!state.projectInfo.validate) {
         message.destroy();
-        message.warning('项目名称重复，请修改名称！');
+        message.warning("项目名称重复，请修改名称！");
         return;
       }*/
       const offName = await validateName({
@@ -508,9 +512,11 @@ export default {
     const closeLearnBgMore = () => {
       state.learnBgMore = false;
     };
+
     function calendarChange(date, dateStr, partial) {
       state.datePartial = partial;
     }
+
     const chooseImg2 = (item) => {
       // console.log(item);
       state.projectInfo.picUrl = item.value;

src/views/projectcenter/ProjectManage.vue

@@ -304,7 +304,8 @@
               <NameInput
                 placeholder="请输入项目名称"
                 v-model:value="projectInfo.name"
-                v-model:validate="projectInfo.validate"
+                v-model:validated="projectInfo.validated"
+                :type="1"
                 :maxlength="30"
                 show-count
                 :id="projectInfo.projectId"
@@ -358,7 +359,7 @@
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="createStoreyProject"
+            <a-button class="pubtn2" @click="createStoreyProject" :loading="buttonLoading || projectInfo.validated===1"
               >确定
             </a-button>
           </div>
@@ -973,6 +974,7 @@ export default {
   setup() {
     const state = reactive({
       tableLoading: false,
+      buttonLoading: false,
       projectName: null,
       selectTime: null,
       sonproject: false,
@@ -1082,6 +1084,7 @@ export default {
 
     // 创建多层项目
     const createStoreyProject = async () => {
+      state.buttonLoading = true
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
@@ -1090,6 +1093,7 @@ export default {
         sourceBelongId: "请选择资源归属",
       };
       if (!validate(state.projectInfo, errorMsgs)) {
+        state.buttonLoading = false
         return;
       }
       /**
@@ -1106,6 +1110,7 @@ export default {
         return res.data.data == 1;
       });
       if (offName) {
+        state.buttonLoading = false
         message.destroy();
         return message.warning("项目名称重复，请重新填写");
       }
@@ -1114,6 +1119,7 @@ export default {
         message.destroy();
         message.success("创建成功");
         state.currentPage = 1;
+        state.buttonLoading = false
         getTableDate();
       });
     };

src/views/projectcenter/TaskAdd.vue

@@ -235,7 +235,7 @@
                                       v-model:checked="element.flag" size="small"
                                       active-color="red"/>
                             <div class="showt clearfix">
-                              <div class="bi" :style="{'z-index': element.flag ? 999 : 998,}">必修</div>
+                              <div class="bi" :style="{'z-index': element.flag ? 889 : 887,}">必修</div>
                               <div class="xuan">选修</div>
                             </div>
                           </div>
@@ -1585,7 +1585,7 @@ const cancelStorage = async () => {
           background-color: #5dc988;
           line-height: 23px;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #ffffff;
           border-radius: 4px;
         }
@@ -1596,7 +1596,7 @@ const cancelStorage = async () => {
           background-color: #f2f6fc;
           line-height: 23px;
           position: absolute;
-          z-index: 998;
+          z-index: 888;
           color: #5dc988;
           border-radius: 4px;
         }

src/views/projectcenter/TaskPage.vue

@@ -2852,8 +2852,8 @@ export default {
         .studytimeRank(obj)
         .then((res) => {
           console.log("项目学时榜单获取", res);
-          if (res.data.datas) {
+          if (res.data.data) {
-            state.xueshitabledata = res.data.datas;
+            state.xueshitabledata = res.data.data;
             state.studytimeRankLoading = false;
           } else {
             state.xueshitabledata = [];
@@ -4498,13 +4498,10 @@ export default {
       if (item.type == 1) {
         if (item.taskStatus == 1 || item.taskStatus == 2)
           return message.error("该任务无法学习，请联系管理员进行替换。");
-        window.open(
+        codeUrl =
           window.location.protocol +
-            import.meta.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_ONLINE_CLASS_URL +
-            "/mobile/pages/study/courseStudy?id=" +
+          item.targetId;
-            item.targetId,
-          "_top"
-        );
       }
       if (item.type == 2) {
         let date1 = new Date(item.endTime).getTime();
@@ -4518,7 +4515,7 @@ export default {
           "/faceteach?type=2&courseId=" +
           item.courseId +
           "&id=" +
-          item.projectTaskId;
+          item.id;
       }
       if (item.type == 3) return message.error("请在pc端完成");
       if (item.type == 4) {
@@ -4531,7 +4528,7 @@ export default {
           "/homeworkpage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.projectTaskId;
+          item.id;
       }
       // 考试 停用
       if (item.type == 5) {
@@ -4544,6 +4541,11 @@ export default {
             process.env.VUE_APP_H5 +
             "/externalexam?courseId=" +
             item.courseId;
+        } else {
+          codeUrl =
+            window.location.protocol +
+            process.env.VUE_APP_EXAM_DETAIL_URL +
+            item.targetId;
         }
       }
       // 直播结束时间
@@ -4554,10 +4556,10 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/livebroadcast?courseId=" +
+          "/liveboradcast?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.projectTaskId;
+          item.id;
       }
       // 外链
       if (item.type == 7) {
@@ -4567,7 +4569,7 @@ export default {
           "/outerchain?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.projectTaskId +
+          item.id +
           "&chapterOrStageId=" +
           item.stageId +
           "&infoId=" +
@@ -4581,20 +4583,21 @@ export default {
           "/discusspage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.projectTaskId;
+          item.id;
       }
       //活动
       if (item.type == 9) {
         let date1 = new Date(item.endTime).getTime();
         let date2 = new Date().getTime();
         if (date1 < date2) return message.warning("当前活动已结束");
+
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/activitiespage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.projectTaskId;
+          item.id;
       }
       //活动
       if (item.type == 10) {
@@ -4613,13 +4616,14 @@ export default {
       if (item.type == 11) {
         if (item.taskStatus == 1 || item.taskStatus == 2)
           return message.error("该任务无法学习，请联系管理员进行替换。");
+
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/investigatage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.projectTaskId +
+          item.id +
           "&chapterOrStageId=" +
           item.stageId +
           "&infoId=" +
@@ -4633,7 +4637,7 @@ export default {
           "/ballotpage?courseId=" +
           item.courseId +
           "&btype=2&id=" +
-          item.projectTaskId +
+          item.id +
           "&chapterOrStageId=" +
           item.chapterId +
           "&infoId=" +

src/views/research/ResearchAdd.vue

@@ -92,9 +92,7 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, computed } from "vue";
+import {reactive, toRefs} from "vue";
-// import { message } from "ant-design-vue";
-// import { createResearch } from "../../api/indexResearch";
 import ResearchAddSingle from "./components/ResearchAddSingle.vue";
 import ResearchAddMulti from "./components/ResearchAddMulti.vue";
 import ResearchAddAsk from "./components/ResearchAddAsk.vue";
@@ -104,7 +102,7 @@ import {
   traverseArr,
   filterCommon,
   deepCloneFilterString,
-} from "../../utils/utils";
+} from "@/utils/utils";
 import {
   queryResearchDetailById,
   editResearchMessage,
@@ -112,9 +110,8 @@ import {
   deleteChoiceQuestion,
   deleteQuestionScAndQa,
 } from "@/api/indexResearch";
-import { useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
-import store from "@/store";
+import {message} from "ant-design-vue";
-import { message } from "ant-design-vue";
 
 export default {
   name: "ResearchAdd",
@@ -126,10 +123,11 @@ export default {
   },
   setup() {
     const router = useRouter();
+    const route = useRoute();
     const state = reactive({
       assessmentId: "", //编辑时候传
       assessmentName: "",
-      assessmentNameNew: computed(() => store.state.assessmentName),
+      assessmentNameNew: route.query.name,
 
       allFormsData: [],
       valueMore: "",
@@ -612,10 +610,12 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     display: flex;
     justify-content: space-between;
+
     .title {
       color: #000000;
       font-size: 18px;
@@ -624,10 +624,12 @@ export default {
       padding-left: 37px;
       //font-weight: 500;
     }
+
     .goback {
       padding-right: 70px;
       //padding-top: 37px;
       position: relative;
+
       .return {
         display: inline-block;
         width: 42px;
@@ -636,6 +638,7 @@ export default {
         margin-right: 10px;
         background-image: url("../../assets/images/projectadd/return.png");
       }
+
       .returntext {
         display: inline-block;
         position: absolute;
@@ -645,16 +648,19 @@ export default {
       }
     }
   }
+
   .addtype {
     display: flex;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-right: 20px;
     align-items: center;
     margin-left: 41px;
+
     .addtypen {
       color: #6f6f6f;
       font-size: 14px;
     }
+
     .types {
       cursor: pointer;
       width: 80px;
@@ -667,11 +673,13 @@ export default {
       align-items: center;
       margin: 20px 10px;
     }
+
     .typesCur {
       color: #fff;
       background: #4ea6ff;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -680,9 +688,11 @@ export default {
     min-width: 690px;
     margin-left: 38px;
     margin-top: 20px;
+
     .tagbox {
       display: flex;
       justify-content: space-between;
+
       .tagname {
         width: 90px;
         height: 32px;
@@ -696,6 +706,7 @@ export default {
         color: rgba(64, 158, 255, 1);
         font-size: 16px;
       }
+
       .deleteop {
         display: flex;
         justify-content: center;
@@ -707,6 +718,7 @@ export default {
         border: 1px solid #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
+
         .del_text {
           color: #4ea6ff;
           font-size: 14px;
@@ -714,21 +726,25 @@ export default {
         }
       }
     }
+
     .scorebox {
       display: flex;
       align-items: center;
       margin-top: 20px;
       margin-left: 70px;
+
       .scoretext {
         font-size: 14px;
         color: #56a3f9;
       }
+
       .number {
         display: flex;
         border: 1px solid #d7e5fd;
         border-radius: 5px;
         margin: 0 10px;
         padding: 5px;
+
         .btn {
           width: 40px;
           height: 40px;
@@ -744,30 +760,36 @@ export default {
           line-height: 24px;
           cursor: pointer;
         }
+
         .curBtn {
           background: #56a3f9;
           color: #fff;
         }
       }
     }
+
     .picture {
       width: 100px;
       display: flex;
       flex-direction: column;
       margin-top: 20px;
       margin-left: 133px;
+
       .pictureimg {
         width: 100px;
         height: 100px;
       }
+
       .picturename {
         color: #6f6f6f;
         font-size: 14px;
       }
     }
+
     .options {
       display: flex;
     }
+
     .delete {
       cursor: pointer;
       margin-top: 32px;
@@ -776,10 +798,12 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+
     .name2 {
       display: flex;
       align-items: flex-start;
     }
+
     .name {
       width: 60%;
       // background-color: lightcoral;
@@ -794,20 +818,24 @@ export default {
         align-items: center;
         justify-content: flex-end;
         flex-shrink: 0;
+
         .nameimg {
           width: 10px;
           height: 10px;
         }
       }
+
       .inname {
         color: #6f6f6f;
         font-size: 14px;
         margin-left: 7px;
         font-weight: 700;
       }
+
       .in {
         margin-left: 14px;
         flex: 1;
+
         .assess {
           display: flex;
           width: 226px;
@@ -822,6 +850,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .assesswhole {
             width: 50%;
             background: rgba(86, 163, 249, 0.1);
@@ -831,6 +860,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .ratio {
             position: absolute;
             right: 10px;
@@ -839,24 +869,29 @@ export default {
             font-size: 14px;
           }
         }
+
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
           font-size: 14px;
         }
+
         .text {
           color: rgba(109, 117, 132, 1);
           font-size: 14px;
           //line-height: 24px;
         }
+
         .ant-radio-wrapper {
         }
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 35px;
         }
+
         .ant-select-selector {
           border-radius: 5px;
           // height: 120%;
@@ -864,26 +899,32 @@ export default {
           height: 40px;
         }
       }
+
       .numberInp {
         width: 200px;
+
         .ant-input-number {
           width: 200px;
           height: 40px;
           border-radius: 8px;
         }
+
         // .ant-input-number-input-wrap {
         //   width: 200px;
         // }
       }
     }
   }
+
   .name2 {
     display: flex;
     align-items: flex-start;
   }
+
   .opinion {
     display: flex;
     margin-top: 30px;
+
     .namebox {
       width: 120px;
       display: flex;
@@ -891,27 +932,33 @@ export default {
       justify-content: flex-end;
       flex-shrink: 0;
     }
+
     .in {
       margin-left: 14px;
       width: 500px;
+
       .ant-input-textarea-show-count {
         position: relative;
         height: 110px;
       }
+
       .ant-input-textarea-show-count::after {
         position: absolute;
         right: 10px;
         bottom: 0px;
       }
+
       .ant-input {
         border-radius: 8px;
       }
     }
   }
+
   .footer {
     width: 100%;
     margin-top: 31px;
     margin-bottom: 14px;
+
     .btn {
       display: flex;
       margin-bottom: 20px;
@@ -922,6 +969,7 @@ export default {
 
   .uploadContent {
     display: block !important;
+
     .uploadBtn {
       margin-left: 120px !important;
     }

src/views/system/AudienceManage.vue

@@ -3,7 +3,7 @@
     <iframe
         id="iframe"
         style="width: 100%; height: 100%"
-        :src="`${BOE_URL}/iframe/ugroup/manages`"
+        :src="`${BOE_URL}/pc/iframe/ugroup/manages`"
         name="myframe"
         security="restricted"
         sandbox="allow-forms allow-scripts allow-same-origin allow-popups"