ソースを参照

对接自动组卷接口、完善相关工种信息的展示逻辑、参数传递

yellowtaotao 4 年 前
コミット
9679abaca1

+ 19 - 0
src/filters/index.js

@@ -361,3 +361,22 @@ export function formateExamStatesFun(startTime, endTime) {
     examStatusTxt,
   };
 }
+
+/**
+ * 过滤工种的id为文字
+ * @param {*} list : 工种列表
+ * @param {*} id :工种id
+ */
+export function formateEngineeringWork(list, id) {
+  if (!list || !id) {
+    return { name: '不限', id: '' }
+  }
+  let item = null
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].id === id) {
+      item = list[i]
+      break
+    }
+  }
+  return item
+}

+ 12 - 23
src/views/answerManagement/answerManagementSpecial.vue

@@ -207,7 +207,11 @@
 </template>
 
 <script>
-import { formatePathParams, formateUrlParams } from '@/filters';
+import {
+  formatePathParams,
+  formateUrlParams,
+  formateEngineeringWork,
+} from '@/filters';
 import { mapGetters } from 'vuex';
 import {
   ANSWER_MANAGEMENT_RULE_TYPE,
@@ -393,14 +397,11 @@ export default {
           let findCondition = this.formatQuestionTypeConditionChooseValue(
             this.typeConditionChildrenValue
           ); // 获取试题类型信息-子类
-          let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-            values.engineeringWorkChooseValue
-          ); // 获取工种信息
           this.engineeringWork = values.engineeringWorkChooseValue;
           this.specialName = values.name;
           let params = {
             name: values.name,
-            engineerTypes: [engineerTypeInfo], // 信息集合:工种
+            engineerTypes: [values.engineeringWorkChooseValue], // 信息集合:工种
             ruleType: ANSWER_MANAGEMENT_RULE_TYPE.CHALLENGE.ruleType,
             questionCategories: findCondition ? [findCondition] : [],
             totalQuestionNum:
@@ -434,18 +435,6 @@ export default {
       }
       return seleteItem;
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      let seleteItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 操作:详情
     toQuestionDetailFun(record) {
       console.log('查看某个试题的详情', record);
@@ -514,12 +503,12 @@ export default {
               }
             });
             // 工种
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypeTxt = item.engineerTypes[0].name;
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 8 - 7
src/views/articleManagement/articleList.vue

@@ -128,7 +128,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { formatePathParams } from '@/filters';
+import { formatePathParams, formateEngineeringWork } from '@/filters';
 export default {
   name: 'articleCreate',
   props: {},
@@ -231,12 +231,13 @@ export default {
                 item.engineeringWorkTxt = it.name;
               }
             });
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypeTxt = item.engineerTypes[0].name;
+            // 工种
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 49 - 55
src/views/examManagement/examAutomaticVolumeFormation.vue

@@ -267,7 +267,7 @@
           </div>
         </div>
         <!-- 清空、批量删除 -->
-        <div class="exam-question-edit-row a-card-margin-top">
+        <!-- <div class="exam-question-edit-row a-card-margin-top">
           <a-button
             type="primary"
             :disabled="!currentHasSelected"
@@ -286,7 +286,7 @@
             @click="deleteCurrentTableSelectDataFun"
             >批量删除</a-button
           >
-        </div>
+        </div> -->
         <!-- 表单 -->
         <a-table
           :columns="current_columns"
@@ -350,13 +350,14 @@
 </template>
 
 <script>
