优化考试试卷管理与培训管理的发布格式，简化发布流程。更改发布限制。

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/QuestionList.vue

@@ -33,7 +33,7 @@
         >分
       </div>
       <div class="detail-item">
-        判断提<span>{{ bottomFrom.judgmentScore }}</span
+        判断题<span>{{ bottomFrom.judgmentScore }}</span
         >/题,共<span>{{ pds }}</span> 题，计<span class="textC">{{
           pds * bottomFrom.judgmentScore
         }}</span

danger-manage-web/src/views/educationPlanExam/lessonsProgram/index.vue

@@ -145,7 +145,9 @@
         align="center"
         class-name="small-padding fixed-width"
       >
-        <template v-slot="{ row: { status, courseId } }">
+        <template
+          v-slot="{ row: { courseName, courseType, status, courseId } }"
+        >
           <!-- <div>{{status}}</div> -->
           <el-button
             v-if="status == 0"
@@ -175,7 +177,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="issueDilog(courseId)"
+            @click="issueDilog(courseId, courseName, courseType)"
             >发布</el-button
           >
         </template>
@@ -196,7 +198,18 @@
       :checkLock.sync="checkLock"
       :visible.sync="dilogFlag"
     />
-    <el-dialog title="发布详情" :visible.sync="issueVisible" width="60%">
+    <el-dialog
+      class="lessons-program"
+      title="发布详情"
+      :visible.sync="issueVisible"
+      width="60%"
+    >
+      <span class="dialogName"
+        >培训名称: <span class="a">{{ dilogName }}</span>
+      </span>
+      <span class="dialogName"
+        >培训计划: <span class="a">{{ dilogType }}</span></span
+      >
       <div class="detail flex">
         <div class="detail-item">
           单选题<span>{{ bottomFrom.singleChoiceScore }}</span
@@ -213,20 +226,19 @@
           }}</span
           >分
         </div>
+
         <div class="detail-item">
-          判断提<span>{{ bottomFrom.judgmentScore }}</span
+          判断题<span>{{ bottomFrom.judgmentScore }}</span
           >/题,共<span>{{ pds }}</span> 题，计<span class="textC">{{
             pds * bottomFrom.judgmentScore
           }}</span
           >分
         </div>
-        <div class="detail-item">
-          合格分数为<span class="textC">{{ bottomFrom.qualifiedNum }}</span
-          >分
       </div>
 
+      <div class="detail">
         <div class="detail-item">
