左侧导航栏背景

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

@@ -56,33 +56,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
         SysUser sysUser = sysUserMapper.selectUserById(tHiddenTrouble.getReportMan());
         hiddenTroubleVo.setReportManName(sysUser.getNickName());
 
-        if (StringUtils.isNotEmpty(tHiddenTrouble.getTroubleType())) {
-            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_type");
-            for (SysDictData sysDictData : sysDictDataList) {
-                if (tHiddenTrouble.getTroubleType().equals(sysDictData.getDictValue())) {
-                    hiddenTroubleVo.setTroubleType(sysDictData.getDictLabel());
-                }
-            }
-        }
-        if (StringUtils.isNotEmpty(tHiddenTrouble.getTroubleLevel())) {
-            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_level");
-            for (SysDictData sysDictData : sysDictDataList) {
-                if (tHiddenTrouble.getTroubleLevel().equals(sysDictData.getDictValue())) {
-                    hiddenTroubleVo.setTroubleLevel(sysDictData.getDictLabel());
-                }
-            }
-        }
-        if (StringUtils.isNotEmpty(tHiddenTrouble.getDealStatus())) {
-            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_deal_status");
-            for (SysDictData sysDictData : sysDictDataList) {
-                if(tHiddenTrouble.getDealStatus() == null){
-                    hiddenTroubleVo.setDealStatus("暂未处理");
-                } else if (tHiddenTrouble.getDealStatus().equals(sysDictData.getDictValue())) {
-                    hiddenTroubleVo.setDealStatus(sysDictData.getDictLabel());
-                }
-            }
-        }
-
         if(tHiddenTrouble.getDeviceId() != null){
             if("0".equals(tHiddenTrouble.getDeviceType())){
                 TPipe pipe = tPipeMapper.selectTPipeById(tHiddenTrouble.getDeviceId());
@@ -131,22 +104,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
                     hiddenTroubleVo.setReportManName(sysUser.getNickName());
                 }
 
-                if (StringUtils.isNotEmpty(trouble.getTroubleType())) {
-                    List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_type");
-                    for (SysDictData sysDictData : sysDictDataList) {
-                        if (trouble.getTroubleType().equals(sysDictData.getDictValue())) {
-                            hiddenTroubleVo.setTroubleType(sysDictData.getDictLabel());
-                        }
-                    }
-                }
-                if (StringUtils.isNotEmpty(trouble.getTroubleLevel())) {
-                    List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_level");
-                    for (SysDictData sysDictData : sysDictDataList) {
-                        if (trouble.getTroubleLevel().equals(sysDictData.getDictValue())) {
-                            hiddenTroubleVo.setTroubleLevel(sysDictData.getDictLabel());
-                        }
-                    }
-                }
                 list.add(hiddenTroubleVo);
             }
         }

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

@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="communicationStatus != null  and communicationStatus != ''"> and t.communication_status = #{communicationStatus}</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and t.device_status = #{deviceStatus}</if>
         </where>
+        order by t.report_time desc
     </select>
 
     <select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">

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

@@ -46,11 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl != null  and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
             <if test="reportMan != null "> and report_man = #{reportMan}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="getMapTHiddenTroubleList" resultMap="THiddenTroubleResult">
         <include refid="selectTHiddenTroubleVo"/>
         where is_del = '0' and (deal_status is null or deal_status = '3')
+        order by create_time desc
     </select>
     
     <select id="selectTHiddenTroubleById" parameterType="int" resultMap="THiddenTroubleResult">

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

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planStatus != null  and planStatus != ''"> and plan_status = #{planStatus}</if>
             <if test="remarks != null "> and remarks &lt;= #{remarks}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTInspectionPlanById" parameterType="int" resultMap="TInspectionPlanResult">

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endAllotTime != null "> and t.allot_time &lt;= #{endAllotTime}</if>
             <if test="userName != null  and userName != ''"> and s.user_name = #{userName}</if>
         </where>
+        order by t.allot_time desc
     </select>
     
     <select id="selectTWorkOrderById" parameterType="String" resultMap="TWorkOrderResult">

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

@@ -15,12 +15,12 @@
       <el-row style="padding-left: 50px;">
         <el-col :span="6">
           <el-form ref="form" v-model="form" style="width: 100%;">
-            <el-form-item label="设备名称:" prop="deviceCode">
-              <font>{{form.deviceName}}</font>
-            </el-form-item>
             <el-form-item label="设备类型:" prop="deviceType">
               <font>{{form.deviceType}}</font>
             </el-form-item>
