cq

ui/src/views/ehs/records/index.vue

@@ -114,13 +114,13 @@
       <el-table-column :label="$t('工艺安全相关事件')" align="center" prop="processSafety" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('是否工艺系统')" align="center" prop="processSystem" :formatter="processSystemFormat" />
       <el-table-column label="OAD" align="center" prop="oad" :formatter="oadFormat" />
-      <el-table-column :label="$t('事件简述/机械/电仪问题')" align="center" prop="bridfing" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('事件简述/机械/电仪问题')" align="center" prop="bridfing" width="350"/>
       <el-table-column :label="$t('实际后果事件分级')" align="center" prop="actualClassification" :formatter="actualClassificationFormat" />
       <el-table-column :label="$t('可能性')" align="center" prop="probability" :formatter="probabilityFormat" />
       <el-table-column :label="$t('严重性')" align="center" prop="severity" :formatter="severityFormat" />
       <el-table-column :label="$t('风险等级')" align="center" prop="riskClass" :formatter="riskClassFormat" />
       <el-table-column :label="$t('潜在后果事件等级')" align="center" prop="potentialLevel" :formatter="potentialLevelFormat" />
-      <el-table-column :label="$t('对策')" align="center" prop="measures" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('对策')" align="center" prop="measures" width="350"/>
       <el-table-column :label="$t('输入AIMS')" align="center" prop="aims" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
@@ -276,7 +276,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('事件简述/机械/电仪问题')" prop="bridfing">
-              <el-input v-model="form.bridfing" :placeholder="$t('请输入') + $t('事件简述/机械/电仪问题')" />
+              <el-input v-model="form.bridfing" type="textarea" :placeholder="$t('请输入') + $t('事件简述/机械/电仪问题')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -347,7 +347,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('对策')" prop="measures">
-              <el-input v-model="form.measures" :placeholder="$t('请输入') + $t('对策')" />
+              <el-input v-model="form.measures" type="textarea" :placeholder="$t('请输入') + $t('对策')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

ui/src/views/training/trainingrecords/index.vue

@@ -957,7 +957,7 @@ export default {
         if (index === 0) {
           spanArr.push(1);
         } else {
-          if (item[1] === tableData[index - 1][1]) {
+          if (item[1] === tableData[index - 1][1] && item[0] === tableData[index - 1][0]) {
             //第一列需合并相同内容的判断条件
             spanArr[concat] += 1;
             spanArr.push(0);