结果类型修改

src/components/knowledgeExtra/AddAssess/index.vue

@@ -185,8 +185,8 @@ it .ql-editor,
                   v-model="table.resultType"
                   @change="initializationTableData($event, tableIndex)"
                 >
-                  <el-radio :label="1">直接结果</el-radio>
-                  <el-radio :label="2">记分结果</el-radio>
+                  <el-radio :label="2">直接结果</el-radio>
+                  <el-radio :label="1">记分结果</el-radio>
                 </el-radio-group>
               </el-form-item>
               <div class="hint_msg">
@@ -195,7 +195,7 @@ it .ql-editor,
             </div>
             <div
               class="num_box"
-              v-if="table.resultType === 2 && table.textType === 11"
+              v-if="table.resultType === 1 && table.textType === 11"
             >
               <div class="num">
                 <el-form-item
@@ -368,7 +368,7 @@ const defaultTable = {
   ],
   orderNo: 0,
   remark: "string",
-  resultType: 1,
+  resultType: 2,
   ruleCode: "string",
   score: 0,
   status: 0,
@@ -423,7 +423,7 @@ export default {
             ],
             orderNo: 0,
             remark: "string",
-            resultType: 1,
+            resultType: 2,
             ruleCode: "string",
             score: 0,
             status: 0,
@@ -1099,7 +1099,7 @@ export default {
     // 判断是否需要得分结果
     ScoreResultsShow() {
       const index = this.scaleData.klScaleParent.findIndex(
-        (item) => item.resultType === 2
+        (item) => item.resultType === 1
       );
       if (index === -1) {
         return false;

src/components/knowledgeExtra/AddAssess/scale-table.vue

@@ -74,9 +74,8 @@
 /deep/.el-select--mini {
   width: 100%;
 }
-/deep/ .el-input--mini{
+/deep/ .el-input--mini {
   font-size: 14px;
-  
 }
 /deep/ .el-form-item.is-success .el-input__inner,
 .el-form-item.is-success .el-textarea__inner {
@@ -224,7 +223,7 @@
           prop="two_factor"
           label="系数"
           width="90px"
-          v-if="tableResultType === 2"
+          v-if="tableResultType === 1"
         >
           <template slot-scope="scope">
             <div class="cell_center_box">
@@ -245,7 +244,7 @@
           prop="two_constant"
           label="常数"
           width="90px"
-          v-if="tableResultType === 2"
+          v-if="tableResultType === 1"
         >
           <template slot-scope="scope">
             <div class="cell_center_box">
@@ -337,8 +336,8 @@
         <el-table-column
           prop="content"
           label="编码"
-          :width="tableResultType === 1 ? '200px' : ''"
-          v-if="tableResultType === 2"
+          :width="tableResultType === 2 ? '200px' : ''"
+          v-if="tableResultType === 1"
         >
           <template slot-scope="scope">
             <el-form-item
@@ -353,7 +352,7 @@
                 <el-option
                   v-for="item in scope.row.ruleCodeList"
                   :key="item.code"
-                  :label="item.code"
+                  :label="`${item.name}(${item.code})`"
                   :value="item.code"
                 >
                 </el-option>
@@ -364,7 +363,7 @@
         <el-table-column
           prop="content"
           label="分值"
-          v-if="tableResultType === 2"
+          v-if="tableResultType === 1"
         >
           <template slot="header">
             <div class="custom_table_header">分值</div>
@@ -388,9 +387,9 @@
           prop="result"
           label="结果"
           width="200px"
-          v-if="tableResultType === 1"
+          v-if="tableResultType === 2"
         >
-        <template slot="header">
+          <template slot="header">
             <div class="custom_table_header">结果</div>
           </template>
           <template slot-scope="scope">
@@ -415,7 +414,7 @@
         <el-table-column
           prop="pushInfo"
           label="建议"
-          v-if="tableResultType === 1"
+          v-if="tableResultType === 2"
         >
           <template slot-scope="scope">
             <el-form-item
@@ -652,7 +651,7 @@ export default {
     },
     tableResultType: {
       required: true,
-      default: 1
+      default: 2
     }
   }
 };