feat:修改新建面授课

2025-12-06 17:36:44 +08:00 · 2023-02-24 10:36:14 +08:00
parent 56d5d1c7f4
commit 945a552868
4 changed files with 34 additions and 27 deletions
--- a/src/components/project/OrgClassCheck.vue
+++ b/src/components/project/OrgClassCheck.vue
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2023-02-23 14:57:21
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-23 20:42:25
+ * @LastEditTime: 2023-02-24 09:58:42
 * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -88,7 +88,7 @@ function onLoadData(treeNode) {
 }

 function change(e) {
-  // console.log("label", e, emit);
+  console.log("label", e, emit);
  // let label = [];
  // let value = [];
  // for (let i = 0; i < e.length; i++) {
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1089,7 +1089,7 @@
              </div>
            </div>
          </div>
-          <div class="cstm_items main_item">
+          <div class="cstm_items main_item" style="margin-bottom: 0px">
            <div class="signbox"></div>
            <div class="btnbox">
              <add-test v-model:info="examInfo">
@@ -1131,7 +1131,7 @@
              </a-checkbox>
            </div>
          </div> -->
-          <div class="cstm_items items_fj" style="height: 80px">
+          <div class="cstm_items items_fj">
            <div class="signbox">
              <span style="margin-right: 3px"></span>
            </div>
@@ -2579,7 +2579,7 @@ export default defineComponent({
      ft_1: false,
      om_ckxq: false,
      stm_hs: false,
-      cstm_hs: true,
+      cstm_hs: false,
      sm_hs: false,
      QR_hs: false,
      closableQR: false,
@@ -3130,7 +3130,7 @@ export default defineComponent({
          findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
      });
      state.tableData1 = datas;
-      console.log("state.tableData1", state.tableData1);
+      console.log("面授课列表", state.tableData1);
      state.tableLoading = false;
    };

@@ -3829,8 +3829,8 @@ export default defineComponent({
        teacher: state.member.name,
        workInfo: state.workInfo, //提交的作业信息
        examInfo: state.examInfo, //提交的考试信息
-        beforeValue: state.beforeValue, //考勤 开始前
-        afterStartValue: state.afterStartValue, //考勤 开始后
+        beforeStart: state.beforeValue, //考勤 开始前
+        afterStart: state.afterStartValue, //考勤 开始后
      };
      console.log(postData);
      const checkList = [
@@ -3899,6 +3899,8 @@ export default defineComponent({
      state.EditTestId = Number(item.testId);
      state.EditWorkId = String(item.homeWorkId);
      state.xjkkinputV1 = item.name;
+      state.beforeValue = item.beforeStart; //考勤 开始前
+      state.afterStartValue = item.afterStart; //考勤 开始后
      if (item.signFlag === 1) {
        //是否允许未报名的签到:1是0否
        state.xjkkradioV1 = 0;
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -812,6 +812,7 @@ export default defineComponent({

    //保存面授课
    const handlePush = async (param) => {
+      console.log("param", param);
      console.log(
        "组织、岗位、Band、资源归属选择",
        state.orgSelect,
@@ -827,15 +828,18 @@ export default defineComponent({
      }
      files = files.slice(0, files.length - 1);

-      let orgSelect = [];
+      let orgSelectIds = [];
+      let orgSelectNames = [];
      if (state.orgSelect && state.orgSelect.length) {
        state.orgSelect.forEach((item) => {
-          orgSelect.push({
-            label: item.label,
-            value: item.value,
-          });
+          orgSelectIds += item.value + ",";
+        });
+        state.orgSelect.forEach((item) => {
+          orgSelectNames += item.label + ",";
        });
      }
+      orgSelectIds = orgSelectIds.slice(0, orgSelectIds.length - 1);
+      orgSelectNames = orgSelectNames.slice(0, orgSelectNames.length - 1);

      let selectJobId = "";
      if (state.selectJobId.length) {
@@ -882,7 +886,9 @@ export default defineComponent({
        intro: state.qdms_inputV6,
        attach: state.attach,
        outline: valueHtml.value,
-        organizationIds: orgSelect,
+        // organizationIds: orgSelect,
+        organizationIds: orgSelectIds,
+        organization_names: orgSelectNames,
        jobTypeIds: selectJobId,
        bandIds: selectBandId,
        sourceBelongId: state.sourceBelongId,
@@ -900,17 +906,16 @@ export default defineComponent({
        postData.sourceBelongId,
      ];
      console.log("checkList", checkList);
-      if (
-        !postData.organizationIds &&
-        !postData.jobTypeIds &&
-        !postData.bandIds
-      ) {
-        message.destroy();
-        return message.error("请输入必填项");
-      } else {
-        state.addLoading = true;
-      }
+
      if (!checkVal(checkList)) {
+        if (
+          !postData.organizationIds &&
+          !postData.jobTypeIds &&
+          !postData.bandIds
+        ) {
+          message.destroy();
+          return message.error("请输入必填项");
+        }
        message.destroy();
        return message.error("请输入必填项");
      } else {
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-21 14:32:52
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:38:38
+ * @LastEditTime: 2023-02-24 09:03:55
 * @FilePath: /fe-manage/vue.config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
@@ -15,8 +15,8 @@ module.exports = defineConfig({
        port: 8070,
        proxy: {
            "/manageApi": {
-                // target: 'http:' + process.env.VUE_APP_PROXY_URL,
-                target: 'http://localhost:30001',
+                target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                // target: 'http://localhost:30001',
                changeOrigin: true, //表示是否改变原域名
                pathRewrite: {
                    "^/manageApi": "",