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

src/App.vue

@@ -41,7 +41,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.02------------");
+    console.log("版本0.05------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/api/indexExam.js

@@ -20,4 +20,6 @@ export const queryExaminationList = (obj) => http.post('/examination/queryExamin
 // 获取考试任务列表的接口-三方
 export const queryExaminationAloneExtendList = (obj) => http.post('/examination/queryExaminationAloneExtendList', obj);
 // 对接三方考试任务保存接口-三方
-export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);
+export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);
+//编辑考试信息
+export const updateExamination = (obj) => http.post('/examination/updateExamination', obj);

src/api/indexOnline.js

@@ -12,7 +12,7 @@ import http from "./config";
 
 // 接口-请求
 //查询在线课信息列表接口
-export const  queryOnlinelList = (obj) => http.post('/queryOnlineClassesDetailList', obj)
+export const  queryOnlinelList = (obj) => http.post('/onlineClasses/queryOnlineClassesDetailList', obj)
 
 
 

src/components/Modals/addOnlineCourse.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-24 16:39:48
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-29 15:28:34
+ * @LastEditTime: 2022-11-29 18:31:34
  * @FilePath: /fe-manage/src/components/Modals/addOnlineCourse.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -42,6 +42,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    closeOnlineModal: {
+      type: Function,
+      default: () => {},
+    },
   },
   setup(props, ctx) {
     // console.log("学习路径", props.addOnlineCoursevisible, ctx);
@@ -50,6 +54,7 @@ export default {
     });
     const closeModal = () => {
       ctx.emit("update:addOnlineCoursevisible", false);
+      props.closeOnlineModal();
     };
     return {
       ...toRefs(state),

src/components/drawers/AddCase.vue

@@ -160,7 +160,6 @@ export default {
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
-      searching:false,
       selectedRowKeys: [],
       apiTaskList: [],
       inputV1: "",
@@ -222,23 +221,6 @@ export default {
     const getTableDate = (tableData) => {
       let data = tableData;
       let array = [];
-      if(state.searching){
-        data.map((value, index) => {
-        let obj = {
-          key: index,
-          authorId: value.authorId,
-          authorName: value.authorName,
-          companyId: value.companyId,
-          coverUrl: value.coverUrl,
-          id: value.id,
-          casesId: value.casesId,
-          title: value.title,
-        };
-        if(obj.title == state.inputV1){
-          array.push(obj);
-        }
-      });
-      } else {
         data.map((value, index) => {
         let obj = {
           key: index,
@@ -252,7 +234,6 @@ export default {
         };
         array.push(obj);
       });
-      }
       state.tableData = array;
     };
     //获取全部案例信息接口
@@ -264,7 +245,7 @@ export default {
           orderField: "",
           pageIndex: state.currentPage,
           pageSize: state.pageSize,
-          top: true,
+          isTop: "",
         })
         .then((res) => {
           if (res.status === 200) {
@@ -318,10 +299,6 @@ export default {
         }
       } else if (props.isLevel == 3) {
         for (let i = 0; i < state.apiTaskList.length; i++) {
-          console.log(
-            state.apiTaskList[i],
-            "state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId"
-          );
           apiTask
             .addTask({
               courseId: state.apiTaskList[i].caseid,
@@ -349,17 +326,14 @@ export default {
     //搜索案例列表
     const searchList = ()=> {
       if(state.inputV1 !== ''){
-        state.searching = true
         getAllCaseText()
       }else {
-        state.searching = false
         resetCase()
       }
     }
     //重置案例信息
     const resetCase = () => {
       state.inputV1 = ""
-      state.searching = false
       state.selectedRowKeys=[]
       state.currentPage = 1
       getAllCaseText();

src/components/drawers/AddOnline.vue

@@ -198,7 +198,6 @@ export default {
       time: undefined,
       onlineClassesId: null,
       onlineName: "",
-      searching:false,
       selectV: "",
       selectedRowKeys: [],
       tableData: [],
@@ -286,23 +285,10 @@ export default {
       let data = tableData;
       let array = [];
       data.map((value,index) => {
-        if(state.searching){
+        {
           let obj = {
             key: index + 1,
-            num:"", 
+            num:value.onlineClassesId,
-            name:value.name,
-            contenttype:value.contentType == 10 ? "微课" : "录播课",
-            teacher:value.teacher,
-            sysCreateBy:value.sysCreateBy,
-            overtime:"",
-          };
-          if(obj.name == state.inputV1 || obj.contenttype == state.selectV){
-            array.push(obj);
-          }
-        } else {
-          let obj = {
-            key: index + 1,
-            num:"", 
             name:value.name,
             contenttype:value.contentType == 10 ? "微课" : "录播课",
             teacher:value.teacher,
@@ -345,7 +331,7 @@ export default {
         state.addOnlineList.map((value) => {
           RouterEditTask({
           chapterId: Number(props.isactive),
-          courseId: value.onlineClassesId,
+          courseId: value.num,
           name: value.name,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
@@ -363,11 +349,11 @@ export default {
             message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
         })
-      } else if (props.isLevel == 2) {
+      } else if (props.isLevel === 2) {
         state.addOnlineList.map((value) => {
           apiTask
           .addTask({
-            courseId: value.onlineClassesId,
+            courseId: value.num,
             name: value.name,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
@@ -415,7 +401,6 @@ export default {
     //搜索在线列表
     const searchList = ()=> {
       if(state.inputV1 !== '' || state.selectV !== ''){
-        state.searching = true
         getAllOnlineText()
       }else {
         resetOnline()
@@ -425,7 +410,6 @@ export default {
     const resetOnline = () => {
       state.inputV1 = "";
       state.selectV = "";
-      state.searching = false;
       state.selectedRowKeys = [];
       state.addOnlineList = [];
       state.currentPage = 1;

src/components/drawers/AddTest.vue

@@ -119,6 +119,7 @@
                       class="tag-style"
                       v-if="paperName != ''"
                       :closable="true"
+                      @close="delTag"
                       >{{ paperName }}</a-tag
                     >
                     <!-- <a-tag
@@ -379,7 +380,7 @@
         </div>
         <div class="main_btns">
           <a-button class="btn1" @click="closeDrawer">取消</a-button>
-          <a-button class="btn2" html-type="submit">确定</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button> 
         </div>
       </a-form>
 
@@ -478,6 +479,7 @@ export default {
       showAnalysis: 2,
       showAnswers: 2,
       choosedTime: "",
+      paperName:"",
       choosedTest: [
         {
           key: 1,
@@ -499,6 +501,8 @@ export default {
       STvisible: false, //选择试卷抽屉
       paperId: null, //试卷id 子组件传过来给考试抽屉创建考试信息需要
       paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
+      id:"",
+      testName:"",
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -640,6 +644,10 @@ export default {
 
     const resetForm = () => {
       formRef.value.resetFields();
+      state.paperName = "";
+      state.paperId = null;
+      state.id = "";
+      state.testName = "";
     };
 
     const handleValidate = (...args) => {
@@ -666,6 +674,10 @@ export default {
       state.STvisible = true;
     };
 
+    const delTag = () => {
+      state.paperId = 0;
+      state.paperName = "";
+    };
     const queryTest = () => {
      // state.addLoading = true;
       queryExaminationDetailById({ examinationId: props.EditTestId })
@@ -682,6 +694,8 @@ export default {
           formState.scoringModel = Number(res.data.data.scoringModel) || 1;
           formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
           formState.showAnswers = Number(res.data.data.showAnswers) || 1;
+          formState.papaerName = res.data.data.examinationTestName;
+          state.paperName = res.data.data.examinationTestName;
           if (
             res.data.data.examinationEndTime &&
             res.data.data.examinationStartTime
@@ -700,7 +714,7 @@ export default {
         });
     };
     const updateTest = () => {
-      //state.addLoading = true;
+      //state.addLoading = true;updateTask
       let obj = {
         examinationDuration: formState.examinationDuration,
         examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -720,6 +734,8 @@ export default {
         scoringModel: formState.scoringModel,
         showAnalysis: formState.showAnalysis,
         showAnswers: formState.showAnswers,
+        examinationTestId:state.id,
+        examinationTestName:state.testName,
       };
       if (props.edit) {
         // 编辑任务
@@ -746,10 +762,8 @@ export default {
 
     const updateTask = (res) => {
       state.EditTestId = res.data.data.examinationId;
-      console.log("state.EditTestId=====0",state.EditTestId,props.faceLevel);
       if(props.faceLevel){
         state.EditTestId = res.data.data.examinationId;
-        console.log("state.EditTestId=====",state.EditTestId);
       }else{
         if (props.isLevel == 1) {
         let editObj1 = {
@@ -790,7 +804,6 @@ export default {
             //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("");
         addTempTask({
           courseId: res.data.data.examinationId,
           duration: res.data.data.examinationDuration,
@@ -851,6 +864,8 @@ export default {
     const getData = (value) => {
       state.paperId = value.paperId;
       state.paperName = value.testName;
+      state.id =  value.id
+      state.testName = value.testName
     };
     return {
       formState,
@@ -867,6 +882,7 @@ export default {
       resetForm,
       handleValidate,
       formRef,
+      delTag,
       // layout,
       rules,
       updateTest,

src/components/drawers/EvList.vue

@@ -97,7 +97,6 @@ import { reactive, toRefs } from "vue";
         tableDataTotal: 0,
         pageSize: 10,
         inputV1:"",
-        searching:false,
         evaluationTypeId:null,
         evaluationTypeName:"",
         tableData: [],
@@ -160,11 +159,10 @@ import { reactive, toRefs } from "vue";
       state.evListData = selectedRows[0] ? selectedRows[0] : {}
     }
     const closeDrawer = () => {
-      ctx.emit("update:EvalListVisible", false);
       state.selectedRowKeys = []
       state.evListData = {}
       state.inputV1 = ""
-      state.searching = false
+      ctx.emit("update:EvalListVisible", false);
     };
     const afterVisibleChange = (bol) => {
       if ( bol == true ) {
@@ -177,6 +175,7 @@ import { reactive, toRefs } from "vue";
     }
     const changePagination = (page) => {
       state.currentPage = page;
+      getAllEvalText();
     };
     //如果编辑情况会通过父亲传回来evaluationTypeId遍历出相同的那个选项 再将那个选项的key值赋给state.selectRowKeys
     const getTableDataList = (tableData) => {
@@ -202,24 +201,6 @@ import { reactive, toRefs } from "vue";
       });
       state.tableData = array;
       state.selectedRowKeys = arrayKey;
-      }else if (state.searching){
-        data.map((value,index) => {
-        let obj = {
-          key:index+1,
-          status:value.status,
-          quiz_code:value.quiz_code,
-          quiz_kid:value.quiz_kid,
-          title:value.title,
-          theme_desc:value.theme_desc,
-          quiz_price:value.quiz_price,
-          quiz_range:value.quiz_range,
-        };
-        if(state.inputV1 == obj.title)
-        {
-          array.push(obj);
-        }
-      });
-      state.tableData = array;
       }
       else{
         data.map((value,index) => {
@@ -242,7 +223,7 @@ import { reactive, toRefs } from "vue";
     //获取测评列表
     const getAllEvalText = ()=> {
       let objael = {
-        "keyword": "",
+        "keyword": state.inputV1,
         "user_id": "965341999643234304",
       }
       api
@@ -256,10 +237,8 @@ import { reactive, toRefs } from "vue";
     //搜索测评列表
     const searchList = ()=> {
       if(state.inputV1 !== ''){
-        state.searching = true
         getAllEvalText()
       }else {
-        state.searching = false
         resetData()
       }
     }

src/components/drawers/ProjectAudit.vue

@@ -1,18 +1,18 @@
 <template>
   <a-drawer
-    :visible="ProjAuditvisible"
+      :visible="ProjAuditvisible"
-    class="drawerStyle ProjectAudit"
+      class="drawerStyle ProjectAudit"
-    placement="right"
+      placement="right"
-    width="60%"
+      width="60%"
-    @after-visible-change="afterVisibleChange"
+      @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">审核项目</div>
         <img
-          style="width: 29px; height: 29px; cursor: pointer"
+            style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
+            src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
+            @click="closeDrawer"
         />
       </div>
       <div class="main" style="padding-right: 10px">
@@ -30,9 +30,9 @@
                   <div class="setc_name"><span>封面图：</span></div>
                   <div class="setc_main">
                     <img
-                      style="width: 151px; height: 84px"
+                        style="width: 151px; height: 84px"
-                      :src="picUrl"
+                        :src="picUrl"
-                      alt=""
+                        alt=""
                     />
                   </div>
                 </div>
@@ -40,7 +40,7 @@
                   <div class="setc_name"><span>项目时间：</span></div>
                   <div class="setc_main">
                     <span style="color: #999999"
-                      >{{ startTime }} ～ {{ endTime }}</span
+                    >{{ startTime }} ～ {{ endTime }}</span
                     >
                   </div>
                 </div>
@@ -66,9 +66,9 @@
                   <div class="setc_name"><span>同步学习记录：</span></div>
                   <div class="setc_main">
                     <a-radio v-model:checked="checkedSty"
-                      ><span style="color: #333333"
+                    ><span style="color: #333333"
-                        >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                      ></a-radio
+                    ></a-radio
                     >
                   </div>
                 </div>
@@ -88,7 +88,7 @@
                   <div class="setc_name"><span>是否BOEU实施：</span></div>
                   <div class="setc_main">
                     <a-radio v-model:checked="checkedBOEU"
-                      ><span style="color: #333333">BOEU实施</span></a-radio
+                    ><span style="color: #333333">BOEU实施</span></a-radio
                     >
                   </div>
                 </div>
@@ -101,7 +101,7 @@
               </button>
             </div>
           </a-tab-pane>
-          <a-tab-pane key="2" tab="修改记录"> </a-tab-pane>
+          <a-tab-pane key="2" tab="修改记录"></a-tab-pane>
         </a-tabs>
         <div class="audit">
           <div class="set_content">
@@ -116,7 +116,7 @@
           <div class="set_content">
             <div class="setc_name"><span>审核意见：</span></div>
             <div class="setc_main">
-              <a-textarea v-model:value="valueSuggest" :rows="4" />
+              <a-textarea v-model:value="valueSuggest" :rows="4"/>
             </div>
           </div>
         </div>
@@ -130,11 +130,12 @@
 </template>
 
 <script>
-import { toRefs, reactive } from "vue";
+import {toRefs, reactive} from "vue";
-import { getTask } from "../../api/indexTaskadd";
+import {getTask} from "../../api/indexTaskadd";
-import { toDate } from "../../api/method";
+import {toDate} from "../../api/method";
-import { auditView } from "../../api/indexAudit";
+import {auditView} from "../../api/indexAudit";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
+
 export default {
   name: "ProjectAudit",
   components: {},
@@ -155,6 +156,10 @@ export default {
       type: String,
       default: null,
     },
+    finishdFun: {
+      type: Function,
+      default: null
+    }
   },
 
   setup(props, ctx) {
@@ -195,6 +200,8 @@ export default {
 
     const closeDrawer = () => {
       ctx.emit("update:ProjAuditvisible", false);
+      console.log(props.finishdFun)
+      props.finishdFun && props.finishdFun()
       state.valueSuggest = null;
       state.valuePass = "1";
     };
@@ -202,8 +209,7 @@ export default {
     //获取项目信息
     const getTaskInfo = () => {
       getTask({
-        // 先使用了固定projectId
+        projectId: props.chooseProject,
-        projectId: 37,
       }).then((res) => {
         console.log("get task", res.data.data);
         let info = res.data.data.projectInfo;
@@ -219,26 +225,26 @@ export default {
         state.manager = info.manager;
         state.remark = info.remark;
         state.level =
-          info.level == 1
+            info.level == 1
-            ? "集团级"
+                ? "集团级"
-            : info.level == 2
+                : info.level == 2
-            ? "组织级"
+                    ? "组织级"
-            : info.level == 3
+                    : info.level == 3
-            ? "现地级"
+                        ? "现地级"
-            : info.level == 4
+                        : info.level == 4
-            ? "部门级"
+                            ? "部门级"
-            : "-";
+                            : "-";
         state.tlevel = info.level;
         state.systemId =
-          info.systemId == 1
+            info.systemId == 1
-            ? "集团级"
+                ? "集团级"
-            : info.systemId == 2
+                : info.systemId == 2
-            ? "组织级"
+                    ? "组织级"
-            : info.systemId == 3
+                    : info.systemId == 3
-            ? "现地级"
+                        ? "现地级"
-            : info.systemId == 4
+                        : info.systemId == 4
-            ? "部门级"
+                            ? "部门级"
-            : "-";
+                            : "-";
         state.tsystemId = info.systemId;
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
         state.courseSyncFlag = info.courseSyncFlag;
@@ -254,13 +260,13 @@ export default {
         // state.attach = info.attach;
         // state.templateId = info.templateId;
         state.sourceBelong =
-          info.sourceBelongId == 1
+            info.sourceBelongId == 1
-            ? "项目一"
+                ? "项目一"
-            : info.sourceBelongId == 2
+                : info.sourceBelongId == 2
-            ? "项目二"
+                    ? "项目二"
-            : info.sourceBelongId == 3
+                    : info.sourceBelongId == 3
-            ? "项目三"
+                        ? "项目三"
-            : "-";
+                        : "-";
       });
     };
 
@@ -278,16 +284,16 @@ export default {
         pass: state.valuePass == "1" ? 1 : -1,
         projectId: props.chooseProject,
       })
-        .then((res) => {
+          .then((res) => {
-          console.log("提交成功", res);
+            console.log("提交成功", res);
-          message.destroy();
+            message.destroy();
-          message.success("提交成功");
+            message.success("提交成功");
-          closeDrawer();
+            closeDrawer();
-        })
+          })
-        .catch((err) => {
+          .catch((err) => {
-          console.log(err);
+            console.log(err);
-          message.warning("提交失败");
+            message.warning("提交失败");
-        });
+          });
     };
 
     return {
@@ -310,6 +316,7 @@ export default {
     // overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -319,6 +326,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -328,12 +336,14 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       width: 100%;
       height: 100%;
       // background-color: #bfa;
       overflow-y: auto;
       padding-right: 10px;
+
       .content7 {
         margin-top: 20px;
 
@@ -401,11 +411,13 @@ export default {
           }
         }
       }
+
       .detaile {
         width: 100%;
         // background-color: blue;
         display: flex;
         justify-content: center;
+
         .can {
           width: 130px;
           height: 40px;
@@ -415,6 +427,7 @@ export default {
           background-color: #fff;
           margin-right: 30px;
         }
+
         .debtn {
           width: 130px;
           height: 40px;
@@ -425,10 +438,12 @@ export default {
           cursor: pointer;
         }
       }
+
       .audit {
         margin-left: 34px;
         margin-right: 34px;
         position: relative;
+
         .set_content {
           margin: 32px auto;
           display: flex;
@@ -443,6 +458,7 @@ export default {
           .setc_main {
             flex: 1;
             margin-left: 12px;
+
             textarea {
               border-radius: 4px !important;
               resize: none;

src/components/drawers/SelectTest.vue

@@ -23,17 +23,18 @@
               <a-input
                 v-model:value="inputPname"
                 style="width: 270px; height: 40px; border-radius: 8px"
-                placeholder="请输入试卷名称或序号"
+                placeholder="请输入试卷名称"
               />
             </div>
-            <div class="namecon" style="margin-right: 30px">
+            <!-- 因为接口不支持创建人搜索，所以暂时注调 -->
+            <!-- <div class="namecon" style="margin-right: 30px">
               <div class="name">创建人：</div>
               <a-input
                 v-model:value="inputCname"
                 style="width: 240px; height: 40px; border-radius: 8px"
                 placeholder="请输入创建人"
               />
-            </div>
+            </div> -->
           </div>
           <div class="btns">
             <div
@@ -72,6 +73,7 @@
           <div class="tableBox">
             <div class="pa">
               <a-pagination
+                v-if="tableDataTotal>10"
                 showSizeChanger="true"
                 showQuickJumper="true"
                 hideOnSinglePage="true"
@@ -147,6 +149,7 @@ export default {
       closeDrawer();
     };
     const closeDrawer = () => {
+      state.selectedRowKeys = []
       ctx.emit("update:STvisible", false);
     };
 
@@ -217,56 +220,57 @@ export default {
       }
       state.selectedRowKeys = selectedRowKeys;
       state.SelectTestData = selectedRows[0];
-      console.log("state.SelectTestData---------------", state.SelectTestData);
     };
 
     const newTest = () => {
-      console.log("创建考试没设计图");
       state.addExamVisible = true;
     };
-    const getTableDate = (tableData) => {
+    // const getTableDate = (tableData) => {
-      let data = tableData;
+    //   let data = tableData;
-      let array = [];
+    //   let array = [];
-      data.map((value, index) => {
+    //   data.map((value, index) => {
-        let obj = {
+    //     let obj = {
-          key: index + 1,
+    //       key: index + 1,
-          sysCreateBy: value.sysCreateBy,
+    //       sysCreateBy: value.sysCreateBy,
-          paperId: value.paperId,
+    //       paperId: value.paperId,
-          testName: value.testName,
+    //       testName: value.testName,
-          paperMode: value.paperMode,
+    //       paperMode: value.paperMode == 1 ? "固定试卷" : "随机",
-          sysUpdateTime: value.sysUpdateTime,
+    //       sysUpdateTime: value.sysUpdateTime,
-        };
+    //     };
-        array.push(obj);
+    //     array.push(obj);
-      });
+    //   });
-      state.tableData = array;
+    //   state.tableData = array;
-    };
+    //   state.tableDataTotal = array.length
+    // };
     //获取选择考试列表
     const getManageList = () => {
       let obj = {
         keyWord: state.inputPname,
-        pageIndex: state.pageSize,
+        pageIndex: state.currentPage,
         pageSize: state.pageSize,
         published: true,
       };
       api
         .queryExaminationList(obj)
         .then((data) => {
-
           // getTableDate(res.data.data);
           //**   表格repaint   */
           let array = []
-          data.map((value, index) => {
+          data.data.data.map((value, index) => {
           let obj = {
           key: index + 1,
           sysCreateBy: value.sysCreateBy,
-          paperId: value.paperId,
+          paperId: index + 1,
           testName: value.testName,
-          paperMode: value.paperMode,
+          paperMode: value.randomMode ? "是" : "否",
           sysUpdateTime: value.sysUpdateTime,
+          id:value.id,
         };
         array.push(obj);
       });
-      //**         */
+      state.tableData = array
+      state.tableDataTotal = array.length
+          message.destroy()
           message.success("获取选择考试列表成功");
         })
         .catch(() => {
@@ -289,7 +293,6 @@ export default {
       ...toRefs(state),
       closeDrawer,
       afterVisibleChange,
-      getTableDate,
       onSelectChange,
       CreatSTText,
       newTest,

src/views/courselibrary/CoursewareManage.vue

@@ -458,7 +458,7 @@
                   <div class="item_inp">
                     <div class="select i6_input">
                       <a-select
-                                :getPopupContainer="
+                        :getPopupContainer="
                           (triggerNode) => {
                             return triggerNode.parentNode || document.body;
                           }
@@ -480,12 +480,12 @@
                   </div>
                   <div class="item_inp">
                     <div class="select i7_input">
-                              <a-select
+                      <a-select
-                                :getPopupContainer="
+                        :getPopupContainer="
-                        (triggerNode) => {
+                          (triggerNode) => {
-                          return triggerNode.parentNode || document.body;
+                            return triggerNode.parentNode || document.body;
-                        }
+                          }
-                      " 
+                        "
                         v-model:value="chang_jin"
                         dropdownClassName="dropdown-style"
                         style="width: 440px"
@@ -503,7 +503,7 @@
                   </div>
                   <div class="item_inp">
                     <a-select
-                              :getPopupContainer="
+                      :getPopupContainer="
                         (triggerNode) => {
                           return triggerNode.parentNode || document.body;
                         }
@@ -2506,7 +2506,10 @@
       classify="addstudent"
     />
     <!-- 新建在线课弹窗 -->
-    <addOnlineCourse v-model:addOnlineCoursevisible="addOnlineCoursevisible" />
+    <addOnlineCourse
+      v-model:addOnlineCoursevisible="addOnlineCoursevisible"
+      :closeOnlineModal="closeOnlineCoursevisible"
+    />
     <!-- 新建在线课弹窗 -->
 
     <!-- 授权名单抽屉 -->
@@ -4825,6 +4828,11 @@ export default defineComponent({
           });
       }
     );
+
+    const closeOnlineCoursevisible = () => {
+      console.log("执行");
+      getTableDate();
+    };
     return {
       ...toRefs(state),
       getdateToDateFn,
@@ -4931,6 +4939,8 @@ export default defineComponent({
       showOwnPrower,
       showViewPrower,
       showManagePrower,
+
+      closeOnlineCoursevisible,
     };
   },
 });

src/views/examine/CourseReviewed.vue

@@ -15,34 +15,33 @@
           <div class="inpbox">
             <div class="inpbox1">
               <a-select
-                v-model:value="valueproj"
+                  v-model:value="valueproj"
-                placeholder="请选择内容分类"
+                  value-key="value"
-                @change="handleChangeproj"
+                  :options="[{label:'请选择内容分类',value:''},...calssifyList]"
-                :options="optionsproj"
               />
             </div>
             <div class="inpbox1">
               <a-input
-                v-model:value="valuecreater"
+                  v-model:value="valuecreater"
-                style="
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入创建人"
+                  placeholder="请输入创建人"
               />
             </div>
             <div class="inpbox1">
               <a-input
-                v-model:value="valuename"
+                  v-model:value="valuename"
-                style="
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入名称"
+                  placeholder="请输入名称"
               />
             </div>
           </div>
@@ -61,26 +60,26 @@
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
           <a-table
-            :columns="columns1"
+              :columns="columns1"
-            :data-source="tableData1"
+              :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+              :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
+              expandRowByClick="true"
-            @expand="expandTable"
+              @expand="expandTable"
-            :scroll="{ x: 1300 }"
+              :scroll="{ x: 1300 }"
-            :pagination="false"
+              :pagination="false"
           />
         </div>
         <div class="tableBox">
           <div class="pa">
             <a-pagination
-              v-if="total > 10"
+                v-if="total > 10"
-              showSizeChanger="true"
+                showSizeChanger="true"
-              show-quick-jumper
+                show-quick-jumper
-              :pageSize="pageSize"
+                :pageSize="pageSize"
-              v-model:current="currentPage"
+                v-model:current="currentPage"
-              :total="total"
+                :total="total"
-              class="pagination"
+                class="pagination"
-              @change="changePagination"
+                @change="changePagination"
             />
           </div>
         </div>
@@ -89,23 +88,16 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import {reactive, toRefs, onMounted} from "vue";
-import { courseListView } from "../../api/indexAudit";
+import {courseListView} from "../../api/indexAudit";
+import * as api1 from "@/api/index1";
+
 export default {
   name: "CoursereViewed",
 
   setup() {
     const state = reactive({
-      optionsproj: [
+      calssifyList: [], //分类字典
-        {
-          value: "0",
-          label: "Jack",
-        },
-        {
-          value: "1",
-          label: "rose",
-        },
-      ],
       valueproj: "",
       valuecreater: "",
       valuename: "",
@@ -136,6 +128,7 @@ export default {
           dataIndex: "content",
           key: "content",
           align: "center",
+          customRender: ({text}) => state.calssifyList.find(e => e.value == text)?.label,
         },
         {
           title: "审核状态",
@@ -187,26 +180,27 @@ export default {
     const getList = () => {
       let objn = {
         auditStatus: 0,
-        // categoryId: 0,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
         pageSize: 10,
       };
       courseListView(objn)
-        .then((res) => {
+          .then((res) => {
-          console.log("获取已审核课程成功", res.data.data);
+            console.log("获取已审核课程成功", res.data.data);
-          let result = res.data.data.rows;
+            state.total = res.data.data.total;
-          state.total = res.data.data.total;
+            setTableData(res.data.data.rows);
-          if (res.data.data.total > 0) {
+          })
-            setTableData(result);
+          .catch((err) => {
-          }
+            console.log("获取已审核课程失败", err);
-        })
+          });
-        .catch((err) => {
-          console.log("获取已审核课程失败", err);
-        });
     };
     const setTableData = (table) => {
+      if(!table || !table.length){
+        state.tableData1 = []
+        return
+      }
       let data = table;
       let array = [];
       data.map((item) => {
@@ -216,15 +210,15 @@ export default {
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
           status:
-            item.auditStatus == 0
+              item.auditStatus == 0
-              ? "未提交"
+                  ? "未提交"
-              : item.auditStatus == 1
+                  : item.auditStatus == 1
-              ? "提交待审核"
+                      ? "提交待审核"
-              : item.auditStatus == 2
+                      : item.auditStatus == 2
-              ? "通过"
+                          ? "通过"
-              : item.auditStatus == -1
+                          : item.auditStatus == -1
-              ? "拒绝"
+                              ? "拒绝"
-              : "-",
+                              : "-",
           creater: item.createName,
           time: "-",
           msg: item.description || "-",
@@ -234,27 +228,30 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      (state.valueproj = null),
+      (state.valueproj = ''),
-        (state.valuecreater = null),
+          (state.valuecreater = null),
-        (state.valuename = null),
+          (state.valuename = null),
-        getList();
+          getList();
-    };
-    const handleChangeproj = (value, item) => {
-      console.log(value, item);
-      state.valueproj = item.value;
     };
     const changePagination = (pagina) => {
       state.currentPage = pagina;
       getList();
     };
-    onMounted(() => {
+    const getDictList = (param) => api1.getDict({
+      pageNo: 1,
+      pageSize: 20,
+      setCode: param
+    }).then((res) => res.data.data.rows)
+
+    onMounted(async () => {
       getList();
+      //获取分类列表
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode}))
     });
     return {
       ...toRefs(state),
       getList,
       setTableData,
-      handleChangeproj,
       reset,
       changePagination,
     };
@@ -264,8 +261,10 @@ export default {
 <style lang="scss">
 .coursereviewed {
   width: 100%;
+
   .tmpl {
     width: 100%;
+
     .tmpl_header {
       display: flex;
       flex-wrap: wrap;
@@ -274,33 +273,39 @@ export default {
 
       margin-left: 32px;
       margin-right: 32px;
+
       .tmplh_inp {
         .inpbox {
           display: flex;
           margin-top: 32px;
           flex-wrap: wrap;
+
           .inpbox1 {
             display: flex;
             justify-content: center;
             align-items: center;
             margin-right: 24px;
             margin-top: 10px;
+
             .ant-select-selector {
               border-radius: 8px;
               width: 270px;
               height: 40px;
               padding-top: 5px;
             }
+
             span {
               white-space: nowrap;
             }
           }
         }
       }
+
       .tmplh_btn {
         display: flex;
         // margin-left: 38px;
         margin-top: 42px;
+
         .btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -311,72 +316,90 @@ export default {
           margin-right: 14px;
           cursor: pointer;
           flex-shrink: 0;
+
           .search {
             background-size: 100%;
           }
+
           .btnText {
             font-size: 14px;
             font-weight: 400;
             line-height: 36px;
             margin-left: 5px;
           }
+
           .btnText1 {
             color: rgb(255, 255, 255);
           }
+
           .btnText2 {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn1 {
           background: #409eff;
+
           .search {
             width: 15px;
             height: 17px;
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
+
         .btn2 {
           background: #ffffff;
           border: 1px solid #388be1;
+
           .search {
             width: 16px;
             height: 18px;
             background-image: url("../../assets/images/courseManage/reset1.png");
           }
         }
+
         .btn1:hover {
           background: rgb(255, 255, 255);
           border: 1px solid #388be1;
+
           .search {
             background-image: url("../../assets/images/courseManage/search1.png");
           }
+
           .btnText {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn2:hover {
           background: rgba(64, 158, 255, 1);
+
           .search {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
+
           .btnText {
             color: #ffffff;
           }
         }
       }
     }
+
     .tmpl_body {
       padding: 0px 30px;
+
       .tmpl_tabbox {
         .operation {
           display: flex;
           justify-content: center;
           align-items: center;
           color: #4ea6ff;
+
           .nselect {
             justify-content: center;
             align-items: center;
             display: flex;
+
             .jc {
               margin-left: 20px;
               white-space: nowrap;
@@ -385,6 +408,7 @@ export default {
           }
         }
       }
+
       .pa {
         width: 100%;
         margin-top: 20px;

src/views/examine/ProjectReviewed.vue

@@ -57,14 +57,14 @@
                 @change="rankTimeChange"
               />
             </div>
-            <div class="inpbox1">
+<!--            <div class="inpbox1">-->
-              <a-select
+<!--              <a-select-->
-                v-model:value="valuestate"
+<!--                v-model:value="valuestate"-->
-                placeholder="请选择审核状态"
+<!--                placeholder="请选择审核状态"-->
-                @change="handleChangeproj"
+<!--                @change="handleChangeproj"-->
-                :options="optionsproj"
+<!--                :options="optionsproj"-->
-              />
+<!--              />-->
-            </div>
+<!--            </div>-->
           </div>
         </div>
         <div class="tmplh_btn">
@@ -193,8 +193,8 @@ export default {
 
         {
           title: "所属项目",
-          dataIndex: "belong",
+          dataIndex: "sourceBelongName",
-          key: "belong",
+          key: "sourceBelongName",
           align: "center",
           width: "10%",
         },
@@ -317,6 +317,7 @@ export default {
           name: item.name,
           belong: "",
           manager: item.manager || "-",
+          sourceBelongName: item.sourceBelongName,
           status:
             item.status == 0
               ? "草稿"
@@ -337,6 +338,7 @@ export default {
           number: item.projectId,
           name: item.name,
           belong: "",
+          sourceBelongName: item.sourceBelongName,
           manager: item.manager || "-",
           status:
             item.status == 0

src/views/examine/ProjectReviewedN.vue

@@ -104,6 +104,7 @@
       v-model:chooseProject="chooseProject"
       v-model:chooseCreateId="chooseCreateId"
       v-model:chooseCreater="chooseCreater"
+      v-model:finishdFun="getProjList"
     />
   </div>
 </template>
@@ -154,8 +155,8 @@ export default {
 
         {
           title: "所属项目",
-          dataIndex: "belong",
+          dataIndex: "sourceBelongName",
-          key: "belong",
+          key: "sourceBelongName",
           align: "center",
           width: "11%",
         },
@@ -250,6 +251,7 @@ export default {
           number: item.projectId,
           name: item.name,
           belong: item.parentId,
+          sourceBelongName: item.sourceBelongName,
           manager: item.manager || "-",
           status:
             item.status == 0
@@ -277,6 +279,7 @@ export default {
           number: item.projectId,
           name: item.name,
           belong: item.parentId,
+          sourceBelongName: item.sourceBelongName,
           manager: item.manager || "-",
           status:
             item.status == 0

src/views/projectcenter/ProjectManage.vue

@@ -576,7 +576,7 @@
     <!-- 编辑多层项目弹窗 - end -->
     <!-- 创建多层子项目弹窗 -->
     <div>
-      <a-modal
+      <a-modalbe
         v-model:visible="doublesonpro"
         :title="null"
         @ok="closeModal3"
@@ -705,7 +705,7 @@
             >
           </div>
         </div>
-      </a-modal>
+      </a-modalbe>
     </div>
     <!-- 创建多层子项目弹窗 -->
     <!-- 编辑多层子项目弹窗 start-->