地图隐患信息列表接口设置参数、列表页空白字段占位符、详情页权限标识

gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceReportDataController.java

@@ -37,7 +37,7 @@ public class TDeviceReportDataController extends BaseController
     private ITDeviceReportDataService tDeviceReportDataService;
 
     /**
-     * 查询设备监控列表
+     * 查询设备历史监控列表
      */
     @PreAuthorize("@ss.hasPermi('dataMonitoring:reportData:list')")
     @GetMapping("/list")
@@ -49,7 +49,7 @@ public class TDeviceReportDataController extends BaseController
     }
 
     /**
-     * 查询设备监控列表
+     * 查询设备实时监控列表
      */
     @PreAuthorize("@ss.hasPermi('dataMonitoring:reportData:realtimeList')")
     @GetMapping("/realtimeList")

gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java

@@ -53,9 +53,9 @@ public class THiddenTroubleController extends BaseController
      * @return
      */
     @GetMapping("/getMapHiddenTroublelist")
-    public AjaxResult getMapHiddenTroublelist()
+    public AjaxResult getMapHiddenTroublelist(String troubleName)
     {
-        List<HiddenTroubleVo> list = tHiddenTroubleService.getMapTHiddenTroubleList();
+        List<HiddenTroubleVo> list = tHiddenTroubleService.getMapTHiddenTroubleList(troubleName);
         return AjaxResult.success(list);
     }
 

gassafety-system/src/main/java/com/zehong/system/mapper/THiddenTroubleMapper.java

@@ -33,7 +33,7 @@ public interface THiddenTroubleMapper
      * @param
      * @return 隐患信息集合
      */
-    public List<THiddenTrouble> getMapTHiddenTroubleList();
+    public List<THiddenTrouble> getMapTHiddenTroubleList(String troubleName);
 
     /**
      * 新增隐患信息

gassafety-system/src/main/java/com/zehong/system/service/ITHiddenTroubleService.java

@@ -34,7 +34,7 @@ public interface ITHiddenTroubleService
      * @param
      * @return 隐患信息集合
      */
-    public List<HiddenTroubleVo> getMapTHiddenTroubleList();
+    public List<HiddenTroubleVo> getMapTHiddenTroubleList(String troubleName);
 
     /**
      * 新增隐患信息

gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java

@@ -117,10 +117,10 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
      * @return 隐患信息集合
      */
     @Override
