bug fix

master/src/main/resources/mybatis/pssr/TPssrAboveallMapper.xml

@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="includePublic != null">include_public = #{includePublic},</if>
             <if test="unitDes != null">unit_des = #{unitDes},</if>
             <if test="plantMgr != null">plant_mgr = #{plantMgr},</if>

master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrAlarmMapper.xml

@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}

master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml

@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

master/src/main/resources/mybatis/pssr/TPssrApproveMapper.xml

@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="cbpMgr != null">cbp_mgr = #{cbpMgr},</if>
             <if test="ctmMgr != null">ctm_mgr = #{ctmMgr},</if>
             <if test="ctaMgr != null">cta_mgr = #{ctaMgr},</if>

master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml

@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="putUse != null">put_use = #{putUse},</if>
         </trim>
@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

ui/src/views/pssr/aboveall/index.vue

@@ -164,7 +164,7 @@
     />
 
     <!-- 添加或修改PSSR对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="70%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="80%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="5">
@@ -191,9 +191,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="8">
             <el-form-item label="预计开车时间" prop="drivingTime" label-width="140px">
-              <el-date-picker clearable size="small"
+              <el-date-picker clearable
               v-model="form.drivingTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -201,7 +201,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="6">
             <el-form-item label="是否包含390区域" prop="includePublic" label-width="140px">
               <el-radio v-model="form.includePublic" :label="1">是</el-radio>
               <el-radio v-model="form.includePublic" :label="0">否</el-radio>

ui/src/views/pssr/pipe/index.vue

@@ -180,13 +180,13 @@
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true"
                        width="150">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true"
                        width="150">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationDate" width="100">

ui/src/views/pssr/pumpCleaning/index.vue

@@ -158,12 +158,12 @@
       </el-table-column>
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">

ui/src/views/pssr/pumpFill/index.vue

@@ -162,12 +162,12 @@
       </el-table-column>
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">

ui/src/views/pssr/pumpOverhaul/index.vue

@@ -158,12 +158,12 @@
       </el-table-column>
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">

ui/src/views/pssr/safetyBleed/index.vue

@@ -174,12 +174,12 @@
                        :show-overflow-tooltip="true" width="230"/>
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="180">

ui/src/views/pssr/safetyBreath/index.vue

@@ -174,12 +174,12 @@
                        :show-overflow-tooltip="true" width="230"/>
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="120">

ui/src/views/pssr/safetyBrust/index.vue

@@ -173,12 +173,12 @@
       </el-table-column>
       <el-table-column label="检查人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查日期" align="center" prop="confirmationTime" :show-overflow-tooltip="true"

ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -167,12 +167,12 @@
       </el-table-column>
       <el-table-column label="检查人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查日期" align="center" prop="confirmationTime" :show-overflow-tooltip="true"

ui/src/views/pssr/safetyValve/index.vue

@@ -163,12 +163,12 @@
                        :show-overflow-tooltip="true" width="230"/>
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="180">

ui/src/views/pssr/subcontent/index.vue

@@ -290,14 +290,13 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
+      this.$confirm('确认驳回？', '提示', {
         confirmButtonText: '确认驳回',
         cancelButtonText: '取消',
-      }).then(({value}) => {
+      }).then(function () {
         let data = {
           ids: this.ids,
-          aboveallId: this.aboveallId,
-          remarks: value
+          aboveallId: this.aboveallId
         }
         handleTurnDownSubcontent(data).then(res => {
           this.msgSuccess("驳回成功");

ui/src/views/pssr/vessel/index.vue

@@ -183,13 +183,13 @@
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true"
                        width="150">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer1Name }}</span>
+          <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true"
                        width="150">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmer2Name }}</span>
+          <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationDate" width="150">