PSSR控制器及界面功能优化

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -613,6 +613,7 @@ public class TPssrApproveController extends BaseController {
                 calibration.setSubId(dto.getSubId());
                 calibration.setIds(dto.getIds());
                 calibration.setTaskType(dto.getTaskType());
+                calibration.setDevType(dto.getDevType());
                 return instrumentCalibrationController.confirmInstrumentCalibration(calibration);
             case "yblscs"://仪表联锁测试
                 return AjaxResult.success();
@@ -1636,15 +1637,16 @@ public class TPssrApproveController extends BaseController {
         subcontent.setAboveallId(aboveall.getId());
         result = subcontentController.export(subcontent);
         msg = (String) result.get("msg");
+        msg = msg.replace(File.separator,"/");
         path = getProfile() + msg.replace("/profile", "");
-        this.copyFileIgnoreException(path, rootPath + subTitle + msg.replace("/profile/pssr/", ""), files, rootPath + subTitle + msg);
+//        this.copyFileIgnoreException(path, rootPath + subTitle + msg.replace("/profile/pssr/", ""), files, rootPath + subTitle + msg);
 //        Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg.replace("/profile/pssr/", "")), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
 //        files.add(new File(rootPath + subTitle + msg));
 
         // word转pdf
-        String fdfFile = officeConvertController.wordTransPdf(msg);
-        fdfFile = fdfFile.replace(File.separator,"/");
-        this.copyFileIgnoreException(getProfile()+fdfFile.replace("/profile", ""), rootPath + subTitle + fdfFile.replace("/profile/temp/", ""), files, rootPath + subTitle + fdfFile);
+//        String fdfFile = officeConvertController.wordTransPdf(msg);
+//        fdfFile = fdfFile.replace(File.separator,"/");
+        this.copyFileIgnoreException(getProfile()+msg.replace("/profile", ""), rootPath + subTitle + msg.replace("/profile/temp/", ""), files, rootPath + subTitle + msg);
 
         for (TPssrSubcontent tPssrSubcontent : tPssrSubcontents) {
             TPssrPatrol patrol = new TPssrPatrol();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -9,10 +9,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrBlind;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrBlindMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -39,6 +36,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 盲板Controller
@@ -169,11 +169,31 @@ public class TPssrBlindController extends BaseController {
     public TableDataInfo list(TPssrBlind tPssrBlind) {
         startPage();
         List<TPssrBlind> list = tPssrBlindService.selectTPssrBlindList(tPssrBlind);
-        list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
-        });
+        if (list.size() > 0) {
+            //线程池
+            ExecutorService executorService = Executors.newFixedThreadPool(30);
+            final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
+            for (TPssrBlind item : list
+            ) {
+                executorService.submit(() -> {
+                    try {
+                        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+                        if (item.getApproveStatus() != 2)
+                            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+                    } catch (Exception e) {
+                        logger.error("e:", e);
+                    } finally {
+                        latch.countDown(); //线程计数
+                    }
+                });
+            }
+            try {
+                latch.await(); //线程计数完毕后继续执行
+            } catch (InterruptedException e) {
+                logger.error("e", e);
+            }
+            executorService.shutdown();
+        }
         return getDataTable(list);
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -156,6 +156,11 @@ public class TPssrHygieneController extends BaseController {
     public TableDataInfo list(TPssrHygiene tPssrHygiene) {
         startPage();
         List<TPssrHygiene> list = tPssrHygieneService.selectTPssrHygieneList(tPssrHygiene);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        });
         return getDataTable(list);
     }
 
@@ -237,7 +242,11 @@ public class TPssrHygieneController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(tPssrHygieneService.selectTPssrHygieneById(id));
+        TPssrHygiene item = tPssrHygieneService.selectTPssrHygieneById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        return AjaxResult.success(item);
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -339,6 +339,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             TPssrInstrumentCalibration lock = new TPssrInstrumentCalibration();
             lock.setSubId(tPssrInstrumentCalibration.getSubId());
             lock.setApproveStatus(queryStatus);
+            lock.setDevType(tPssrInstrumentCalibration.getDevType());
             for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(lock)) {
                 if (queryStatus == 3) {
                     item.setConfirmationDate(date);
@@ -351,6 +352,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
         TPssrInstrumentCalibration entity = new TPssrInstrumentCalibration();
         entity.setSubId(tPssrInstrumentCalibration.getSubId());
         entity.setApproveStatus(queryStatus);
+        entity.setDevType(tPssrInstrumentCalibration.getDevType());
         for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(entity)) {
             if (tPssrInstrumentCalibration.getTaskType() == 4) {
                 if (item.getConfirm1().equals(getUserId().toString())) {

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -152,6 +152,11 @@ public class TPssrLaboratoryController extends BaseController {
     public TableDataInfo list(TPssrLaboratory tPssrLaboratory) {
         startPage();
         List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        });
         return getDataTable(list);
     }
 
@@ -236,7 +241,11 @@ public class TPssrLaboratoryController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(tPssrLaboratoryService.selectTPssrLaboratoryById(id));
+        TPssrLaboratory item = tPssrLaboratoryService.selectTPssrLaboratoryById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -264,6 +273,7 @@ public class TPssrLaboratoryController extends BaseController {
         if (tPssrLaboratory.getConfirm1().equals(tPssrLaboratory.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
+        tPssrFileService.updateFileRelevance(tPssrLaboratory.getFileIds(), forShort, tPssrLaboratory.getId(), tPssrLaboratory.getSubId());
         return toAjax(tPssrLaboratoryService.updateTPssrLaboratory(tPssrLaboratory));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -77,6 +77,11 @@ public class TPssrPublicController extends BaseController {
     public TableDataInfo list(TPssrPublic tPssrPublic) {
         startPage();
         List<TPssrPublic> list = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        });
         return getDataTable(list);
     }
 
@@ -159,7 +164,11 @@ public class TPssrPublicController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:public:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrPublicService.selectTPssrPublicById(id));
+        TPssrPublic item = tPssrPublicService.selectTPssrPublicById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -231,6 +240,7 @@ public class TPssrPublicController extends BaseController {
         } catch (Exception e) {
             logger.error(e.getMessage());
         }
+        tPssrFileService.updateFileRelevance(tPssrPublic.getFileIds(), forShort, tPssrPublic.getId(), tPssrPublic.getSubId());
         return toAjax(tPssrPublicService.updateTPssrPublic(tPssrPublic));
     }
 

master/src/main/java/com/ruoyi/project/pssr/domain/dto/TPssrApproveDto.java

@@ -19,6 +19,16 @@ public class TPssrApproveDto {
 
     private String lightingType;
 
+    private String devType;
+
+    public String getDevType() {
+        return devType;
+    }
+
+    public void setDevType(String devType) {
+        this.devType = devType;
+    }
+
     public String getTorchvocType() {
         return torchvocType;
     }

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

@@ -136,13 +136,13 @@
             @click="gotoSubIndex(scope.row)"
           >检查内容
           </el-button>
-          <!--<el-button-->
-          <!--size="mini"-->
-          <!--type="text"-->
-          <!--icon="el-icon-download"-->
-          <!--@click="handleZip(scope.row)"-->
-          <!--&gt;打包-->
-          <!--</el-button>-->
+          <el-button
+          size="mini"
+          type="text"
+          icon="el-icon-download"
+          @click="handleZip(scope.row)"
+          >打包
+          </el-button>
           <!--<el-button-->
           <!--size="mini"-->
           <!--type="text"-->

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

@@ -136,50 +136,49 @@
       <H2>隔离/盲板一览表</H2>
     </div>
 
-    <el-table v-loading="loading" :data="blindList" @selection-change="handleSelectionChange" :height="clientHeight"
-              border>
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
+    <u-table v-loading="loading" :data="blindList" @selection-change="handleSelectionChange" :height="clientHeight"
+             border>
+      <u-table-column type="selection" width="55" align="center"/>
+      <u-table-column label="审批状态" align="center" prop="approveStatus" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
           <el-tag v-if="scope.row.approveStatus==1" type="warning">待确认</el-tag>
           <el-tag v-if="scope.row.approveStatus==3" type="success">已确认1</el-tag>
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
-      </el-table-column>
-      <el-table-column label="区域" align="center" prop="unitNo" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="盲板编号" align="center" prop="blindNo" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="隔离类型" align="center" prop="isoType" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="尺寸" align="center" prop="blindSize" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="压力等级" align="center" prop="pressureRate" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="盲板类型" align="center" prop="blindType" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="介质" align="center" prop="medium" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="“8”字盲板" align="center" prop="figure" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="PID" align="center" prop="pidNo" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="位置" align="center" prop="location" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="开车前状态" align="center" prop="startupStatus" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="实际状态" align="center" prop="actualStatus" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="是否满足" align="center" prop="satisfy" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="拆装人员" align="center" prop="inConfirm1" :show-overflow-tooltip="true"
-                       width="150">
+      </u-table-column>
+      <u-table-column label="区域" align="center" prop="unitNo" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="盲板编号" align="center" prop="blindNo" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="隔离类型" align="center" prop="isoType" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="尺寸" align="center" prop="blindSize" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="压力等级" align="center" prop="pressureRate" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="盲板类型" align="center" prop="blindType" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="介质" align="center" prop="medium" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="“8”字盲板" align="center" prop="figure" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="PID" align="center" prop="pidNo" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="位置" align="center" prop="location" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="开车前状态" align="center" prop="startupStatus" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="实际状态" align="center" prop="actualStatus" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="是否满足" align="center" prop="satisfy" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="拆装人员" align="center" prop="inConfirm1" :show-overflow-tooltip="true"
+                      width="150">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="确认人" align="center" prop="inConfirm2" :show-overflow-tooltip="true" width="150">
+      </u-table-column>
+      <u-table-column label="确认人" align="center" prop="inConfirm2" :show-overflow-tooltip="true" width="150">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="确认时间" align="center" prop="installDate" width="100">
+      </u-table-column>
+      <u-table-column label="确认时间" align="center" prop="installDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.installDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
-                       class-name="small-padding fixed-width">
+      </u-table-column>
+      <u-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
+      <u-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
+      <u-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -194,7 +193,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.approveStatus!=2"
             v-hasPermi="['pssr:blind:edit']"
           >修改
           </el-button>
@@ -203,13 +201,12 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.approveStatus!=2"
             v-hasPermi="['pssr:blind:remove']"
           >删除
           </el-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </u-table-column>
+    </u-table>
 
     <pagination
       v-show="total>0"
@@ -217,6 +214,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :pageSizes="[20,50,100,500]"
     />
 
     <!-- 添加或修改盲板对话框 -->
@@ -375,7 +373,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="installDate">
+        <el-form-item label="时间" v-hasPermi="['pssr:date:edit']" prop="installDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.installDate"
                           type="date"
@@ -392,7 +390,7 @@
         <el-button @click="cancelBatch">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
+    <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload
@@ -417,7 +415,7 @@
           <!--是否更新已经存在的用户数据-->
           <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
           <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
-            <input name="type" :value="upload.type" hidden />
+            <input name="type" :value="upload.type" hidden/>
           </form>
         </div>
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
@@ -433,14 +431,14 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  <!-- 驳回原因对话框 -->
+    <!-- 驳回原因对话框 -->
     <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
                width="1000px">
-      <el-table  :data="items" border>
+      <el-table :data="items" border>
         <el-table-column label="盲板编号" align="center" prop="blindNo" :show-overflow-tooltip="true" width="150"/>
         <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+            <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
           </template>
         </el-table-column>
       </el-table>
@@ -449,7 +447,7 @@
         <el-button @click="reasonCancel">取 消</el-button>
       </div>
     </el-dialog>
-</div>
+  </div>
 </template>
 
 <script>
@@ -460,7 +458,6 @@ import {
   getBlind,
   handleConfirmApprove,
   handleTurnDownBlind,
-  importTemplate,
   listBlind,
   updateBlind,
   updateBlindBatch,
@@ -472,7 +469,6 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
-import {updateMaterialBatch} from "@/api/pssr/material";
 
 export default {
   dicts: ['pssr_approve_status'],
@@ -618,7 +614,7 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-        this.reason.open=true;
+      this.reason.open = true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -734,7 +730,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.items=selection;
+      this.items = selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -751,13 +747,7 @@ export default {
       const id = row.id || this.ids
       getBlind(id).then(response => {
         this.form = response.data;
-        if (response.data.approveStatus != 2) {
-          if (this.isApprove == 0) {
-            this.open = true;
-          } else {
-            this.approveOpen = true;
-          }
-        }
+        this.open = true;
         this.title = "修改盲板";
       });
     },
@@ -835,7 +825,7 @@ export default {
     },
     /** 报告附件按钮操作 */
     handleDoc(row) {
-      this.doc.fileList=[]
+      this.doc.fileList = []
       this.doc.open = true;
       this.doc.queryParams.itemId = row.id
       this.getFileList()
@@ -852,14 +842,14 @@ export default {
     reasonCancel() {
       this.reason.open = false;
     },
-    submitReasonForm(){
+    submitReasonForm() {
       handleTurnDownBlind(this.items).then(res => {
         this.msgSuccess("驳回成功");
         this.reason.open = false;
         this.$emit('refreshHisList');
       })
     },
-    handleBatch(){
+    handleBatch() {
       this.reset();
       this.openBatch = true
     },

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

@@ -663,7 +663,8 @@ export default {
       let data = {
         ids: this.ids,
         subId: this.subId,
-        taskType: this.isApprove
+        taskType: this.isApprove,
+        devType: '1'
       }
       handleConfirmInstrumentCalibration(data).then(res => {
         this.msgSuccess("确认成功");

ui/src/views/pssr/instrumentCalibration/liquidometer.vue

@@ -665,7 +665,8 @@ export default {
       let data = {
         ids: this.ids,
         subId: this.subId,
-        taskType: this.isApprove
+        taskType: this.isApprove,
+        devType: '2'
       }
       handleConfirmInstrumentCalibration(data).then(res => {
         this.msgSuccess("确认成功");

ui/src/views/pssr/instrumentCalibration/regulatingValve.vue

@@ -671,7 +671,9 @@ export default {
       let data = {
         ids: this.ids,
         subId: this.subId,
-        taskType: this.isApprove
+        taskType: this.isApprove,
+        devType: '3'
+
       }
       handleConfirmInstrumentCalibration(data).then(res => {
         this.msgSuccess("确认成功");

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

@@ -201,6 +201,11 @@
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </u-table-column>
+      <u-table-column label="确认时间" align="center" prop="confirmationDate" width="150">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </u-table-column>
       <u-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <u-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <u-table-column label="操作" align="center" fixed="right"  v-if="isApprove==0" class-name="small-padding" width="200">

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

@@ -142,13 +142,13 @@
     <div v-if="sn=='ybjy'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="调节阀" name="first">
-          <regulating-valve :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
+          <regulating-valve :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="液位计" name="second">
-          <liquidometer :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
+          <liquidometer :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
         <el-tab-pane label="流量计" name="thrid">
-          <instrument-calibration :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
+          <instrument-calibration :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
       </el-tabs>
     </div>

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

@@ -201,7 +201,7 @@
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="时间" align="center" prop="confirmationDate" width="150">
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>