ly PSSR 增加u table

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -1,24 +1,24 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.document.PDFTemplateUtil;
 import com.ruoyi.common.utils.document.ZipUtil;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.sems.domain.*;
+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.sems.domain.TReportHiYlgd;
+import com.ruoyi.project.sems.domain.TReportYlgd;
+import com.ruoyi.project.sems.domain.TSpecdevYlgd;
+import com.ruoyi.project.sems.service.ITReportHiYlgdService;
 import com.ruoyi.project.sems.service.ITReportYlgdService;
 import com.ruoyi.project.sems.service.ITSpecdevYlgdService;
-import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
@@ -26,19 +26,19 @@ import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricTaskInstanceQuery;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITReportHiYlgdService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 压力管道报告历史Controller
@@ -92,7 +92,6 @@ public class TReportHiYlgdController extends BaseController {
     /**
      * 获取压力管道报告历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('sems:historyYlgd:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tReportHiYlgdService.selectTReportHiYlgdById(id));

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -1,23 +1,22 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.document.PDFTemplateUtil;
 import com.ruoyi.common.utils.document.ZipUtil;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.sems.domain.*;
-import com.ruoyi.project.sems.service.ITReportYlgdService;
+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.sems.domain.TReportHiYlrq;
+import com.ruoyi.project.sems.domain.TReportYlrq;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
+import com.ruoyi.project.sems.service.ITReportHiYlrqService;
 import com.ruoyi.project.sems.service.ITReportYlrqService;
 import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
 import com.ruoyi.project.system.domain.SysDictData;
@@ -27,19 +26,19 @@ import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricTaskInstanceQuery;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITReportHiYlrqService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 压力容器报告历史Controller
@@ -93,7 +92,6 @@ public class TReportHiYlrqController extends BaseController {
     /**
      * 获取压力容器报告历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('sems:historyYlrq:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tReportHiYlrqService.selectTReportHiYlrqById(id));

master/src/main/java/com/ruoyi/project/sems/controller/TReportYlgdController.java

@@ -1,43 +1,44 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
-import com.ruoyi.project.sems.domain.*;
+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.sems.domain.ParamData;
+import com.ruoyi.project.sems.domain.TReportThird;
+import com.ruoyi.project.sems.domain.TReportYlgd;
 import com.ruoyi.project.sems.mapper.TReportYlgdMapper;
 import com.ruoyi.project.sems.service.ITReportThirdService;
+import com.ruoyi.project.sems.service.ITReportYlgdService;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITReportYlgdService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 压力管道年检报告Controller
@@ -340,7 +341,6 @@ public class TReportYlgdController extends BaseController {
     /**
      * 查询压力管道年检报告列表
      */
-    @PreAuthorize("@ss.hasPermi('sems:reportYlgd:list')")
     @GetMapping("/list")
     public TableDataInfo list(TReportYlgd tReportYlgd) {
         startPage();
@@ -363,7 +363,6 @@ public class TReportYlgdController extends BaseController {
     /**
      * 获取压力管道年检报告详细信息
      */
-    @PreAuthorize("@ss.hasPermi('sems:reportYlgd:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tReportYlgdService.selectTReportYlgdById(id));

master/src/main/java/com/ruoyi/project/sems/controller/TReportYlrqController.java

@@ -1,44 +1,44 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
-import com.ruoyi.project.sems.domain.*;
-import com.ruoyi.project.sems.mapper.TReportYlgdMapper;
+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.sems.domain.ParamData;
+import com.ruoyi.project.sems.domain.TReportThird;
+import com.ruoyi.project.sems.domain.TReportYlrq;
 import com.ruoyi.project.sems.mapper.TReportYlrqMapper;
 import com.ruoyi.project.sems.service.ITReportThirdService;
+import com.ruoyi.project.sems.service.ITReportYlrqService;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITReportYlrqService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 压力容器年检报告Controller
@@ -361,7 +361,6 @@ public class TReportYlrqController extends BaseController {
     /**
      * 查询压力容器年检报告列表
      */
-    @PreAuthorize("@ss.hasPermi('sems:reportYlrq:list')")
     @GetMapping("/list")
     public TableDataInfo list(TReportYlrq tReportYlrq) {
         startPage();
@@ -605,7 +604,6 @@ public class TReportYlrqController extends BaseController {
     /**
      * 获取压力容器年检报告详细信息
      */
-    @PreAuthorize("@ss.hasPermi('sems:reportYlrq:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tReportYlrqService.selectTReportYlrqById(id));

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

@@ -126,6 +126,9 @@
     </div>
     <el-table v-loading="loading" :data="lockList" @selection-change="handleSelectionChange"
               :height="clientHeight"
+              :row-key="row => { return row.id }"
+              use-virtual
+              showBodyOverflow="title"
               border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
@@ -206,6 +209,7 @@
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[20,100,500]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"

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

@@ -136,49 +136,53 @@
       <span>检查内容：所有的安全阀是否已经校验，是否在有效期内，并确认安装位置是否正确，是否投用，核对安全阀校验压力和设定压力是否一致，是（√），否（×），如有不符合要求的立即联系负责人整改。</span>
     </div>
 
-    <el-table v-loading="loading" :data="safetyValveList" @selection-change="handleSelectionChange"
-              :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" width="105">
+    <u-table v-loading="loading" :data="safetyValveList" @selection-change="handleSelectionChange"
+              :height="clientHeight"
+              :row-key="row => { return row.id }"
+              use-virtual
+              showBodyOverflow="title"
+              border>
+      <u-table-column type="selection" width="55" align="center"/>
+      <u-table-column label="审批状态" align="center" prop="approveStatus" width="105">
         <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="unit" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="P&ID图号" align="center" prop="pidNo" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="安全阀位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="保护设备" align="center" prop="safetyDev" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="已经校验(是/否)" align="center" prop="verify" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="在有效期内(是/否)" align="center" prop="inValidity" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="安装位置" align="center" prop="installLocation" :show-overflow-tooltip="true"
+      </u-table-column>
+      <u-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="P&ID图号" align="center" prop="pidNo" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="安全阀位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="保护设备" align="center" prop="safetyDev" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="已经校验(是/否)" align="center" prop="verify" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="在有效期内(是/否)" align="center" prop="inValidity" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="安装位置" align="center" prop="installLocation" :show-overflow-tooltip="true"
                        width="180"/>
-      <el-table-column label="安装位置准确(是/否)" align="center" prop="installAccuracy" :show-overflow-tooltip="true"
+      <u-table-column label="安装位置准确(是/否)" align="center" prop="installAccuracy" :show-overflow-tooltip="true"
                        width="180"/>
-      <el-table-column label="投用(是/否)" align="center" prop="putUse" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="设定压力(Mpa)" align="center" prop="setPressure" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="校验压力与设定压力一致(是/否)" align="center" prop="uniformPressure"
+      <u-table-column label="投用(是/否)" align="center" prop="putUse" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="设定压力(Mpa)" align="center" prop="setPressure" :show-overflow-tooltip="true" width="180"/>
+      <u-table-column label="校验压力与设定压力一致(是/否)" align="center" prop="uniformPressure"
                        :show-overflow-tooltip="true" width="230"/>
-      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
+      <u-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
+      </u-table-column>
+      <u-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="180">
+      </u-table-column>
+      <u-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{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="180"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
+      </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="180"/>
+      <u-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -206,12 +210,13 @@
           >删除
           </el-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </u-table-column>
+    </u-table>
 
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[20,100,500]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"

ui/src/views/sems/reportYlgd/ylgdopen.vue

@@ -386,11 +386,9 @@
             icon="el-icon-tickets"
             @click="handleHistory(scope.row)"
             v-if="!scope.row.isEdit"
-            v-hasPermi="['sems:reportYlgd:edit']"
           >{{ $t('历史报告') }}
           </el-button>
           <el-button
-            v-hasPermi="['sems:reportYlgd:edit']"
             type="text"
             size="mini"
             v-if="scope.row.isEdit"
@@ -477,7 +475,7 @@
         <el-table-column :label="$t('操作')" align="center" fixed="right" width="120"
                         class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button v-hasPermi="['sems:historyYlgd:export']" type="text" size="small"
+            <el-button  type="text" size="small"
                        @click="handleDownloadReport(scope.row)">{{ $t('下载报告') }}
             </el-button>
           </template>
@@ -629,7 +627,6 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              v-hasPermi="['sems:reportYlgd:remove']"
               @click="handleDeleteThird(scope.row)"
             >{{ $t('删除') }}
             </el-button>

ui/src/views/sems/reportYlrq/ylrqopen.vue

@@ -594,11 +594,9 @@
             icon="el-icon-tickets"
             @click="handleHistory(scope.row)"
             v-if="!scope.row.isEdit"
-            v-hasPermi="['sems:reportYlrq:edit']"
           >{{ $t('历史报告') }}
           </el-button>
           <el-button
-            v-hasPermi="['sems:reportYlrq:edit']"
             type="text"
             size="mini"
             v-if="scope.row.isEdit"
@@ -706,7 +704,7 @@
         <el-table-column :label="$t('操作')" align="center" fixed="right" width="120"
                          class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button v-hasPermi="['sems:historyYlgd:export']" type="text" size="small"
+            <el-button  type="text" size="small"
                        @click="handleDownloadReport(scope.row)">{{ $t('下载报告') }}
             </el-button>
           </template>
@@ -853,7 +851,6 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              v-hasPermi="['sems:reportYlgd:remove']"
               @click="handleDeleteThird(scope.row)"
             >{{ $t('删除') }}
             </el-button>