md

src/modules/base/api.js

@@ -364,8 +364,14 @@ export const printPlanSyncExamList = () => {
   return $post("/api/admin/exam/print_sync/list_relate_ids", {});
 };
 // new
+export const printPlanSyncStmms = datas => {
+  return $post("/api/admin/basic/stmms_exam/sync", datas);
+};
+export const printPlanSyncRelateExamList = datas => {
+  return $postParam("/api/admin/basic/stmms_exam/list", datas);
+};
 export const printPlanCourseRelateList = datas => {
-  return $post("/api/admin/exam/print_sync/list_relate_ids", datas);
+  return $postParam("/api/admin/exam/print_sync/list_sync_exam_task", datas);
 };
 // sms-manage
 export const smsListQuery = datas => {

src/modules/base/components/PrintPlanBatchPushDialog.vue

@@ -29,13 +29,13 @@
         </el-form-item>
         <el-form-item label="题卡：">
           <el-select
-            v-model.trim="filter.cartType"
-            placeholder="开课学院"
+            v-model.trim="filter.cardType"
+            placeholder="题卡类型"
             clearable
             filterable
           >
             <el-option
-              v-for="item in cartTypes"
+              v-for="item in cardTypes"
               :key="item.code"
               :value="item.code"
               :label="item.name"
@@ -66,33 +66,33 @@
           width="55"
           align="center"
         ></el-table-column>
+        <el-table-column prop="name" label="课程名称（代码）" min-width="140">
+          <span slot-scope="scope"
+            >{{ scope.row.courseName }}（{{ scope.row.courseCode }}）</span
+          >
+        </el-table-column>
         <el-table-column
-          prop="name"
-          label="课程名称（代码）"
-          min-width="140"
-        ></el-table-column>
-        <el-table-column
-          prop="createName"
+          prop="sequence"
           label="序号"
           width="80"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="paperNumber"
           label="试卷编号"
           min-width="100"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="paperType"
           label="卷型"
           width="100"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="syncCardType"
           label="题卡类型"
           width="120"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="totalSubjects"
           label="科次"
           width="100"
         ></el-table-column>
@@ -132,7 +132,7 @@
             >
             </el-option>
           </el-select>
-          <el-button type="primary" @click="toRefresh">刷新</el-button>
+          <el-button type="primary" @click="getExams">刷新</el-button>
         </el-form-item>
         <el-form-item prop="thirdRelateName" v-if="examType === 'create'">
           <el-input
@@ -161,7 +161,11 @@
 </template>
 
 <script>
-import { printPlanMergePush, printPlanCourseRelateList } from "../api";
+import {
+  printPlanSyncStmms,
+  printPlanCourseRelateList,
+  printPlanSyncRelateExamList
+} from "../api";
 
 const initModalForm = {
   thirdRelateId: "",
@@ -186,7 +190,7 @@ export default {
       isSubmit: false,
       filter: {
         collegeId: "",
-        cartType: "",
+        cardType: "",
         courseName: ""
       },
       dataList: [],
@@ -197,7 +201,7 @@ export default {
         { code: "list", name: "选择云阅卷存在考试" }
       ],
       examType: "list",
-      cartTypes: [
+      cardTypes: [
         { code: null, name: "全部题卡" },
         { code: "GENERIC", name: "通用题卡" },
         { code: "CUSTOM", name: "电子题卡" }
@@ -238,7 +242,7 @@ export default {
     initData() {
       this.filter = {
         collegeId: "",
-        cartType: "",
+        cardType: "",
         courseName: ""
       };
       this.modalForm = { ...initModalForm };
@@ -249,11 +253,16 @@ export default {
     },
     visibleChange() {
       this.initData(this.instance);
-      // this.search();
+      this.search();
+      this.getExams();
+    },
+    async getExams() {
+      const data = await printPlanSyncRelateExamList();
+      this.thirdRelateExams = data || [];
     },
     async search() {
       const data = await printPlanCourseRelateList({
-        planIds: this.ids,
+        printPlanIds: this.ids,
         ...this.filter
       });
       this.dataList = data || [];
@@ -272,14 +281,13 @@ export default {
         this.$refs.modalFormComp.clearValidate();
       });
     },
-    async toRefresh() {},
     async confirm() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});
       if (!valid) return;
 
       if (this.loading) return;
       this.loading = true;
-      const data = await printPlanMergePush({
+      const data = await printPlanSyncStmms({
         ...this.modalForm,
         planIds: this.ids
       }).catch(() => {});

src/modules/base/components/RuleExam.vue

@@ -133,6 +133,7 @@ export default {
       if (!data) return;
 
       this.modalForm.id = data;
+      this.examRule.id = data;
 
       this.$message.success("保存成功！");
     }

src/modules/base/views/PrintPlanPushManage.vue

@@ -62,22 +62,22 @@
           min-width="180"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="totalSubjects"
           label="课程数"
           width="100"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="syncSuccessCount"
           label="推送成功课程数"
           width="140"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="syncFailCount"
           label="推送失败课程数"
           width="140"
         ></el-table-column>
         <el-table-column
-          prop="createName"
+          prop="syncInitCount"
           label="未推送课程数"
           width="140"
         ></el-table-column>
@@ -89,7 +89,7 @@
         <el-table-column
           class-name="action-column"
           label="操作"
-          width="100"
+          width="80"
           fixed="right"
         >
           <template slot-scope="scope">