-          一共<span>{{ danxs + duoxs + pds }}</span
+          共<span>{{ danxs + duoxs + pds }}</span
           >道题，总共计<span class="textC">{{
             danxs * bottomFrom.singleChoiceScore +
             duoxs * bottomFrom.multipleChoiceScore +
@@ -235,6 +247,12 @@
           >分
         </div>
       </div>
+      <div class="detail">
+        <div class="detail-item">
+          合格分数为<span class="textC">{{ bottomFrom.qualifiedNum }}</span
+          >分
+        </div>
+      </div>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="issueVisible = false">取 消</el-button>
@@ -289,6 +307,8 @@ export default {
       dilogFlag: false,
       // 发布弹框
       issueVisible: false,
+      dilogName: "",
+      dilogType: null,
       bottomFrom: {
         singleChoiceScore: 0,
         multipleChoiceScore: 0,
@@ -426,8 +446,8 @@ export default {
         .catch(() => {});
     },
     // 发布弹框
-    issueDilog(courseId) {
-      getQuestion({courseId})
+    issueDilog(courseId, name, type) {
+      getQuestion({ courseId })
         .then((res) => {
           this.questionList = res.rows.map((item) => {
             return {
@@ -449,6 +469,12 @@ export default {
           };
         })
         .then((res) => {
+          this.dilogName = name;
+          this.dilogType =
+            type &&
+            this.courseOptions.filter((item) => item.planId == type)[0] &&
+            this.courseOptions.filter((item) => item.planId == type)[0]
+              .planName;
           this.issueVisible = true;
           this.issueCourseId = courseId;
         });
@@ -457,15 +483,16 @@ export default {
     },
     // 发布
     issueLesson(courseId) {
-      this.$confirm("确定要发布吗", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          // 判断是否录入答题合格数
-          return getLessonById(courseId);
-        })
+      // this.$confirm("确定要发布吗", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then(() => {
+      //     // 判断是否录入答题合格数
+      //     return getLessonById(courseId);
+      //   })
+      getLessonById(courseId)
         .then((res) => {
           // if (
           //   res.data.singleChoiceScore >= 0 &&
@@ -594,10 +621,19 @@ export default {
 ::v-deep .el-dialog {
   margin-top: 10vh !important;
 }
+::v-deep .el-dialog .el-dialog__body {
+  padding-top: 5px;
+}
+.dialogName {
+  margin-right: 50px;
+  color: #000;
+  font-size: 16px;
+}
 .detail {
   // position: absolute;
   // bottom: -20px;
   // left: 10px;
+  margin-top: 20px;
   .textC {
     font-weight: 800;
     font-size: 18px;

danger-manage-web/src/views/educationPlanExam/myLessons/CheckLesson/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-20 20:14:18
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2023-01-05 09:38:13
+ * @LastEditTime: 2023-02-03 15:59:38
  * @FilePath: /danger-manage-web/src/views/myLessons/CheckLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -92,7 +92,8 @@
       </div>
 
       <div class="btn-wrapper flex">
-        <el-button v-if="this.finish" @click="againQuesstion" type="primary">{{
+        <!-- topicNum>0代表有考试题，没考试题不需要考试 -->
+        <el-button v-if="this.finish &&lessonData.topicNum>0 " @click="againQuesstion" type="primary">{{
           state == 2 || state == 1 ? "重新考试" : "开始考试"
         }}</el-button>
         <el-button @click="$router.back()" type="primary" plain>取消</el-button>

danger-manage-web/src/views/educationPlanExam/textPaper/components/QuestionList.vue

@@ -34,7 +34,7 @@
         >分
       </div>
       <div class="detail-item">
-        判断提<span>{{ bottomFrom.judgmentScore }}</span
+        判断题<span>{{ bottomFrom.judgmentScore }}</span
         >/题,共<span>{{ pds }}</span> 题，计<span class="textC">{{
           pds * bottomFrom.judgmentScore
         }}</span

danger-manage-web/src/views/educationPlanExam/textPaper/index.vue

@@ -63,7 +63,7 @@
 
     <el-table v-loading="loading" :data="lessonsList">
       <el-table-column label="序号" align="center" prop="bankNum" width="55" />
-      <el-table-column label="课程标题" align="center" prop="courseName" />
+      <el-table-column label="考试名称" align="center" prop="courseName" />
       <el-table-column
         label="开始时间"
         align="center"
@@ -102,7 +102,11 @@
         align="center"
         class-name="small-padding fixed-width"
       >
-        <template v-slot="{ row: { status, courseId, qualifiedNum } }">
+        <template
+          v-slot="{
+            row: { courseName, topicNum, status, courseId, qualifiedNum },
+          }"
+        >
           <!-- <div>{{status}}</div> -->
           <!-- <el-button
             v-if="status == 0"
@@ -140,7 +144,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="issueDilog(courseId)"
+            @click="issueDilog(courseId, courseName, topicNum)"
             >发布</el-button
           >
         </template>
@@ -161,7 +165,18 @@
       :checkLock.sync="checkLock"
       :visible.sync="dilogFlag"
     />
-    <el-dialog title="发布详情" :visible.sync="issueVisible" width="60%">
+    <el-dialog
+      class="lessons-program"
+      title="发布详情"
+      :visible.sync="issueVisible"
+      width="60%"
+    >
+      <span class="dialogName"
+        >考试名称: <span class="a">{{ dilogName }}</span>
+      </span>
+      <!-- <span class="dialogName"
+        >培训计划: <span class="a">{{ dilogType }}</span></span
+      > -->
       <div class="detail flex">
         <div class="detail-item">
           单选题<span>{{ bottomFrom.singleChoiceScore }}</span
@@ -178,20 +193,19 @@
           }}</span
           >分
         </div>
+
         <div class="detail-item">
-          判断提<span>{{ bottomFrom.judgmentScore }}</span
+          判断题<span>{{ bottomFrom.judgmentScore }}</span
           >/题,共<span>{{ pds }}</span> 题，计<span class="textC">{{
             pds * bottomFrom.judgmentScore
           }}</span
           >分
         </div>
-        <div class="detail-item">
-          合格分数为<span class="textC">{{ bottomFrom.qualifiedNum }}</span
-          >分
       </div>
 
+      <div class="detail">
         <div class="detail-item">
-          一共<span>{{ danxs + duoxs + pds }}</span
+          共<span>{{ danxs + duoxs + pds }}</span
           >道题，总共计<span class="textC">{{
             danxs * bottomFrom.singleChoiceScore +
             duoxs * bottomFrom.multipleChoiceScore +
@@ -200,6 +214,12 @@
           >分
         </div>
       </div>
+      <div class="detail">
+        <div class="detail-item">
+          合格分数为<span class="textC">{{ bottomFrom.qualifiedNum }}</span
+          >分
+        </div>
+      </div>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="issueVisible = false">取 消</el-button>
@@ -255,6 +275,9 @@ export default {
       dilogFlag: false,
       // 发布
       issueVisible: false,
+      dilogName: "",
+      dilogTopicNum: 0,
+      // dilogType: null,
       bottomFrom: {
         singleChoiceScore: 0,
         multipleChoiceScore: 0,
@@ -404,12 +427,18 @@ export default {
         .catch(() => {});
     },
     // 发布
-    issueDilog(courseId) {
-      getQuestion({courseId})
+    issueDilog(courseId, name, num) {
+      if (num === 0) {
+        this.$message({
+          message: "请至少录入一道考题在发布",
+          type: "warning",
+        });
+        return;
+      }
+      getQuestion({ courseId })
         .then((res) => {
-          console.log(res)
+          console.log(res);
           this.questionList = res.rows.map((item) => {
-
             return {
               topicType: item.topicType,
               topicId: item.topicId,
@@ -422,13 +451,15 @@ export default {
         })
         .then((res) => {
           this.bottomFrom = {
-            singleChoiceScore: res.data.singleChoiceScore ||0,
-            multipleChoiceScore: res.data.multipleChoiceScore||0,
-            judgmentScore: res.data.judgmentScore||0,
-            qualifiedNum: res.data.qualifiedNum||0,
+            singleChoiceScore: res.data.singleChoiceScore || 0,
+            multipleChoiceScore: res.data.multipleChoiceScore || 0,
+            judgmentScore: res.data.judgmentScore || 0,
+            qualifiedNum: res.data.qualifiedNum || 0,
           };
         })
         .then((res) => {
+          // 名称
+          this.dilogName = name;
           this.issueVisible = true;
           this.issueCourseId = courseId;
         });
@@ -436,15 +467,17 @@ export default {
       //
     },
     issueLesson(courseId) {
-      this.$confirm("确定要发布吗", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          // 判断是否录入答题合格数
-          return getLessonById(courseId);
-        })
+      // this.$confirm("确定要发布吗", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then(() => {
+      //     // 判断是否录入答题合格数
+      //     return getLessonById(courseId);
+      //   })
+
+      getLessonById(courseId)
         .then((res) => {
           // if (
           //   res.data.singleChoiceScore > 0 &&
@@ -502,10 +535,19 @@ export default {
 ::v-deep .el-dialog {
   margin-top: 10vh !important;
 }
+::v-deep .el-dialog .el-dialog__body {
+  padding-top: 5px;
+}
+.dialogName {
+  margin-right: 50px;
+  color: #000;
+  font-size: 16px;
+}
 .detail {
   // position: absolute;
   // bottom: -20px;
   // left: 10px;
+  margin-top: 20px;
   .textC {
     font-weight: 800;
     font-size: 18px;

danger-manage-web/src/views/educationPlanExam/visitorProgram/visitorQuestion.vue

@@ -40,7 +40,7 @@
         >分
       </div>
       <div class="detail-item">
-        判断提<span>{{ bottomFrom.judgmentScore }}</span
+        判断题<span>{{ bottomFrom.judgmentScore }}</span
         >/题,共<span>{{ pds }}</span> 题，计<span class="textC">{{
           pds * bottomFrom.judgmentScore
         }}</span