-fix bug

master/src/main/java/com/ruoyi/project/check/controller/TCheckCheckpointsController.java

@@ -135,7 +135,7 @@ public class TCheckCheckpointsController extends BaseController {
         return toAjax(tCheckCheckpointsService.updateTCheckCheckpointsByCheckIds(tCheckCheckpoints));
     }
 
-    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
     @Log(title = "审核检测结果", businessType = BusinessType.APPROVE)
     @RepeatSubmit
     @PostMapping("/toApprove")
@@ -143,7 +143,7 @@ public class TCheckCheckpointsController extends BaseController {
         return tCheckCheckpointsService.toApprove(tCheckCheckpoints);
     }
 
-    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
     @Log(title = "审核所有检测结果", businessType = BusinessType.APPROVE)
     @RepeatSubmit
     @PostMapping("/approveAll")

master/src/main/java/com/ruoyi/project/check/controller/TCheckRepairpointsController.java

@@ -102,7 +102,7 @@ public class TCheckRepairpointsController extends BaseController {
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
     @Log(title = "审核维修结果", businessType = BusinessType.APPROVE)
     @RepeatSubmit
     @PutMapping("/toApprove")

master/src/main/java/com/ruoyi/project/statistics/controller/StatisticsController.java

@@ -102,7 +102,10 @@ public class StatisticsController extends BaseController {
 //            总数统记
             result.setXlcdCount(result.getPointCount());
 //            查询所有检测点的净检测值
+            long t1 = System.currentTimeMillis();
             List<Statistics> countPfl = statisticsService.countPfl(statistics);
+            long t2 = System.currentTimeMillis();
+            System.err.println("================================================::"+(t2-t1));
             resultList.add(getCountValue(countPfl, result));
         }
 

master/src/main/resources/mybatis/statistics/StatisticsMapper.xml

@@ -57,18 +57,17 @@
     </select>
 
     <select id="countPfl" parameterType="Statistics" resultMap="StatisticsResult">
-        select d.plant_name,net_test_value,repair_id,point_id,point_type,check_date
-        from t_check_checkpoints d left join t_base_plant bp on bp.plant_id=d.plant_id
+        select net_test_value,repair_id,point_id,point_type,check_date
+        from t_check_checkpoints d
         <where>
-            <if test="plantId!=null">and d.plant_id = #{plantId}</if>
-            and d.approve_status = 2
+            <if test="plantId!=null">and plant_id = #{plantId}</if>
+            and approve_status = 2
             and YEAR(check_date) = #{year}
-            and leakage_degree is not null
-            <if test="company!=null and company!=''">and bp.company like concat('%',#{company},'%')</if>
+            and (leakage_degree='1' or leakage_degree='2' or leakage_degree='3' )
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        ORDER BY d.plant_id,d.point_type,d.point_id,d.check_date;
+        ORDER BY plant_id,point_type,point_id,check_date;
     </select>
 
     <select id="countXlcdByPoint" parameterType="Statistics" resultMap="StatisticsResult">

ui/src/views/base/device/index.vue

@@ -123,9 +123,9 @@
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column label="审核状态" align="center" fixed="left" prop="approveStatus"
                        :formatter="approveStatusFormat" :show-overflow-tooltip="true" width="80"/>
-      <el-table-column label="装置名称" align="center" prop="plantName" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="装置名称" align="center" prop="plantName" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="装置编编码" align="center" prop="plantCode" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="区域名称" align="center" prop="regionName" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="区域名称" align="center" prop="regionName" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="区域编号" align="center" prop="regionCode" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="设备/管线编号" align="center" prop="devCode" :show-overflow-tooltip="true" width="130"/>
       <el-table-column label="设备/管线描述" align="center" prop="devDescribe" :show-overflow-tooltip="true"

ui/src/views/base/point/index.vue

@@ -231,24 +231,24 @@
                        :show-overflow-tooltip="true"/>
       <el-table-column label="泄漏程度" align="center" prop="leakageDegree" :formatter="leakageFormat"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="装置名称" align="center" prop="plantName" :show-overflow-tooltip="true"/>
+      <el-table-column label="装置名称" align="center" prop="plantName" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="装置编码" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column label="装置类别" align="center" prop="plantType" :formatter="plantTypeFormat"/>
       <el-table-column label="区域名称" align="center" prop="regionName" :show-overflow-tooltip="true"/>
       <el-table-column label="区域编码" align="center" prop="regionCode" :show-overflow-tooltip="true"/>
       <el-table-column label="设备/管线名称" align="center" prop="devName" width="150" :show-overflow-tooltip="true"/>
       <el-table-column label="设备/管线编码" align="center" prop="devCode" width="150" :show-overflow-tooltip="true"/>
-      <el-table-column label="介质" align="center" prop="medium" :show-overflow-tooltip="true"/>
+      <el-table-column label="介质" align="center" prop="medium" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="介质状态" align="center" prop="mediumType" :formatter="mediumTypeFormat"
                        :show-overflow-tooltip="true"/>
       <el-table-column label="密封点类型" align="center" prop="pointType" width="100" :formatter="pointFormat"
                        :show-overflow-tooltip="true"/>
       <el-table-column label="平台(层)" align="center" prop="layer" :show-overflow-tooltip="true"/>
-      <el-table-column label="群组位置" align="center" prop="groupPosition" :show-overflow-tooltip="true"/>
-      <el-table-column label="密封点位置" align="center" prop="pointPosition" width="110"
+      <el-table-column label="群组位置" align="center" prop="groupPosition" :show-overflow-tooltip="true"  width="150"/>
+      <el-table-column label="密封点位置" align="center" prop="pointPosition" width="180"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="群组编码" align="center" prop="groupCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="扩展编码" align="center" prop="extendCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="群组编码" align="center" prop="groupCode" :show-overflow-tooltip="true"  width="180"/>
+      <el-table-column label="扩展编码" align="center" prop="extendCode" :show-overflow-tooltip="true"  width="150"/>
       <el-table-column label="密封点子类型" align="center" prop="subPointType" width="110"
                        :show-overflow-tooltip="true"/>
       <el-table-column label="公称直径(mm)" align="center" prop="dia" width="110" :show-overflow-tooltip="true"/>
@@ -265,7 +265,7 @@
           <span>{{ parseTime(scope.row.runTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="PID图号" align="center" prop="pidNo" :show-overflow-tooltip="true">
+      <el-table-column label="PID图号" align="center" prop="pidNo" :show-overflow-tooltip="true"  width="180">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -277,7 +277,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="群组照片号" align="center" prop="picNo" width="110" :show-overflow-tooltip="true">
+      <el-table-column label="群组照片号" align="center" prop="picNo" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button
             size="mini"

ui/src/views/base/region/index.vue

@@ -114,7 +114,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="regionList" @selection-change="handleSelectionChange" :height="clientHeight" :cell-style="tableCellStyle">
+    <el-table v-loading="loading" :data="regionList" @selection-change="handleSelectionChange" border :height="clientHeight" :cell-style="tableCellStyle">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="审核状态" align="center" prop="approveStatus" :formatter="approveStatusFormat"/>
       <el-table-column label="装置编号" align="center" prop="plantCode" />

ui/src/views/check/laws/index.vue

@@ -68,23 +68,23 @@
     <el-table v-loading="loading" :data="lawsList" @selection-change="handleSelectionChange" :height="clientHeight"
               border>
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="法规编号" align="center" prop="code" :show-overflow-tooltip="true"/>
-      <el-table-column label="法规名称" align="center" prop="name" :show-overflow-tooltip="true"/>
-      <el-table-column label="法规类型" align="center" prop="type" :show-overflow-tooltip="true"/>
-      <el-table-column label="匹配状态" align="center" prop="status" :formatter="matchStatusFormat"/>
+      <el-table-column label="法规编号" align="center" prop="code" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="法规名称" align="center" prop="name" :show-overflow-tooltip="true"  width="400"/>
+      <el-table-column label="法规类型" align="center" prop="type" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="匹配状态" align="center" prop="status" :formatter="matchStatusFormat" width="180"/>
       <el-table-column label="匹配开始时间" align="center" prop="starttime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.starttime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks"/>
-      <el-table-column label="维护人" align="center" prop="updater"/>
+      <el-table-column label="备注" align="center" prop="remarks" width="180"/>
+      <el-table-column label="维护人" align="center" prop="updater" width="180"/>
       <el-table-column label="维护时间" align="center" prop="updatedate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

ui/src/views/task/repair/index.vue

@@ -86,7 +86,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDivide"
-          v-hasPermi="['task:repairs:edit']"
+          v-hasPermi="['task:repair:edit']"
         >确认分配
         </el-button>
       </el-col>