Merge remote-tracking branch 'origin/master'

# Conflicts:
#	danger-manage-web/src/views/educationPlanExam/questionBank/index.vue

danger-manage-admin/src/main/resources/application-dev.yml

@@ -73,13 +73,13 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 36.138.181.113
+      host: 127.0.0.1
       # 端口，默认为6379
-      port: 6379
+      port: 6378
       # 数据库索引
       database: 1
       # 密码
-      password: 1qaz2wsx3edc
+      password: Redis@2021
       # 连接超时时间
       timeout: 10s
       lettuce:

danger-manage-admin/src/main/resources/application-test.yml

@@ -73,13 +73,13 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 36.138.181.113
+      host: 127.0.0.1
       # 端口，默认为6379
-      port: 6379
+      port: 6378
       # 数据库索引
       database: 0
       # 密码
-      password: 1qaz2wsx3edc
+      password: Redis@2021
       # 连接超时时间
       timeout: 10s
       lettuce:

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java

@@ -205,7 +205,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
         }
         //新增考试人员
         List<JSONObject> personList = JSONObject.parseArray(course.getTestPersons(),JSONObject.class);
-        List<String> persons = personList.stream().map(item ->(String)item.get("peoPleId")).collect(Collectors.toList());
+        List<String> persons = personList.stream().map(item ->String.valueOf(item.get("peoPleId"))).collect(Collectors.toList());
         tTrainCourseMapper.insertUserCourse(tTrainCourse.getCourseId(),persons,tTrainCourse.getPersonnelType());
         tTrainCourse.setStatus(1);
         tTrainCourse.setReleaseTime(new Date());

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseTopicServiceImpl.java

 package com.zehong.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.StringUtils;
 import com.zehong.system.domain.TBankSubject;
@@ -144,6 +143,7 @@ public class TTrainCourseTopicServiceImpl implements ITTrainCourseTopicService
             return 0;
         }
         List<TTrainCourseTopic> topics = new ArrayList<>();
+        int count = 0;
         for(BatchTopicVo.TopicInfos topic : batchTopicVo.getTopicInfos()){
             //获取题库试题
             TBankSubject tBankSubject = new TBankSubject();
@@ -160,8 +160,13 @@ public class TTrainCourseTopicServiceImpl implements ITTrainCourseTopicService
                 courseTopic.setCreateTime(new Date());
                 topics.add(courseTopic);
             }
+            count += topic.getQuan();
         }
         //批量新增试题
-        return tTrainCourseTopicMapper.batchInsertTTrainCourseTopic(topics);
+        tTrainCourseTopicMapper.batchInsertTTrainCourseTopic(topics);
+        //更新试题数量
+        TTrainCourse course = tTrainCourseMapper.selectTTrainCourseById(batchTopicVo.getCourseId());
+        course.setTopicNum(course.getTopicNum() + count);
+        return tTrainCourseMapper.updateTTrainCourse(course);
     }
 }

danger-manage-system/src/main/resources/mapper/system/TTrainPlanMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insetsPlanPost">
         INSERT INTO t_train_plan_post(plan_id,post_id) VALUES
         <foreach collection="list" separator="," item="item">