-import { EXAM_TYPE, EXAM_QUESTION_TYPE } from '@/common/Constant'; // EXAM_QUESTION_TYPE
+import { EXAM_TYPE, EXAM_QUESTION_TYPE } from '@/common/Constant';
 import {
   formateSeconds,
   formateUrlParams,
   formatePathParams,
   formateDateTimeToAfter,
   formatTimeHoursMinuteSecondsFun,
+  formateEngineeringWork,
 } from '@/filters';
 import { mapGetters } from 'vuex';
 const ExamTimeLong = {
@@ -491,7 +492,7 @@ export default {
       let totalGrades = 0;
       that.current_tableData.forEach((item) => {
         if (item.points) {
-          totalGrades = totalGrades + item.points;
+          totalGrades = totalGrades + Number(item.points);
         }
       });
       return totalGrades;
@@ -595,12 +596,12 @@ export default {
           // 考试时长
           let tarTime = formatTimeHoursMinuteSecondsFun(resData.duration);
           // 工种
-          if (
-            resData.engineerTypes &&
-            resData.engineerTypes[0] &&
-            resData.engineerTypes[0].id
-          ) {
-            resData.engineeringWork = resData.engineerTypes[0].id;
+          if (resData.engineerTypes) {
+            let findItem = formateEngineeringWork(
+              this.engineeringWorkList,
+              resData.engineerTypes[0]
+            );
+            resData.engineerTypeTxt = findItem.name;
           } else {
             resData.engineerTypeTxt = '不限';
           }
@@ -611,10 +612,8 @@ export default {
             examLongTimeHours: tarTime.hours || '', // 考试时长:小时
             examLongTimeMinutes: tarTime.minutes || '', // 考试时长:分钟
             description: resData.description || '', // 考试描述
-            examCategory:
-              resData.examCategory || this.engineeringWorkList[0].id, // 考试类型
-            engineeringWork:
-              resData.engineeringWork || this.examTypeList[0].code, // 工种类别
+            examCategory: resData.examCategory || this.examTypeList[0].code, // 考试类型
+            engineeringWork: resData.engineerTypeTxt, // 工种类别
           };
           console.log('基础数据', this.examDetailData);
           this.loading = false;
@@ -655,12 +654,14 @@ export default {
               }
             });
             // 工种
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypesTxt = item.engineerTypes[0].name;
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
+            } else {
+              item.engineerTypeTxt = '不限';
             }
           });
           this.current_tableData = resData;