+            <el-form-item label="设备编号:" prop="deviceCode">
+              <font>{{form.deviceCode}}</font>
+            </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="6">
@@ -548,9 +548,7 @@ export default {
       getDetail (){
         getDeviceAlarm(this.alarmId).then(response =>{
           this.form = response.data;
-          this.active = parseInt(response.data.orderStatus) + 1;
-          // this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
-          // this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form);
+          console.log("this.form", this.form);
 
           if(this.form.pipeList != null){
             let pipe = this.form.pipeList[0];
@@ -593,7 +591,6 @@ export default {
           console.log("getData2", getData2)
           console.log("getData3", getData3)
 
-          console.log("55555555555", this.form.deviceReportDataList)
 
           if(this.form.orderType == '1') {
             // 获取设备列表树

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

@@ -91,8 +91,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange" >
-<!--      <el-table-column type="selection" width="55" align="center" />-->
+    <el-table v-loading="loading" :data="deviceAlarmList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange" >
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
       <el-table-column label="设备类型" align="center" prop="deviceType" />
@@ -135,8 +134,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList" />
 
     <!-- 添加工单信息对话框 -->
@@ -202,6 +201,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 报警信息表格数据
       deviceAlarmList: [],
       // 报警类型字典
@@ -225,8 +226,6 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         deviceCode: null,
         orderId: null,
         alarmType: null,
@@ -307,7 +306,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

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

@@ -22,7 +22,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
@@ -39,7 +39,7 @@
       <el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
       <el-table-column label="温度(℃)" align="center" prop="temperature" />
       <el-table-column label="压力(KPa)" align="center" prop="pressure" />
-      <el-table-column label="上报时间" align="center" prop="reportTime" />
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="180px"/>
       <el-table-column label="设备状态" align="center" prop="deviceStatus" >
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -58,8 +58,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -89,6 +89,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 设备监控表格数据
       dataList: [],
       // 弹出层标题
@@ -97,8 +99,6 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         deviceNum: null,
         standardConditionAccumulation: null,
         workingConditionAccumulation: null,
@@ -158,7 +158,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

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

@@ -22,8 +22,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
+    <el-table v-loading="loading" :data="dataList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
       <el-table-column label="设备类型" align="center" prop="deviceType" >
@@ -39,27 +38,16 @@
       <el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
       <el-table-column label="温度(℃)" align="center" prop="temperature" />
       <el-table-column label="压力(KPa)" align="center" prop="pressure" />
-      <el-table-column label="上报时间" align="center" prop="reportTime" />
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="180px"/>
       <el-table-column label="设备状态" align="center" prop="deviceStatus" >
       </el-table-column>
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="showDetail(scope.row)"
-            v-hasPermi="['system:data:export']"
-          >详情</el-button>
-        </template>
-      </el-table-column> -->
     </el-table>
 
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -89,6 +77,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 设备监控表格数据
       dataList: [],
       // 弹出层标题
@@ -97,8 +87,6 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         deviceNum: null,
         standardConditionAccumulation: null,
         workingConditionAccumulation: null,
@@ -158,7 +146,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -172,15 +160,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 工单详细信息跳转 */
-    showDetail(row) {
-      this.$router.push({
-        path: '/reportData/reportdetail',
-        query:{
-          orderId : row.orderId
-        }
-      }) //带参跳转
-    },
   }
 };
 </script>

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

@@ -82,7 +82,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="deviceInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="所属管道" align="center" prop="pipeName" />
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
@@ -127,8 +127,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -308,6 +308,8 @@
         showSearch: true,
         // 总条数
         total: 0,
+        pageNum: 1,
+        pageSize: 10,
         // 设备信息表格数据
         deviceInfoList: [],
         // 弹出层标题
@@ -325,8 +327,6 @@
         typeOptions: [],
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
           enterpriseId: null,
           deviceName: null,
           deviceCode: null,
@@ -453,7 +453,7 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.pageNum = 1;
         this.getList();
       },
       /** 重置按钮操作 */

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

@@ -118,7 +118,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="deviceList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备监控id" align="center" prop="monitorId" />
       <el-table-column label="设备" align="center" prop="deviceName" />
@@ -150,8 +150,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -295,6 +295,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 设备监控表格数据
       deviceList: [],
       // 弹出层标题
@@ -303,8 +305,6 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         deviceId: null,
         deviceThreshold: null,
         relationPipeId: null,
@@ -362,7 +362,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

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

@@ -82,7 +82,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="pipeList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="管道名称" align="center" prop="pipeName" />
       <el-table-column label="管道编号" align="center" prop="pipeCode" />
       <el-table-column label="管道类型" align="center" prop="pipeType" >
@@ -132,8 +132,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -269,6 +269,8 @@
         showSearch: true,
         // 总条数
         total: 0,
+        pageNum: 1,
+        pageSize: 10,
         // 管道信息表格数据
         pipeList: [],
         // 弹出层标题
@@ -287,8 +289,6 @@
         pressureOptions: [],
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
           enterpriseId: null,
           pipeName: null,
           pipeAddr: null,
@@ -405,7 +405,7 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.pageNum = 1;
         this.getList();
       },
       /** 重置按钮操作 */

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

@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="planStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择状态" clearable size="small">
+      <el-form-item label="计划状态" prop="planStatus">
+        <el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable size="small">
           <el-option
             v-for="dict in typeOptions"
             :key="dict.dictValue"
@@ -41,8 +41,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center"/>-->
+    <el-table v-loading="loading" :data="inspectionPlanList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="序号" type="index" align="center" prop="planName"/>
       <el-table-column label="巡检计划名称" align="center" prop="planName"/>
       <el-table-column label="计划时间" align="center" prop="startTime" width="280">
@@ -53,7 +52,7 @@
       </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="planStatus">
+      <el-table-column label="计划状态" align="center" prop="planStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.planStatus == 0">未生成工单</span>
           <span v-if="scope.row.planStatus == 1">已生成工单</span>
@@ -103,8 +102,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -216,6 +215,8 @@
         showSearch: true,
         // 总条数
         total: 0,
+        pageNum: 1,
+        pageSize: 10,
         // 巡检计划表格数据
         inspectionPlanList: [],
         // 计划状态字典
@@ -241,8 +242,6 @@
         open2: false,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
           planName: null,
           orderId: null,
           startTime: null,
@@ -349,7 +348,7 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.pageNum = 1;
         this.getList();
       },
       /** 重置按钮操作 */

gassafety-web/src/views/enterprise/info/index.vue

@@ -72,7 +72,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="infoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" />
       <el-table-column label="企业名称" align="center" prop="unitName" />
@@ -113,8 +113,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -194,6 +194,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 企业基本信息表格数据
       infoList: [],
       // 弹出层标题
@@ -203,8 +205,6 @@ export default {
       fileList: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         unitName: null,
         orgCode: null,
         orgFilePath: null,
@@ -296,7 +296,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

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

@@ -39,14 +39,24 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="hiddenTroubleList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="hiddenTroubleList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="隐患名称" align="center" prop="troubleName" />
-      <el-table-column label="隐患类型" align="center" prop="troubleType" />
-      <el-table-column label="隐患级别" align="center" prop="troubleLevel" />
+      <el-table-column label="隐患类型" align="center" prop="troubleType" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.troubleType == 1">设备老化</span>
+          <span v-if="scope.row.troubleType == 2">质保过期</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="隐患级别" align="center" prop="troubleLevel" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.troubleLevel == 1">Ⅰ级</span>
+          <span v-if="scope.row.troubleLevel == 2">Ⅱ级</span>
+          <span v-if="scope.row.troubleLevel == 3">Ⅲ级</span>
+        </template>
+      </el-table-column>
       <el-table-column label="图片" align="center" prop="pictureUrl" >
         <template slot-scope="scope">
           <el-image :src="scope.row.pictureUrl" :preview-src-list="[scope.row.pictureUrl]" v-if="scope.row.pictureUrl != '' && scope.row.pictureUrl != null" style="width: 16px;"></el-image>
-          <span v-if="scope.row.pictureUrl == '' || scope.row.pictureUrl == null">-</span>
         </template>
       </el-table-column>
       <el-table-column label="上报人" align="center" prop="reportManName" />
@@ -102,13 +112,13 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
     <!-- 添加或修改隐患信息对话框 -->
-    <el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body>
+    <el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body @close="cancel">
       <el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
         <el-col>
           <el-form-item label="隐患名称" prop="troubleName" style="width: 720px">
@@ -281,6 +291,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 隐患信息表格数据
       hiddenTroubleList: [],
       // 隐患类型字典
@@ -314,8 +326,6 @@ export default {
       open2: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         troubleName: null,
         troubleType: null,
         deviceId: null,
@@ -478,7 +488,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -524,6 +534,7 @@ export default {
       const troubleId = row.troubleId || this.ids
       getHiddenTrouble(troubleId).then(response => {
         this.form1 = response.data;
+        console.log("this.form1", this.form1);
         if(this.form1.deviceType != null && this.form1.deviceId != null){
           this.form1.device = [this.form1.deviceType, this.form1.deviceId];
         }

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

@@ -29,10 +29,13 @@
                   <font>{{form.troubleName}}</font>
                 </el-form-item>
                 <el-form-item label="隐患类型:" prop="troubleType">
-                  <font>{{form.troubleType}}</font>
+                  <font v-if="form.troubleType == 1">设备老化</font>
+                  <font v-if="form.troubleType == 2">质保过期</font>
                 </el-form-item>
                 <el-form-item label="隐患等级:" prop="troubleLevel">
-                  <font>{{form.troubleLevel}}</font>
+                  <font v-if="form.troubleLevel == 1">Ⅰ级</font>
+                  <font v-if="form.troubleLevel == 2">Ⅱ级</font>
+                  <font v-if="form.troubleLevel == 3">Ⅲ级</font>
                 </el-form-item>
                 <el-form-item label="隐患描述:" prop="remarks">
                   <div style="height: 90px;width: 200%; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
@@ -50,12 +53,12 @@
                   <font>{{form.createTime}}</font>
                 </el-form-item>
                 <el-form-item label="处理状态:" prop="dealStatus">
-                    <span v-if="form.orderId == null || form.orderId == ''">未生成工单</span>
-                    <span v-if="(form.dealStatus == null || form.dealStatus == '') &&
-                                form.orderId != null && form.orderId != ''">暂未处理</span>
-                    <span v-if="form.dealStatus == 1">不需处理</span>
-                    <span v-if="form.dealStatus == 2">已处理完成</span>
-                    <span v-if="form.dealStatus == 3">未处理完成</span>
+                  <font v-if="form.orderId == null || form.orderId == ''">未生成工单</font>
+                  <font v-if="(form.dealStatus == null || form.dealStatus == '') &&
+                              form.orderId != null && form.orderId != ''">暂未处理</font>
+                  <font v-if="form.dealStatus == 1">不需处理</font>
+                  <font v-if="form.dealStatus == 2">已处理完成</font>
+                  <font v-if="form.dealStatus == 3">未处理完成</font>
                 </el-form-item>
               </el-form>
             </el-col>

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

 <template>
   <div class="app-container basicsInfo">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <!-- <el-form-item label="工单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small">
           <el-option
@@ -57,7 +57,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="basicsInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="工单编号" align="center" prop="orderId" />
       <el-table-column label="工单类型" align="center" prop="orderType" >
         <template slot-scope="scope">
@@ -118,8 +118,8 @@
     <pagination
     v-show="total>0"
     :total="total"
-    :page.sync="queryParams.pageNum"
-    :limit.sync="queryParams.pageSize"
+    :page.sync="pageNum"
+    :limit.sync="pageSize"
     @pagination="getList"
   />
 
@@ -194,6 +194,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      pageNum: 1,
+      pageSize: 10,
       // 工单基础信息表格数据
       basicsInfoList: [],
       // 弹出层标题
@@ -210,8 +212,6 @@ export default {
       ordertypeOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         orderId: null,
         orderType: null,
         orderName: null,
@@ -280,7 +280,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

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

 <template>
   <div class="app-container basicsInfo">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <!-- <el-form-item label="工单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small">
           <el-option
@@ -57,7 +57,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="basicsInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
       <el-table-column label="工单编号" align="center" prop="orderId" />
       <el-table-column label="工单类型" align="center" prop="orderType" >
         <template slot-scope="scope">
@@ -116,8 +116,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="pageNum"
+      :limit.sync="pageSize"
       @pagination="getList"
     />
 
@@ -207,6 +207,8 @@
         showSearch: true,
         // 总条数
         total: 0,
+        pageNum: 1,
+        pageSize: 10,
         // 工单基础信息表格数据
         basicsInfoList: [],
         // 弹出层标题
@@ -226,8 +228,6 @@
         fileIndex: 0,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
           orderId: null,
           orderType: null,
           orderName: null,
@@ -305,7 +305,7 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.pageNum = 1;
         this.getList();
       },
       /** 重置按钮操作 */