-            (#{planId},#{item.staffId})
+            (#{planId},#{item.peoPleId})
         </foreach>
 
     </insert>

danger-manage-web/src/api/educationPlanExam/lessonsProgram.js

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-23 11:02:24
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-28 11:37:33
+ * @LastEditTime: 2022-12-28 09:57:47
  * @FilePath: /danger-manage-web/src/api/educationPlanExam/trainingProgram.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -71,7 +71,7 @@ export function deleteLesson(query) {
 export function testPublish(data) {
   return request({
     url: '/system/course/testPublish',
-    method: 'put',
+    method: 'post',
     data:data
   })
 }
@@ -165,7 +165,7 @@ export function testPersonDetailByCourseId(query) {
  */
 export function bachAddTopic(data) {
   return request({
-    url: '/system/course/bachAddTopic',
+    url: 'system/topic/bachAddTopic',
     method: 'post',
     data: data
   })

danger-manage-web/src/components/PeopleChange/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-12-19 17:39:55
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-24 16:12:47
+ * @LastEditTime: 2022-12-26 09:36:52
  * @FilePath: /danger-manage-web/src/views/educationPlanExam/textPaper/components/ChangePapel.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -63,7 +63,7 @@
           <div class="close" @click="deleteName(item.staffId)">x</div>
         </div>
       </div>
-      <div class="bottom-text">已选择n人</div>
+      <div class="bottom-text">已选择{{selectNameList.length}}人</div>
     </div>
   </div>
 </template>

danger-manage-web/src/components/PeopleGuestChange/ChangPapelTable.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-12-19 15:23:58
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-24 16:51:34
+ * @LastEditTime: 2022-12-25 16:47:17
  * @FilePath: /danger-manage-web/src/views/educationPlanExam/textPaper/components/Lesson-table.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -17,19 +17,19 @@
       ref="multipleTable"
     >
       <el-table-column type="selection"></el-table-column>
-      <el-table-column label="负责人" align="center" prop="staffName">
+      <el-table-column label="负责人" align="center" prop="name">
       </el-table-column>
       <el-table-column
         label="手机号"
         align="center"
-        prop="deptName"
+        prop="phone"
         :formatter="formatter"
       >
       </el-table-column>
       <el-table-column
         label="所属单位"
         align="center"
-        prop="profession"
+        prop="contractorName"
         :formatter="formatter"
       >
       </el-table-column>
@@ -49,6 +49,7 @@
 
 <script>
 import { listStaff } from "@/api/safetyManagement/staff";
+import { listContractorPerson } from "@/api/contractor/contractorPerson";
 export default {
   name: "",
   props: {
@@ -64,8 +65,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        deptId: null,
-        staffName: null,
+        contractorId: null,
+        name: null,
       },
       total: 0,
       nameList: [],
@@ -75,12 +76,13 @@ export default {
   methods: {
     listStaff() {
       this.loading = true;
-      listStaff(this.queryParams).then((res) => {
+      listContractorPerson(this.queryParams).then((res) => {
+        console.log('res',res)
         this.total = res.total;
         this.nameList = res.rows;
         this.$nextTick((item) => {
           this.selectNameList.forEach((item) => {
-            this.toggleSelection(item.staffId, true);
+            this.toggleSelection(item.id, true);
           });
           this.loading = false;
         });
@@ -110,9 +112,9 @@ export default {
       this.$emit("selectAll", this.nameList, allSelect);
     },
     // 切换选项
-    toggleSelection(staffId, SeclctFlag = false) {
+    toggleSelection(id, SeclctFlag = false) {
       const item = this.nameList.find((item) => {
-        return item.staffId == staffId;
+        return item.id == id;
       });
       this.$refs.multipleTable.toggleRowSelection(item, SeclctFlag);
     },

danger-manage-web/src/components/PeopleGuestChange/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-12-19 17:39:55
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-24 16:12:56
+ * @LastEditTime: 2022-12-25 17:49:17
  * @FilePath: /danger-manage-web/src/views/educationPlanExam/textPaper/components/ChangePapel.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -12,7 +12,7 @@
     <div class="changePeople-left">
       <div class="top-search flex">
         <el-select
-          v-model="deptId"
+          v-model="id"
           filterable
           placeholder="请选择"
           size="mini"
@@ -21,14 +21,14 @@
         >
           <el-option
             v-for="item in searchList"
-            :key="item.deptId"
-            :label="item.deptName"
-            :value="item.deptId"
+            :key="item.id"
+            :label="item.contractorName"
+            :value="item.id"
           >
           </el-option>
         </el-select>
         <el-input
-          v-model="staffName"
+          v-model="name"
           size="mini"
           placeholder="请输入姓名"
           suffix-icon="el-icon-date"
@@ -57,10 +57,10 @@
         <div
           class="item flex"
           v-for="item in selectNameList"
-          :key="item.staffId"
+          :key="item.id"
         >
-          <div>{{ item.staffName }}</div>
-          <div class="close" @click="deleteName(item.staffId)">x</div>
+          <div>{{ item.name }}</div>
+          <div class="close" @click="deleteName(item.id)">x</div>
         </div>
       </div>
       <div class="bottom-text">已选择n人</div>
@@ -71,6 +71,7 @@
 <script>
 import ChangPapelTable from "./ChangPapelTable";
 import { listDept } from "@/api/system/dept";
+import { listAll } from "@/api/contractor/contractorInfo";
 
 export default {
   name: "PeopleGuestChange",
@@ -88,13 +89,15 @@ export default {
     return {
       selectNameList: [],
       searchList: [],
-      deptId: null,
-      staffName: null,
+      // 这个id是访客跟承包商的id。也叫id
+      id: null,
+      name: null,
     };
   },
   created() {
-    listDept().then((res) => {
+    listAll().then((res) => {
       console.log(res);
+      // return;
       this.searchList = res.data;
     });
   },
@@ -108,8 +111,8 @@ export default {
       if (Array.isArray(this.selectNameList)) {
         json = this.selectNameList.map((item) => {
           return {
-            peoPleId: item.staffId,
-            peoPleName: item.staffName,
+            peoPleId: item.id,
+            peoPleName: item.name,
           };
         });
       } else {
@@ -124,8 +127,8 @@ export default {
       if (jsonSelectNameList) {
         this.selectNameList = JSON.parse(jsonSelectNameList).map((item) => {
           return {
-            staffId: item.peoPleId,
-            staffName: item.peoPleName,
+            id: item.peoPleId,
+            name: item.peoPleName,
           };
         });
       } else {
@@ -137,25 +140,25 @@ export default {
       this.$refs.table.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        deptId: this.deptId,
-        staffName: this.staffName,
+        contractorId: this.id,
+        name: this.name,
       };
       this.$refs.table.listStaff();
     },
-    deleteName(staffId) {
+    deleteName(id) {
       const index = this.selectNameList.findIndex((item) => {
-        return item.staffId == staffId;
+        return item.id == id;
       });
       if (index >= 0) {
         console.log(index);
         this.selectNameList.splice(index, 1);
-        this.$refs.table.toggleSelection(staffId);
+        this.$refs.table.toggleSelection(id);
       }
     },
     addName(row) {
       const index = this.selectNameList.findIndex((item) => {
         // console.log(item.id)
-        return item.staffId == row.staffId;
+        return item.id == row.id;
       });
       console.log(index);
       if (index >= 0) {
@@ -170,7 +173,7 @@ export default {
       if (allSelect) {
         all.forEach((item) => {
           const index = this.selectNameList.findIndex((iten) => {
-            return iten.staffId == item.staffId;
+            return iten.id == item.id;
           });
           if (index < 0) {
             this.selectNameList.push(item);
@@ -178,7 +181,7 @@ export default {
         });
       } else {
         all.forEach((item) => {
-          this.deleteName(item.staffId);
+          this.deleteName(item.id);
         });
       }
     },

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

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:38:49
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-17 10:24:41
+ * @LastEditTime: 2022-12-26 09:54:47
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -145,6 +145,10 @@ export default {
     },
     // 隐藏与显示dialog
     dialogCancel() {
+      // 录入考题的时候不会有修改的缓存
+       if (this.topicId) {
+        this.topicId = null;
+      }
       this.$emit("update:visible", false);
     },
     // 把ID改变了

danger-manage-web/src/views/educationPlanExam/questionBank/components/AddQuestion.vue

@@ -123,7 +123,12 @@
 //   getQuestion,
 //   getLessonById,
 // } from "@/api/educationPlanExam/lessonsProgram.js";
-import { addSubject ,getSubject,listSubject,updateSubject} from "@/api/educationPlanExam/subject";
+import {
+  addSubject,
+  getSubject,
+  listSubject,
+  updateSubject,
+} from "@/api/educationPlanExam/subject";
 
 export default {
   name: "AnswerLesson",
@@ -158,7 +163,7 @@ export default {
     // 如果存在就是修改
     if (this.subjectId) {
       getSubject(this.subjectId).then((res) => {
-        console.log('?',res.data);
+        console.log("?", res.data);
         const data = res.data;
         this.form = {
           topicTitle: data.topicTitle,
@@ -176,12 +181,12 @@ export default {
   methods: {
     getQuestion() {
       listSubject({ bankId: this.bankId }).then((res) => {
-        console.log(res)
-         // 如果是修改 就是原来的值，如果不是，就是总数+1
+        console.log(res);
+        // 如果是修改 就是原来的值，如果不是，就是总数+1
         if (this.subjectId) {
           res.rows.forEach((item, index) => {
             if (item.subjectId == this.subjectId) {
-              this.questionNextNum = index+1;
+              this.questionNextNum = index + 1;
             }
           });
         } else {
@@ -243,7 +248,7 @@ export default {
                 // 把修改的这个归位，变成正常添加
                 this.$emit("update:subjectId", null);
                 this.$message({
-                  message: "添加题目成功",
+                  message: this.subjectId ? "添加题目成功" : "修改题目成功",
                   type: "success",
                 });
                 this.$parent.$parent.componentsNumChange(num);

danger-manage-web/src/views/educationPlanExam/questionBank/components/Dia.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:38:49
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-17 14:28:56
+ * @LastEditTime: 2022-12-26 09:55:56
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -145,6 +145,10 @@ export default {
     },
     // 隐藏与显示dialog
     dialogCancel() {
+      // 录入题目的时候不会有修改的缓存
+      if (this.subjectId) {
+        this.subjectId = null;
+      }
       this.$emit("update:visible", false);
     },
     // 把ID改变了

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

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 17:56:05
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-17 14:28:57
+ * @LastEditTime: 2022-12-27 16:03:40
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -17,15 +17,16 @@
       <div class="right">{{ courseName }}</div>
     </div>
     <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="info"
-            plain
-            icon="el-icon-upload2"
-            size="mini"
-            @click="handleImport"
-          >导入</el-button>
-        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          >导入</el-button
+        >
+      </el-col>
     </el-row>
 
     <div class="table flex" v-loading="loading">
@@ -89,13 +90,24 @@
     </div> -->
 
     <!-- 设备导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
       <el-upload
         ref="upload"
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport+ '&bankId=' + upload.bankId"
+        :action="
+          upload.url +
+          '?updateSupport=' +
+          upload.updateSupport +
+          '&bankId=' +
+          upload.bankId
+        "
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -108,17 +120,19 @@
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-<!--          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的设备数据-->
-<!--          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>-->
+          <!--          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的设备数据-->
+          <!--          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>-->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleDownload(upload)"
-          >下载模板</el-button>
-
+            >下载模板</el-button
+          >
+        </div>
+        <div class="el-upload__tip" style="color: red" slot="tip">
+          提示：仅允许导入“xls”或“xlsx”格式文件！
         </div>
-        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
@@ -160,7 +174,7 @@ export default {
       // 设备导入参数
       upload: {
         //题库id
-        bankId:0,
+        bankId: 0,
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
@@ -172,7 +186,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/subject/import"
+        url: process.env.VUE_APP_BASE_API + "/system/subject/import",
       },
       queryParams: {
         bankId:0
@@ -209,7 +223,7 @@ export default {
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.bankId=this.bankId;
+      this.upload.bankId = this.bankId;
       this.upload.title = "题目导入";
       this.upload.open = true;
     },
@@ -223,10 +237,12 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
       this.getQuestion({ bankId: this.bankId });
+      // this.getList();
+      this.$parent.$parent.$parent.getList();
     },
     /** 下载模板操作 */
     importTemplate() {
-      importTemplate().then(response => {
+      importTemplate().then((response) => {
         this.download(response.msg);
       });
     },

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

@@ -301,6 +301,7 @@ export default {
       this.loading = true;
       listBank(this.queryParams)
         .then((res) => {
+          console.log(res);
           this.bankList = res.rows.map((item, index) => {
             return {
               bankNum:

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

@@ -116,14 +116,13 @@
 </template>
 
 <script>
-// import {
-//   addQuestion,
-//   checkQuestion,
-//   changeQuestion,
-//   getQuestion,
-//   getLessonById,
-// } from "@/api/educationPlanExam/lessonsProgram.js";
-import { addSubject ,getSubject,listSubject,updateSubject} from "@/api/educationPlanExam/subject";
+import {
+  addQuestion,
+  checkQuestion,
+  changeQuestion,
+  getQuestion,
+  getLessonById,
+} from "@/api/educationPlanExam/lessonsProgram.js";
 
 export default {
   name: "AnswerLesson",
@@ -132,10 +131,10 @@ export default {
     //   type: Boolean,
     //   default: false,
     // },
-    bankId: {
+    courseId: {
       type: Number,
     },
-    subjectId: {
+    topicId: {
       type: Number,
     },
   },
@@ -156,9 +155,9 @@ export default {
 
   created() {
     // 如果存在就是修改
-    if (this.subjectId) {
-      getSubject(this.subjectId).then((res) => {
-        console.log('?',res.data);
+    if (this.topicId) {
+      checkQuestion(this.topicId).then((res) => {
+        console.log(res.data);
         const data = res.data;
         this.form = {
           topicTitle: data.topicTitle,
@@ -171,16 +170,16 @@ export default {
     // 查询是第几道题
     this.getQuestion();
     // 获取课程标题
-    // this.getLessonById(this.bankId);
+    this.getLessonById(this.courseId);
   },
   methods: {
     getQuestion() {
-      listSubject({ bankId: this.bankId }).then((res) => {
+      getQuestion({ courseId: this.courseId }).then((res) => {
+        // 如果是修改 就是原来的值，如果不是，就是总数+1
         console.log(res)
-         // 如果是修改 就是原来的值，如果不是，就是总数+1
-        if (this.subjectId) {
+        if (this.topicId) {
           res.rows.forEach((item, index) => {
-            if (item.subjectId == this.subjectId) {
+            if (item.topicId == this.topicId) {
               this.questionNextNum = index+1;
             }
           });
@@ -189,18 +188,18 @@ export default {
         }
       });
     },
-    // getLessonById(bankId) {
-    //   getLessonById(bankId).then((res) => {
-    //     console.log(res);
-    //     this.courseName = res.data.courseName;
-    //   });
-    // },
+    getLessonById(courseId) {
+      getLessonById(courseId).then((res) => {
+        console.log(res);
+        this.courseName = res.data.courseName;
+      });
+    },
     addQuestion(data) {
       // 如果是修改，就用修改的方法，如果是新增，就用新增的方法
-      if (this.subjectId) {
-        return updateSubject({ subjectId: this.subjectId, ...data });
+      if (this.topicId) {
+        return changeQuestion({ topicId: this.topicId, ...data });
       } else {
-        return addSubject({ bankId: this.bankId, ...data });
+        return addQuestion({ courseId: this.courseId, ...data });
       }
     },
     rightAnswerClick(index) {
@@ -241,7 +240,7 @@ export default {
             this.addQuestion(data).then((res) => {
               if (res.code == 200) {
                 // 把修改的这个归位，变成正常添加
-                this.$emit("update:subjectId", null);
+                this.$emit("update:topicId", null);
                 this.$message({
                   message: "添加题目成功",
                   type: "success",

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

+<!--
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2022-12-27 09:30:19
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2022-12-28 10:29:18
+ * @FilePath: /danger-manage-web/src/views/educationPlanExam/textPaper/components/ChangeQuestion.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="table-wrapper">
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="所属单位" prop="deptId" ref="treeItem">
+        <Treeselect
+          class="tree"
+          v-model="queryParams.deptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择归属部门"
+          style="width: 200px"
+        />
+      </el-form-item>
+      <el-form-item label="题库名称" prop="bankName">
+        <el-input
+          v-model="queryParams.bankName"
+          placeholder="考试时间"
+          clearable
+          size="small"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="search"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetClick"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="list" height="435" ref="multipleTable">
+      <!-- <el-table-column type="selection"></el-table-column> -->
+      <el-table-column label="" align="center" prop="profession">
+        <template v-slot="{ row }">
+          <!-- <div> -->
+          <el-checkbox
+            :disabled="row.numberQuestions == 0"
+            v-model="row.checked"
+          ></el-checkbox>
+          <!-- </div> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="题库名称" align="center" prop="bankName">
+      </el-table-column>
+      <el-table-column label="所属单位" align="center" prop="courseType">
+        <template v-slot="scope">
+          <div>
+            {{ selectList(deptOptions, scope.row.deptId) || "-" }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="包含题目数量"
+        align="center"
+        prop="numberQuestions"
+        :formatter="formatter"
+      >
+      </el-table-column>
+      <el-table-column label="选取题目数量" align="center" prop="profession">
+        <template v-slot="{ row }">
+          <div>
+            <!-- <el-input
+              :disabled="!row.checked|| row.numberQuestions==0 "
+              v-model="row.changeNum"
+              size="mini"
+              style="width: 100px"
+            ></el-input> -->
+            <el-input-number
+              v-model="row.changeNum"
+              :disabled="!row.checked || row.numberQuestions == 0"
+              size="mini"
+              :min="1"
+              :max="+row.numberQuestions ? +row.numberQuestions : 1000000"
+              label="描述文字"
+            ></el-input-number>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- <div> -->
+    <el-pagination
+      :layout="'prev, pager, next'"
+      v-show="total > 0"
+      :total="total"
+      :current-page="queryParams.pageNum"
+      :page-sizes="[queryParams.pageSize]"
+      @current-change="currentChangeClick"
+    />
+  </div>
+</template>
+
+<script>
+import { listBank, delBank } from "@/api/educationPlanExam/questionBank";
+import { bachAddTopic } from "@/api/educationPlanExam/lessonsProgram.js";
+
+// 部门列表
+
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "",
+  components: {
+    Treeselect,
+  },
+  props: {
+    courseId: {
+      type: Number,
+    },
+  },
+  data() {
+    return {
+      queryParams: {
+        deptId: null,
+        courseName: "",
+        pageNum: 1,
+        pageSize: 10,
+      },
+      list: [
+        {
+          checked: false,
+        },
+      ],
+      total: 20,
+      loading: false,
+      // 题库id
+      deptId: null,
+      // 归属部门列表
+      deptOptions: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    getTreeselect() {
+      treeselect().then((response) => {
+        this.deptOptions = response.data;
+        // console.log("123", this.deptOptions);
+        // console.log(this.selectList(this.deptOptions, 175));
+      });
+    },
+    // 递归查值的方法
+    selectList(list, id) {
+      for (let i = 0; i < list.length; i++) {
+        let item = list[i];
+        if (item.id == id) {
+          return item.label;
+        } else {
+          if (Array.isArray(item.children)) {
+            let a = this.selectList(item.children, id);
+            if (a) {
+              return a;
+            }
+          }
+        }
+      }
+    },
+    getList() {
+      this.loading = true;
+      listBank(this.queryParams)
+        .then((res) => {
+          console.log(res);
+          this.list = res.rows.map((item, index) => {
+            return {
+              bankNum:
+                index +
+                1 +
+                (this.queryParams.pageNum - 1) * this.queryParams.pageSize,
+              checked: false,
+              changeNum: 0,
+              ...item,
+            };
+          });
+          this.total = res.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    saveAndNext() {
+      const topicInfos = this.list
+        .filter((item) => item.checked)
+        .map((item) => {
+          return {
+            bankId: item.bankId,
+            quan: item.changeNum,
+          };
+        });
+
+      console.log(this.courseId, topicInfos);
+      const data = { courseId: this.courseId, topicInfos };
+      console.log(data);
+      bachAddTopic(data).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.$parent.$parent.componentsNumChange(2);
+          this.$parent.$parent.$parent.getList();
+        }
+      });
+    },
+    resetClick() {},
+    search() {
+      this.getList();
+    },
+    currentChangeClick() {},
+    formatter(row, column, cellValue, index) {
+      // console.log(row, column, cellValue, index);
+      if (!cellValue) return "-";
+      else return cellValue;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.table-wrapper {
+  padding-top: 22px;
+  width: 100%;
+  height: 550px;
+  overflow: hidden;
+  // padding-bottom: 10px;
+  margin-bottom: 20px;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:38:49
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-19 14:01:37
+ * @LastEditTime: 2022-12-28 10:31:06
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -22,8 +22,8 @@
       <transition name="fade" mode="out-in">
         <component
           :is="currentComponent"
-          :bankId.sync="bankId"
-          :subjectId.sync="subjectId"
+          :courseId.sync="courseId"
+          :topicId.sync="topicId"
           ref="current"
         ></component>
       </transition>
@@ -33,13 +33,25 @@
     </div>
 
     <div slot="footer" class="dialog-footer">
+      <el-button
+        type="primary"
+        v-if="this.componentsNum == 2"
+        @click="componentsNumChange(4)"
+        >从题库选择</el-button
+      >
+
       <el-button
         type="primary"
         v-if="this.componentsNum == 1 || this.componentsNum == 3"
         @click="save"
         >保存</el-button
       >
-
+      <el-button
+        type="primary"
+        v-if="this.componentsNum == 4"
+        @click="componentsNumChange(2)"
+        >返回题目列表</el-button
+      >
       <el-button type="primary" @click="saveAndNext">{{
         saveNextText
       }}</el-button>
@@ -58,6 +70,7 @@
 import Lesson from "./Lesson";
 import AddQuestion from "./AddQuestion";
 import QuestionList from "./QuestionList";
+import ChangeQuestion from "./ChangeQuestion";
 
 export default {
   name: "AnswerLesson",
@@ -70,7 +83,7 @@ export default {
       type: Number,
       default: 1,
     },
-    bankId: {
+    courseId: {
       type: Number,
     },
   },
@@ -85,7 +98,7 @@ export default {
       title: "录入课程",
       currentComponent: Lesson,
       // 当前题目查看
-      subjectId: null,
+      topicId: null,
     };
   },
   watch: {
@@ -93,7 +106,7 @@ export default {
       handler(num) {
         if (num === 1) {
           this.currentComponent = Lesson;
-          if (this.bankId) {
+          if (this.courseId) {
             this.title = "修改课程";
           } else {
             this.title = "新增课程";
@@ -102,13 +115,16 @@ export default {
           this.currentComponent = QuestionList;
 
           this.title = "题目列表";
-        } else {
+        } else if (num === 3) {
           this.currentComponent = AddQuestion;
-          if (this.subjectId) {
+          if (this.topicId) {
             this.title = "修改题目";
           } else {
             this.title = "新增题目";
           }
+        } else if (num == 4) {
+          this.currentComponent = ChangeQuestion;
+          this.title = "从题库选题";
         }
       },
       deep: true,
@@ -121,8 +137,10 @@ export default {
         text = "保存并录入题目";
       } else if (this.componentsNum == 2) {
         text = "录入考题";
-      } else {
+      } else if (this.componentsNum == 3) {
         text = "保存并录入下一题";
+      } else {
+        text = "确定选择";
       }
       return text;
     },
@@ -145,11 +163,15 @@ export default {
     },
     // 隐藏与显示dialog
     dialogCancel() {
+      // 录入考题的时候不会有修改的缓存
+      if (this.topicId) {
+        this.topicId = null;
+      }
       this.$emit("update:visible", false);
     },
     // 把ID改变了
-    changeCourseId(bankId) {
-      this.$emit("update:bankId", bankId);
+    changeCourseId(courseId) {
+      this.$emit("update:courseId", courseId);
     },
     // 改变当前组件
     componentsNumChange(num) {

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

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 17:56:05
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-17 14:28:57
+ * @LastEditTime: 2022-12-26 16:55:10
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -10,9 +10,9 @@
   <div ref="myBody" class="add-question flex">
     <div class="text flex">
       <div class="left">
-        目前有<span>{{ questionNum || 0 }}</span
+        目前有<span>{{ questionNum }}</span
         >道题
-        <!-- <span class="warn">温馨提示：发布课程前需要进行考试设置</span> -->
+        <span class="warn">温馨提示：发布课程前需要进行考试设置</span>
       </div>
       <div class="right">{{ courseName }}</div>
     </div>
@@ -25,7 +25,7 @@
       <div class="td-wrapper">
         <div
           v-for="(item, index) in questionList"
-          :key="item.subjectId"
+          :key="item.topicId"
           class="td flex"
         >
           <div class="left">{{ index + 1 }}</div>
@@ -35,13 +35,13 @@
           <div class="right">
             <div>
               <el-button
-                @click="edit(item.subjectId)"
+                @click="edit(item.topicId)"
                 icon="el-icon-edit"
                 type="text"
                 >修改</el-button
               >
               <el-button
-                @click="deleteLesson(item.subjectId)"
+                @click="deleteLesson(item.topicId)"
                 icon="el-icon-delete"
                 type="text"
                 >删除</el-button
@@ -51,9 +51,8 @@
         </div>
       </div>
     </div>
-    <!-- <div class="rightNum flex">
-
-       <div class="left">录入考题</div>
+    <div class="rightNum flex">
+      <div class="left">考试设置</div>
       <div class="middle flex">
         <div class="left-text">答对题目大于</div>
         <div>
@@ -73,8 +72,8 @@
           type="success"
           >保存</el-button
         >
-      </div> 
-    </div> -->
+      </div>
+    </div>
   </div>
 </template>
 
@@ -85,13 +84,10 @@ import {
   changeLesson,
   getLessonById,
 } from "@/api/educationPlanExam/lessonsProgram";
-import { listSubject, delSubject } from "@/api/educationPlanExam/subject";
-import { getBank } from "@/api/educationPlanExam/questionBank";
-
 export default {
   name: "AnswerLesson",
   props: {
-    bankId: {
+    courseId: {
       type: Number,
     },
   },
@@ -118,11 +114,11 @@ export default {
   // },
 
   created() {
-    console.log("this.bankId", this.bankId);
-    if (this.bankId) {
-      this.getQuestion({ bankId: this.bankId });
+    console.log("this.courseId", this.courseId);
+    if (this.courseId) {
+      this.getQuestion({ courseId: this.courseId });
       // 获取只题目正确几题算过关
-      this.getLessonById(this.bankId);
+      this.getLessonById(this.courseId);
     }
   },
   methods: {
@@ -132,14 +128,13 @@ export default {
     saveAndNext() {
       this.$parent.$parent.componentsNumChange(3);
     },
-    getQuestion(bankId) {
-      console.log(bankId);
-      return listSubject(bankId).then((res) => {
-        console.log("题库res", res);
+    getQuestion(courseId) {
+      return getQuestion(courseId).then((res) => {
+        console.log(res);
 
         this.questionList = res.rows.map((item) => {
           return {
-            subjectId: item.subjectId,
+            topicId: item.topicId,
             topicTitle: item.topicTitle,
           };
         });
@@ -147,18 +142,18 @@ export default {
         return true;
       });
     },
-    getLessonById(bankId) {
-      getBank(bankId).then((res) => {
-        // console.log(res);
-        // this.rightNum = res.data.qualifiedNum;
-        this.courseName = res.data.bankName;
+    getLessonById(courseId) {
+      getLessonById(courseId).then((res) => {
+        console.log(res);
+        this.rightNum = res.data.qualifiedNum;
+        this.courseName = res.data.courseName;
       });
     },
-    edit(subjectId) {
-      this.$emit("update:subjectId", subjectId);
+    edit(topicId) {
+      this.$emit("update:topicId", topicId);
       this.$parent.$parent.componentsNumChange(3);
     },
-    deleteLesson(subjectId) {
+    deleteLesson(topicId) {
       this.$confirm("请确定删除该题", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -166,7 +161,7 @@ export default {
       })
         .then(() => {
           this.loading = true;
-          return delSubject(subjectId);
+          return deleteQuestion(topicId);
         })
         .then((res) => {
           if (res.code == 200) {
@@ -175,7 +170,7 @@ export default {
               type: "success",
             });
           }
-          return this.getQuestion({ bankId: this.bankId });
+          return this.getQuestion({ courseId: this.courseId });
         })
         .finally(() => {
           this.loading = false;
@@ -192,7 +187,7 @@ export default {
         return;
       }
       changeLesson({
-        bankId: this.bankId,
+        courseId: this.courseId,
         qualifiedNum: this.rightNum,
       }).then((res) => {
         if (res.code == 200) {
@@ -200,6 +195,7 @@ export default {
             message: "答题合格数修改成功",
             type: "success",
           });
+          this.$parent.$parent.$parent.getList();
         }
       });
     },

danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Dia.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:38:49
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-19 14:01:37
+ * @LastEditTime: 2022-12-28 15:01:59
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -24,6 +24,7 @@
           :is="currentComponent"
           :bankId.sync="bankId"
           :subjectId.sync="subjectId"
+          :jsonData="jsonData"
           ref="current"
         ></component>
       </transition>
@@ -73,6 +74,9 @@ export default {
     bankId: {
       type: Number,
     },
+    jsonData:{
+      type:Array,
+    }
   },
   // components: {
   //   Lesson,

danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Item.vue

@@ -42,7 +42,7 @@
       <div class="right flex">
         <template v-if="!isActive">
           <div>
-            <el-button type="text" @click="edit">编辑</el-button>
+            <el-button type="text" @click="edit(personnelOptions)">编辑</el-button>
             <el-button type="text" @click="deletePlan">删除</el-button>
           </div>
         </template>
@@ -95,10 +95,10 @@ export default {
     };
   },
   methods: {
-    edit() {
+    edit(personnelOptions) {
       // 编辑
-      //console.log(this.infoData);
-      this.$parent.addClick(this.infoData);
+      console.log(personnelOptions);
+      this.$parent.addClick(this.infoData,personnelOptions);
       //this.$emit("edit", this.oldInfoData);
     },
     save() {

danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Lesson.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:59:44
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-21 17:30:33
+ * @LastEditTime: 2022-12-28 15:06:07
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/Lession.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -25,30 +25,31 @@
               v-for="item in options"
               :key="item.value"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <!--<el-form-item label="开始时间" prop="releaseTime">-->
-          <!--<el-date-picker-->
-            <!--v-model="form.startTime"-->
-            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
-            <!--type="datetime"-->
-            <!--placeholder="开始时间"-->
-            <!--default-time="12:00:00"-->
-          <!--&gt;-->
-          <!--</el-date-picker>-->
-        <!--</el-form-item>-->
-      </div>
-      <!--<el-form-item label="结束时间" prop="releaseTime">-->
         <!--<el-date-picker-->
-          <!--v-model="form.endTime"-->
-          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
-          <!--type="datetime"-->
-          <!--placeholder="结束时间"-->
-          <!--default-time="12:00:00"-->
+        <!--v-model="form.startTime"-->
+        <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+        <!--type="datetime"-->
+        <!--placeholder="开始时间"-->
+        <!--default-time="12:00:00"-->
         <!--&gt;-->
         <!--</el-date-picker>-->
+        <!--</el-form-item>-->
+      </div>
+      <!--<el-form-item label="结束时间" prop="releaseTime">-->
+      <!--<el-date-picker-->
+      <!--v-model="form.endTime"-->
+      <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--type="datetime"-->
+      <!--placeholder="结束时间"-->
+      <!--default-time="12:00:00"-->
+      <!--&gt;-->
+      <!--</el-date-picker>-->
       <!--</el-form-item>-->
 
       <el-form-item label="选择人员" prop="releaseTime">
@@ -90,7 +91,7 @@ import {
   addPlan,
   editPlan,
   getPlanList,
-  getPlan
+  getPlan,
 } from "@/api/educationPlanExam/trainingProgram";
 export default {
   name: "",
@@ -98,6 +99,9 @@ export default {
     bankId: {
       type: Number,
     },
+    jsonData: {
+      tyoe: Array,
+    },
     // jsonSelectNameList: {
     //   type: String,
     //   default:
@@ -109,13 +113,16 @@ export default {
   },
   data() {
     return {
-      options: [{
-        value: 1,
-        label: '内部员工'
-      }, {
-        value: 2,
-        label: '承包商培训'
-      }],
+      options: [
+        {
+          value: 1,
+          label: "内部员工",
+        },
+        {
+          value: 2,
+          label: "承包商培训",
+        },
+      ],
       form: {
         bankName: "",
         // courseType: "",
@@ -123,13 +130,13 @@ export default {
         // video: "",
         // enclosure: "",
         deptId: null,
-        personnelType:1,
+        personnelType: 1,
         abc: 0,
       },
       // 参考人员
       jsonSelectNameList: null,
 
-      peopleList:[],
+      peopleList: [],
       // 归属部门列表
       deptOptions: [],
 
@@ -162,7 +169,7 @@ export default {
   mounted() {
     // this.jsonSelectNameList
 
-      // '[{"staffId":880,"staffName":"孙卓亚"},{"staffId":871,"staffName":"张玉宾"},{"staffId":869,"staffName":"李二朝"},{"staffId":870,"staffName":"盖永峰"},{"staffId":868,"staffName":"刘丽艳"},{"staffId":867,"staffName":"霍文俊"},{"staffId":866,"staffName":"刘志坚"},{"staffId":865,"staffName":"郝文权"},{"staffId":864,"staffName":"齐雪军"},{"staffId":852,"staffName":"刘江平"},{"staffId":853,"staffName":"谷建海"},{"staffId":851,"staffName":"丁振国"},{"staffId":850,"staffName":"齐江波"},{"staffId":849,"staffName":"周立新"},{"staffId":848,"staffName":"史志波"},{"staffId":847,"staffName":"王增波"},{"staffId":846,"staffName":"杨彦龙"},{"staffId":845,"staffName":"杨华国"},{"staffId":844,"staffName":"王青华"}]';
+    // '[{"staffId":880,"staffName":"孙卓亚"},{"staffId":871,"staffName":"张玉宾"},{"staffId":869,"staffName":"李二朝"},{"staffId":870,"staffName":"盖永峰"},{"staffId":868,"staffName":"刘丽艳"},{"staffId":867,"staffName":"霍文俊"},{"staffId":866,"staffName":"刘志坚"},{"staffId":865,"staffName":"郝文权"},{"staffId":864,"staffName":"齐雪军"},{"staffId":852,"staffName":"刘江平"},{"staffId":853,"staffName":"谷建海"},{"staffId":851,"staffName":"丁振国"},{"staffId":850,"staffName":"齐江波"},{"staffId":849,"staffName":"周立新"},{"staffId":848,"staffName":"史志波"},{"staffId":847,"staffName":"王增波"},{"staffId":846,"staffName":"杨彦龙"},{"staffId":845,"staffName":"杨华国"},{"staffId":844,"staffName":"王青华"}]';
     this.$refs.changePaple.changeNameList(this.jsonSelectNameList);
   },
   methods: {
@@ -184,8 +191,12 @@ export default {
           this.form = {
             bankName: res.data.planName,
             deptId: res.data.planId,
-            personnelType: res.data.personnelType
+            personnelType: res.data.personnelType,
           };
+          // 人名复现
+          this.jsonSelectNameList = JSON.stringify(this.jsonData);
+          this.$refs.changePaple.changeNameList(this.jsonSelectNameList);
+
           //   const data = res.data;
           //   const { bankName, courseType, courseConent, video, enclosure } =
           //     data;
@@ -216,36 +227,34 @@ export default {
       console.log("参考人员", list);
       this.peopleList = list;
     },
-    savePlan(){
+    savePlan() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if(this.peopleList.length<3){
-            this.$message.error('请至少选择一个考试人员');
-            return
+          if (this.peopleList.length < 3) {
+            this.$message.error("请至少选择一个考试人员");
+            return;
           }
-        //console.log(this.peopleList);
+          //console.log(this.peopleList);
           this.form.peopleList = this.peopleList.toString();
           this.form.planName = this.form.bankName;
-          console.log(this.form)
-          if(this.bankId!=null){
-              this.form.planId = this.bankId;
+          console.log(this.form);
+          if (this.bankId != null) {
+            this.form.planId = this.bankId;
 
             return editPlan(this.form).then((res) => {
               if (res.code == 200) {
-              this.$parent.$parent.$parent.getPlanList();
-            }
-          });
-          }else {
+                this.$parent.$parent.$parent.getPlanList();
+              }
+            });
+          } else {
             return addPlan(this.form).then((res) => {
-                if (res.code == 200) {
+              if (res.code == 200) {
                 this.$parent.$parent.$parent.getPlanList();
               }
             });
           }
-
-
         }
-    });
+      });
     },
     save(num = 2) {
       // 因为富文本编辑器会残留<p><br></p>，所以要清空

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

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-16 17:07:30
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-28 17:46:09
+ * @LastEditTime: 2022-12-28 15:04:15
  * @FilePath: /danger-manage-web/src/views/trainingProgram/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -70,6 +70,7 @@
       :componentsNum.sync="componentsNum"
       :bankId.sync="bankId"
       :visible.sync="dilogFlag"
+      :jsonData='jsonData'
     />
   </div>
 </template>
@@ -102,6 +103,8 @@ export default {
   data() {
     return {
       personnelOptions,
+      // 选人复显示
+      jsonData:null,
       isActiveId: 999,
       list: [],
       // 当点击编辑的时候，会记录最初始的
@@ -228,7 +231,7 @@ export default {
       this.isActiveId = 999;
     },
     changeList() {},
-    addClick(form) {
+    addClick(form,json) {
 
     this.$refs.Dia.title = "新增培训计划";
     this.componentsNum = 2;
@@ -238,6 +241,13 @@ export default {
       //console.log("=======")
       this.$refs.Dia.title = "修改培训计划";
       this.bankId  = form.planId;
+      this.jsonData = json.map(item=>{
+        return {
+          peoPleId:item.postId,
+          peoPleName:item.postName,
+        }
+      })
+
     }
       //this.addOpen = true;
     },

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

+<template>
+    <div class="form-wrapper">
+        <div style="width: 100%;height:100%;">
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+                <el-form-item label="培训名称" prop="name">
+                  <el-input v-model="ruleForm.name"></el-input>
+                </el-form-item>
+                <el-form-item label="培训内容" prop="region">
+                    <el-input type="textarea" v-model="ruleForm.region" rows="5"></el-input>
+                  </el-form-item>
+            </el-form>
+        </div>
+        <el-form>  
+          <div class="flex">
+            <el-form-item label="视频上传" v-if="!readOnly" prop="video">
+              <FileUpload
+                listType="picture"
+                @resFun="getFileInfoVideo"
+                @remove="listRemoveVideo"
+                :fileArr="fileListVideo"
+                :fileSize="500"
+                :fileType="['mp4']"
+              />
+              <el-input v-show="false" disabled v-model="form.video"></el-input>
+            </el-form-item>
+            <el-form-item label="附件上传" v-if="!readOnly" prop="enclosure">
+              <FileUpload
+                listType="picture"
+                @resFun="getFileInfoFile"
+                @remove="listRemoveFile"
+                :fileArr="fileListFile"
+              />
+              <el-input v-show="false" disabled v-model="form.enclosure"></el-input>
+            </el-form-item>
+          </div> 
+        </el-form>  
+        <visitorQuestion></visitorQuestion>
+    </div>
+</template>
+<script>
+  
+import FileUpload from "@/components/FileUpload";
+import uploadfile from "@/assets/uploadfile.png";
+import visitorQuestion from "@/views/educationPlanExam/visitorProgram/visitorQuestion";
+// import visitorDia from "@/views/educationPlanExam/visitorProgram/visitorDia";
+    export default {
+      data() {
+        return {
+          ruleForm: {
+            name: '',
+            region: '',
+          },
+          form: {
+            video: "",
+            enclosure: "",
+          },
+          fileListVideo: [],
+          fileListFile: [],
+          readOnly: false,
+          rules: {
+            name: [
+              { required: true, message: '请输入培训名称', trigger: 'blur' }
+            ],
+            region: [
+              { required: true, message: '请输入培训内容', trigger: 'change' }
+            ],
+            video: [
+              { required: true, trigger: "blue", message: "视频不能为空" }
+            ],
+            enclosure: [
+              { required: true, trigger: "blur", message: "附件不能为空" },
+            ],
+          }
+        };
+      },
+      components: {
+        FileUpload,
+        visitorQuestion,
+      },
+      created() {
+        if (this.courseId) {
+          this.getLessonById();
+        }
+      },
+      methods: {
+        submitForm(formName) {
+          this.$refs[formName].validate((valid) => {
+            if (valid) {
+              alert('submit!');
+            } else {
+              console.log('error submit!!');
+              return false;
+            }
+          });
+        },
+       
+        getFileInfoVideo(res) {
+          this.form.video = res.url;
+          // this.form.videoName = res.fileName;
+          this.fileListVideo = [
+            {
+              name: res.fileName,
+              url: uploadfile,
+            },
+          ];
+        },
+        listRemoveVideo(e) {
+          this.fileListVideo = [];
+          this.form.video = "";
+          // this.form.videoName = null;
+        },
+        getFileInfoFile(res) {
+          this.form.enclosure = res.url;
+          // this.form.enclosureName = res.fileName;
+          this.fileListFile = [
+            {
+              name: res.fileName,
+              url: uploadfile,
+            },
+          ];
+        },
+        listRemoveFile(e) {
+          this.fileListFild = [];
+          this.form.enclosure = "";
+          // this.form.fileName = null;
+        },
+      }
+    }
+  </script>
+<style lang="scss" scoped>
+.form-wrapper {
+  padding-top: 30px;
+  width: 80%;
+  height: 100%;
+  margin-bottom: 20px;
+}
+.flex{
+  width: 100%;
+  justify-content: space-around;
+  padding: 20px 30px;
+}
+</style>
\ No newline at end of file

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

+<!--
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2022-09-22 17:56:05
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2022-09-28 17:54:16
+ * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+    <div ref="myBody" class="add-question flex">
+      <div style="color: #1890ff;">题目管理</div>
+      <div class="text flex">
+        <div class="left">
+          <el-button type="primary"  plain @click="dialogVisible = true">{{
+            saveNextText
+          }}</el-button>
+          目前有<span></span>道题
+          <span class="warn">温馨提示：发布课程前需要进行考试设置</span>
+        </div>
+        <!-- <div class="right">{{courseName}}</div> -->
+      </div>
+      <div class="table flex">
+        <div class="th flex">
+          <div class="left">序号</div>
+          <div class="middle">题目名称</div>
+          <div class="right">操作</div>
+        </div>
+      </div>
+      <div class="d3">
+        <div class="rightNum flex">
+          <div class="left">考试设置</div>
+          <div class="middle flex">
+            <div class="left-text">答对题目大于</div>
+            <div>
+              <el-input
+                v-model="rightNum"
+                style="width: 60px"
+                size="mini"
+              ></el-input>
+            </div>
+            <div>为合格</div>
+          </div>
+          <div class="right">
+            <el-button
+              @click="saveRightNum"
+              icon="el-icon-check"
+              size="mini"
+              type="success"
+              >保存</el-button
+            >
+          </div>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            type="primary"
+            >{{ "确认" }}</el-button
+          >
+          <el-button>取消</el-button>
+        </div>
+      </div>
+      
+      <el-dialog
+        title="录入题目"
+        :visible.sync="dialogVisible"
+        >
+        <visitorAdd></visitorAdd>
+        <span slot="footer" class="dialog-footer">
+          <!-- <el-button>保存</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button> -->
+          <div slot="footer" class="dialog-footer">
+            <el-button
+              type="primary"
+              @click="save"
+              >保存</el-button
+            >
+      
+            <el-button type="primary" @click="saveAndNext">{{
+              saveNextText
+            }}</el-button>
+            <el-button
+              v-if="this.componentsNum == 2"
+              type="primary"
+              >{{ "确认" }}</el-button
+            >
+            <el-button  @click="dialogVisible = false">取消</el-button>
+          </div>
+        </span>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+    import visitorAdd from "@/views/educationPlanExam/visitorProgram/visitorAdd";
+  export default {
+    name: "AnswerLesson",
+    props: {
+      courseId: {
+        type: Number,
+      },
+      visible: {
+        type: Boolean,
+        default: false,
+      },
+      componentsNum: {
+        type: Number,
+        default: 1,
+      },
+    },
+    components: {
+      visitorAdd,
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        rightNum: 0,
+      };
+    },
+    
+    computed: {
+      saveNextText() {
+        let text;
+        if (this.componentsNum == 1) {
+          text = "保存并录入题目";
+        } else if (this.componentsNum == 2) {
+          text = "录入考题";
+        } else {
+          text = "保存并录入下一题";
+        }
+        return text;
+      },
+    },
+    created() {
+      console.log("this.courseId", this.courseId);
+    },
+    methods: {
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      save() {
+        // this.answerClear();
+        this.$refs.current.save();
+      },
+      saveRightNum() {
+
+      },
+      saveAndNext() {
+        this.$refs.current.saveAndNext();
+      },
+    },
+  };
+  </script>
+  <style lang="scss" scoped>
+  .add-question {
+    width: 100%;
+    height: 550px;
+    // overflow: hidden;
+    flex-direction: column;
+    padding-bottom: 7px;
+    margin-bottom: 20px;
+    border-bottom: 1px solid #bbbbbb00;
+  
+    .text {
+      margin-top: 13px;
+      margin-bottom: 32px;
+      justify-content: space-between;
+      height: 28px;
+      .left {
+        line-height: 28px;
+        color: #101010;
+        font-size: 14px;
+        .warn {
+          display: inline-flex;
+          font-size: 12px;
+          color: red;
+          margin-left: 10px;
+        }
+      }
+  
+      .right {
+        width: 411px;
+        line-height: 28px;
+        background: #1d84ff;
+        padding-right: 5px;
+        color: #fff;
+        text-align: right;
+      }
+    }
+    .table {
+      flex: 1;
+      height: 0;
+  
+      flex-direction: column;
+      .th {
+        width: 100%;
+        height: 70px;
+        line-height: 70px;
+        background: #f5f5f5;
+        color: #606266;
+  
+        > div {
+          height: 100%;
+        }
+        .left {
+          width: 15%;
+          text-align: center;
+        }
+        .middle {
+          width: 60%;
+          padding-left: 100px;
+        }
+        .right {
+          width: 25%;
+          text-align: center;
+        }
+      }
+      .td-wrapper {
+        flex: 1;
+        overflow-y: auto;
+        // 这样子元素才能有滚动条
+        .td {
+          height: 68px;
+          line-height: 68px;
+          box-sizing: border-box;
+          border-bottom: 1px solid #bbbbbb;
+          &:last-child {
+            border-bottom: none;
+          }
+          > div {
+            height: 100%;
+          }
+          .left {
+            width: 15%;
+            text-align: center;
+          }
+          .middle {
+            width: 60%;
+            padding-left: 10px;
+          }
+          .right {
+            width: 25%;
+            text-align: center;
+          }
+        }
+      }
+    }
+    .d3{
+      display: flex;
+      justify-content: right;
+    }
+    .dialog-footer{
+      margin-top: 15px;
+    }
+    .rightNum {
+      margin-top: 5px;
+      width: 50%;
+      height: 55px;
+      box-sizing: border-box;
+      border: 1px solid #bbbbbb;
+      line-height: 55px; 
+      margin-right: 20px;
+      > .left {
+        width: 140px;
+        background: #0bab0c;
+        font-size: 14px;
+        color: #fff;
+        text-align: center;
+      }
+      > .middle {
+        > div {
+          margin-right: 5px;
+        }
+        .left-text {
+          margin-left: 10px;
+        }
+        .middle {
+          margin-right: 20px;
+        }
+      }
+      .right {
+        margin-left: 20px;
+      }
+      // background: black;
+    }
+  }
+  </style>
+  
\ No newline at end of file