@@ -842,9 +843,6 @@ export default {
       e.preventDefault();
       this.loginForm.validateFields((err, values) => {
         if (!err) {
-          let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-            values.engineeringWorkChooseValue
-          ); // 获取工种信息 typeConditionParentValue
           let urlParams = {
             engineertypeid: values.engineeringWorkChooseValue, // 工种
           };
@@ -862,9 +860,9 @@ export default {
               values.examTimeLong.minutes
             ).replace(' ', 'T'), // 结束日期
             tages: [],
-            engineerTypes: engineerTypeInfo ? [engineerTypeInfo] : [], // 信息集合:工种
+            engineerTypes: [values.engineeringWorkChooseValue], // 信息集合:工种
             examCategory: values.examTypeChooseValue, // 考试类别
-            totalpoints:
+            totalPoints:
               this.questionInfo.singleNum * this.questionInfo.singleGrade +
               this.questionInfo.multiNum * this.questionInfo.multiGrade +
               this.questionInfo.trueFalseNum *
@@ -879,21 +877,6 @@ export default {
         }
       });
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      if (!id) {
-        return null;
-      }
-      let seleteItem = null;
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 获取试题类型信息-子类
     formatQuestionTypeConditionChooseValue(id) {
       if (!id) {
@@ -918,8 +901,7 @@ export default {
           params
         )
         .then((res) => {
-          console.log(res);
-          this.examId = res.id;
+          this.examId = res.data.id;
           this.loading = false;
           this.httpQuestPreAssembledVolumeFun(urlParams.engineertypeid); // 表单提交请求:预组卷
         })
@@ -937,9 +919,7 @@ export default {
         this.checkedQuestionTypeConditionChildren
       ); // 获取试题类型信息-子类
       let params = {
-        questionCategories: JSON.stringify(
-          findCondition ? [findCondition] : []
-        ), // 所选试题类型信息-子类
+        questionCategories: findCondition ? [findCondition] : [], // 所选试题类型信息-子类
         totalQuestionNum:
           Number(this.questionInfo.singleNum) +
           Number(this.questionInfo.multiNum) +
@@ -961,26 +941,40 @@ export default {
           params
         )
         .then((res) => {
-          console.log(res.data);
           let resData = res.data;
           resData.forEach((item) => {
             switch (item.type) {
               case EXAM_QUESTION_TYPE[0].code:
-                item.points = this.questionInfo.singleGrade;
+                item.points = this.questionInfo.singleGrade; // 分值
+                item.typeTxt = EXAM_QUESTION_TYPE[0].name; // 题目类别
                 break;
               case EXAM_QUESTION_TYPE[1].code:
-                item.points = this.questionInfo.multiNum;
+                item.points = this.questionInfo.multiGrade; // 分值
+                item.typeTxt = EXAM_QUESTION_TYPE[1].name; // 题目类别
                 break;
               case EXAM_QUESTION_TYPE[2].code:
-                item.points = this.questionInfo.trueFalseNum;
+                item.points = this.questionInfo.trueFalseGrade; // 分值
+                item.typeTxt = EXAM_QUESTION_TYPE[2].name; // 题目类别
                 break;
               case EXAM_QUESTION_TYPE[3].code:
-                item.points = this.questionInfo.gapFillingNum;
+                item.points = this.questionInfo.gapFillingGrade; // 分值
+                item.typeTxt = EXAM_QUESTION_TYPE[3].name; // 题目类别
                 break;
               default:
-                item.points = '';
+                item.points = ''; // 分值
+                item.typeTxt = '不限'; // 题目类别
                 break;
             }
+            // 工种
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
+            } else {
+              item.engineerTypeTxt = '不限';
+            }
           });
           this.current_tableData = resData;
           this.current_pagination.total = resData.length;
@@ -991,21 +985,21 @@ export default {
         });
     },
     // 表单提交请求:题目
-    httpQuestAddQuestionsFun(examId) {
+    httpQuestAddQuestionsFun() {
       this.loading = true;
       let dataArr = [];
       this.current_tableData.forEach((item) => {
         let obj = {
-          examId: examId,
+          examId: this.examId,
           questionId: item.id,
-          questionPoints: item.points,
+          questionPoints: Number(item.points),
         };
         dataArr.push(obj);
       });
       this.$_http
         .post(
           formatePathParams(this.$_API.INTERFACE_POST_EXAM_ADD_QUESTIONS, {
-            examId,
+            examId: this.examId,
           }),
           dataArr
         )

+ 18 - 17
src/views/examManagement/examManagementDetail.vue

@@ -27,7 +27,7 @@
             <div>
               <span class="exam-detail-title">考试工种:</span>
               <span class="exam-detail-txt">{{
-                examDetailData.engineerTypesTxt
+                examDetailData.engineerTypeTxt
               }}</span>
             </div>
             <div>
@@ -133,6 +133,7 @@ import {
   formatTimeHoursMinuteSecondsFun,
   formatePathParams,
   formateExamStatesFun,
+  formateEngineeringWork,
 } from '@/filters';
 import {
   EXAM_QUESTION_TYPE,
@@ -227,9 +228,9 @@ export default {
         },
         {
           title: '工种',
-          dataIndex: 'engineerTypesTxt',
-          key: 'engineerTypesTxt',
-          scopedSlots: { customRender: 'engineerTypesTxt' },
+          dataIndex: 'engineerTypeTxt',
+          key: 'engineerTypeTxt',
+          scopedSlots: { customRender: 'engineerTypeTxt' },
           width: 100,
         },
         {
@@ -268,12 +269,12 @@ export default {
             tarTime.seconds +
             '秒';
           // 工种
-          if (
-            resData.engineerTypes &&
-            resData.engineerTypes[0] &&
-            resData.engineerTypes[0].id
-          ) {
-            resData.engineerTypesTxt = resData.engineerTypes[0].name;
+          if (resData.engineerTypes) {
+            let findItem = formateEngineeringWork(
+              this.engineeringWorkList,
+              resData.engineerTypes[0]
+            );
+            resData.engineerTypeTxt = findItem.name;
           } else {
             resData.engineerTypeTxt = '不限';
           }
@@ -321,17 +322,17 @@ export default {
               }
             });
             // 工种
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypesTxt = item.engineerTypes[0].name;
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
             } else {
               item.engineerTypeTxt = '不限';
             }
           });
-          this.tableData = resData;
+          this.tableData = [...resData];
           this.pagination.total = res.data.totalElements; // 总条数
           this.loading = false;
         })

+ 23 - 43
src/views/examManagement/examManualVolumeFormation.vue

@@ -400,6 +400,7 @@ import {
   formatePathParams,
   formateDateTimeToAfter,
   formatTimeHoursMinuteSecondsFun,
+  formateEngineeringWork,
 } from '@/filters';
 import { mapGetters } from 'vuex';
 // const ExamDateTime = {
@@ -673,12 +674,12 @@ export default {
           // 考试时长
           let tarTime = formatTimeHoursMinuteSecondsFun(resData.duration);
           // 工种
-          if (
-            resData.engineerTypes &&
-            resData.engineerTypes[0] &&
-            resData.engineerTypes[0].id
-          ) {
-            resData.engineeringWork = resData.engineerTypes[0].id;
+          if (resData.engineerTypes) {
+            let findItem = formateEngineeringWork(
+              this.engineeringWorkList,
+              resData.engineerTypes[0]
+            );
+            resData.engineerTypeTxt = findItem.name;
           } else {
             resData.engineerTypeTxt = '不限';
           }
@@ -689,10 +690,9 @@ export default {
             examLongTimeHours: tarTime.hours || '', // 考试时长:小时
             examLongTimeMinutes: tarTime.minutes || '', // 考试时长:分钟
             description: resData.description || '', // 考试描述
-            examCategory:
-              resData.examCategory || this.engineeringWorkList[0].id, // 考试类型
+            examCategory: resData.examCategory || this.examTypeList[0].code, // 考试类型
             engineeringWork:
-              resData.engineeringWork || this.examTypeList[0].code, // 工种类别
+              resData.engineeringWork || this.engineeringWorkList[0].id, // 工种类别
           };
           this.loading = false;
         })
@@ -732,12 +732,12 @@ export default {
               }
             });
             // 工种
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypeTxt = item.engineerTypes[0].name;
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
             } else {
               item.engineerTypeTxt = '不限';
             }