-    public List<HiddenTroubleVo> getMapTHiddenTroubleList()
+    public List<HiddenTroubleVo> getMapTHiddenTroubleList(String troubleName)
     {
         List<HiddenTroubleVo> list = new ArrayList<>();
-        List<THiddenTrouble> troubleList = tHiddenTroubleMapper.getMapTHiddenTroubleList();
+        List<THiddenTrouble> troubleList = tHiddenTroubleMapper.getMapTHiddenTroubleList(troubleName);
 
         if(troubleList.size() != 0) {
             for (THiddenTrouble temp : troubleList) {

gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml

@@ -49,9 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
-    <select id="getMapTHiddenTroubleList" resultMap="THiddenTroubleResult">
+    <select id="getMapTHiddenTroubleList" parameterType="String" resultMap="THiddenTroubleResult">
         <include refid="selectTHiddenTroubleVo"/>
-        where is_del = '0' and (deal_status is null or deal_status = '3')
+        <where> is_del = '0' and (deal_status is null or deal_status = '3')
+            <if test="troubleName != null"> and trouble_name like concat('%', #{troubleName}, '%')</if>
+        </where>
         order by create_time desc
     </select>
     

gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue

@@ -124,7 +124,8 @@
             size="normal"
             type="text"
             icon="el-icon-edit"
-            @click="showDetail(scope.row)">
+            @click="showDetail(scope.row)"
+            v-hasPermi="['dataMonitoring:deviceAlarm:query']">
             详情
           </el-button>
         </template>

gassafety-web/src/views/dataMonitoring/realtimeData/index.vue

@@ -49,7 +49,7 @@
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
-            v-hasPermi="['system:data:export']"
+            v-hasPermi="['dataMonitoring:reportData:query']"
           >详情</el-button>
         </template>
       </el-table-column>

gassafety-web/src/views/device/deviceInfo/index.vue

@@ -97,7 +97,12 @@
       <el-table-column label="设备型号" align="center" prop="deviceModel" />
       <el-table-column label="所在地址" align="center" prop="deviceAddr" />
       <el-table-column label="安装日期" align="center" prop="installationTime" width="180" />
-      <el-table-column label="最后巡检日期" align="center" prop="inspectionTime" width="180" />
+      <el-table-column label="最后巡检日期" align="center" prop="inspectionTime" width="180" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.inspectionTime != null">{{ scope.row.inspectionTime }}</span>
+          <span v-if="scope.row.inspectionTime == null">-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -112,6 +117,7 @@
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
+            v-hasPermi="['device:deviceInfo:query']"
           >详情</el-button>
           <el-button
             size="mini"

gassafety-web/src/views/device/pipe/index.vue

@@ -102,7 +102,12 @@
       <el-table-column label="管道长度" align="center" prop="pipeLength" />
       <el-table-column label="所在地址" align="center" prop="pipeAddr" />
       <el-table-column label="安装日期" align="center" prop="installationTime" width="180" />
-      <el-table-column label="最后巡检日期" align="center" prop="inspectionTime" width="180" />
+      <el-table-column label="最后巡检日期" align="center" prop="inspectionTime" width="180" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.inspectionTime != null">{{ scope.row.inspectionTime }}</span>
+          <span v-if="scope.row.inspectionTime == null">-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -117,6 +122,7 @@
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
+            v-hasPermi="['device:pipe:query']"
           >详情</el-button>
           <el-button
             size="mini"

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -51,7 +51,12 @@
         </template>
       </el-table-column>
       <el-table-column label="地址" align="center" prop="address"/>
-      <el-table-column label="计划描述" align="center" prop="remarks"/>
+      <el-table-column label="计划描述" align="center" prop="remarks">
+        <template slot-scope="scope">
+          <span v-if="scope.row.remarks != null">{{ scope.row.remarks }}</span>
+          <span v-if="scope.row.remarks == null">-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="计划状态" align="center" prop="planStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.planStatus == 0">未生成工单</span>
@@ -85,6 +90,7 @@
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
+            v-hasPermi="['deviceInspection:inspectionPlan:query']"
           >详情</el-button>
           <el-button
             size="normal"
@@ -270,6 +276,9 @@
           endTime: [
             { required: true, message: "请选择结束时间", trigger: "blur" }
           ],
+          address: [
+            { required: true, message: "请输入地址", trigger: "blur" }
+          ],
           appointInspector: [
             { required: true, message: "请选择巡检人员", trigger: "blur" }
           ],

gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue

@@ -102,6 +102,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleIsDel(scope.row)"
+            v-hasPermi="['riskManagement:hiddenTrouble:query']"
             v-if="scope.row.orderId == '' || scope.row.orderId == null"
           >作废
           </el-button>

gassafety-web/src/views/workOrder/basicsInfo/index.vue

@@ -84,10 +84,16 @@
       </el-table-column>
       <el-table-column label="更新时间" align="center" prop="actualTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.actualTime) }}</span>
+          <span v-if="scope.row.actualTime != null">{{ scope.row.actualTime }}</span>
+          <span v-if="scope.row.actualTime == null">-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工单描述" align="center" prop="remarks" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.remarks != null">{{ scope.row.remarks }}</span>
+          <span v-if="scope.row.remarks == null">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="工单描述" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -111,6 +117,7 @@
           type="text"
           icon="el-icon-edit"
           @click="showDetail(scope.row)"
+          v-hasPermi="['workOrder:basicsInfo:query']"
         >详情</el-button>
         </template>
       </el-table-column>

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -82,10 +82,16 @@
       </el-table-column>
       <el-table-column label="更新时间" align="center" prop="actualTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.actualTime) }}</span>
+          <span v-if="scope.row.actualTime != null">{{ scope.row.actualTime }}</span>
+          <span v-if="scope.row.actualTime == null">-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工单描述" align="center" prop="remarks" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.remarks != null">{{ scope.row.remarks }}</span>
+          <span v-if="scope.row.remarks == null">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="工单描述" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -109,6 +115,7 @@
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
+            v-hasPermi="['workOrder:basicsInfo:query']"
           >详情</el-button>
         </template>
       </el-table-column>
@@ -323,7 +330,7 @@
       handleReceive(row) {
         if (row.orderStatus == '0') {
           const orderIds = row.orderId,
-            orderName = roe.orderName;
+            orderName = row.orderName;
           this.$confirm('是否确认接收工单(' + orderName + orderIds + ")", "操作提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",