@@ -925,18 +925,13 @@ export default {
                 item.typeTxt = it.name;
               }
             });
-            // 工种---注意之后从engineertypes中拿
-            // this.bank_engineeringWorkList.forEach((it) => {
-            //   if (item.engineerTypes === it.id) {
-            //     item.engineerTypeTxt = it.name;
-            //   }
-            // });
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypeTxt = item.engineerTypes[0].name;
+            // 工种
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
             } else {
               item.engineerTypeTxt = '不限';
             }
@@ -1165,9 +1160,6 @@ export default {
       e.preventDefault();
       this.loginForm.validateFields((err, values) => {
         if (!err) {
-          let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-            values.engineeringWorkChooseValue
-          ); // 获取工种信息 typeConditionParentValue
           let urlParams = {
             engineertypeid: values.engineeringWorkChooseValue, // 工种
           };
@@ -1185,7 +1177,7 @@ export default {
               values.examTimeLong.minutes
             ).replace(' ', 'T'), // 结束日期
             tages: [],
-            engineerTypes: [engineerTypeInfo], // 信息集合:工种
+            engineerTypes: [values.engineeringWorkChooseValue], // 信息集合:工种
             examCategory: values.examTypeChooseValue, // 考试类别
             totalPoints: this.current_tableGradesCount, // 总分
           };
@@ -1196,18 +1188,6 @@ export default {
         }
       });
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      let seleteItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 表单提交请求:基础信息
     httpQuestFun(urlParams, params) {
       this.loading = true;

+ 8 - 20
src/views/examQuestionManagement/examQuestionList.vue

@@ -152,7 +152,7 @@
 <script>
 import { EXAM_QUESTION_TYPE } from '@/common/Constant';
 import { mapGetters } from 'vuex';
-import { formatePathParams } from '@/filters';
+import { formatePathParams, formateEngineeringWork } from '@/filters';
 export default {
   name: 'examQuestionList',
   props: {},
@@ -329,13 +329,13 @@ export default {
                 item.typeTxt = it.name;
               }
             }); // 试题类别---注意之后从engineertypes中拿
-            // 工种---注意之后从engineertypes中拿
-            if (
-              item.engineerTypes &&
-              item.engineerTypes[0] &&
-              item.engineerTypes[0].id
-            ) {
-              item.engineerTypeTxt = item.engineerTypes[0].name;
+            // 工种
+            if (item.engineerTypes) {
+              let findItem = formateEngineeringWork(
+                this.engineeringWorkList,
+                item.engineerTypes[0]
+              );
+              item.engineerTypeTxt = findItem.name;
             } else {
               item.engineerTypeTxt = '不限';
             }
@@ -348,18 +348,6 @@ export default {
           this.loading = false;
         });
     },
-    // 筛选:根据ID找到工种信息
-    formateEngineeringWork() {
-      let findItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === this.engineeringWorkChoose) {
-          findItem = item;
-          break;
-        }
-      }
-      return JSON.stringify([findItem]);
-    },
     // 操作:选择某个试题类别
     handleExamQuestionTypeFun(item) {
       if (this.checkedExamQuestionType === item.code) {

+ 1 - 16
src/views/examQuestionManagement/examQusetionCreateGapFilling.vue

@@ -229,9 +229,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          // let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-          //   values.engineeringWorkChooseValue
-          // ); // 获取工种信息
           // 需要拼接到请求地址后面的参数
           let urlParams = {
             categoryid: this.typeConditionChildrenValue, // 试题类型ID
@@ -241,7 +238,7 @@ export default {
           let params = {
             content: values.content, // 内容
             finalAnswer: this.formatQuestionAnswersArr(values), // 正确答案
-            // engineerTypes: [engineerTypeInfo], // 工种信息集合
+            engineerTypes: [values.engineeringWorkChooseValue], // 工种信息集合
             type: this.questionType, // 试题类型ID
             answers: [], // 选项
           };
@@ -249,18 +246,6 @@ export default {
         }
       });
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      let seleteItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 把答案放入一个数组中
     formatQuestionAnswersArr(values) {
       let arr = [];

+ 1 - 16
src/views/examQuestionManagement/examQusetionCreateMultiple.vue

@@ -258,9 +258,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          // let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-          //   values.engineeringWorkChooseValue
-          // ); // 获取工种信息
           // 需要拼接到请求地址后面的参数
           let urlParams = {
             categoryid: this.typeConditionChildrenValue, // 试题类型ID
@@ -272,7 +269,7 @@ export default {
             finalAnswer: this.formatQuestionFinalAnswerArr(
               values.finalAnswerIndexs
             ), // 正确答案
-            // engineerTypes: [engineerTypeInfo], // 工种信息集合
+            engineerTypes: [values.engineeringWorkChooseValue], // 工种信息集合
             type: this.questionType, // 试题类型ID
             answers: this.formatQuestionAnswersArr(values), // 选项
           };
@@ -280,18 +277,6 @@ export default {
         }
       });
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      let seleteItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 把答案下标转换为大写英文字母放入一个数组中
     formatQuestionFinalAnswerArr(indexs) {
       let arr = [];

+ 1 - 16
src/views/examQuestionManagement/examQusetionCreateSingle.vue

@@ -282,9 +282,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          // let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-          //   values.engineeringWorkChooseValue
-          // ); // 获取工种信息 typeConditionParentValue
           // 需要拼接到请求地址后面的参数
           let urlParams = {
             categoryid: this.typeConditionChildrenValue, // 试题类型ID
@@ -296,7 +293,7 @@ export default {
             finalAnswer: this.formatQuestionFinalAnswerArr(
               values.finalAnswerIndexs
             ), // 正确答案
-            // engineerTypes: [engineerTypeInfo], // 信息集合:工种
+            engineerTypes: [values.engineeringWorkChooseValue], // 信息集合:工种
             type: this.questionType, // 试题类型ID
             // tages: [this.answerDate], // 日期
             answers: this.formatQuestionAnswersArr(values), // 选项
@@ -305,18 +302,6 @@ export default {
         }
       });
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      let seleteItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 把答案下标转换为大写英文字母放入一个数组中
     formatQuestionFinalAnswerArr(index) {
       let arr = [formatQuestionIndex(index)];

+ 1 - 16
src/views/examQuestionManagement/examQusetionCreateTrueOrFalse.vue

@@ -242,9 +242,6 @@ export default {
       e.preventDefault();
       this.aquestionAddForm.validateFields((err, values) => {
         if (!err) {
-          // let engineerTypeInfo = this.formatEngineeringWorkChooseValue(
-          //   values.engineeringWorkChooseValue
-          // ); // 获取工种信息
           // 需要拼接到请求地址后面的参数
           let urlParams = {
             categoryid: this.typeConditionChildrenValue, // 试题类型ID
@@ -256,7 +253,7 @@ export default {
             finalAnswer: this.formatQuestionFinalAnswerArr(
               values.finalAnswerIndexs
             ), // 正确答案
-            // engineerTypes: [engineerTypeInfo], // 工种信息集合
+            engineerTypes: [values.engineeringWorkChooseValue], // 工种信息集合
             type: this.questionType, // 试题类型ID
             answers: this.formatQuestionAnswersArr(values), // 选项
           };
@@ -264,18 +261,6 @@ export default {
         }
       });
     },
-    // 获取工种信息
-    formatEngineeringWorkChooseValue(id) {
-      let seleteItem = {};
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (item.id === id) {
-          seleteItem = item;
-          break;
-        }
-      }
-      return seleteItem;
-    },
     // 把答案下标转换为大写英文字母放入一个数组中
     formatQuestionFinalAnswerArr(index) {
       let arr = [formatQuestionIndex(index)];