Skip to content

G
gassafety
Commit 29a86624 authored by yaqizhang's avatar yaqizhang
Browse files
Options

左侧导航栏背景

parents a65e69c4 93d7f175
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 1134 deletions
gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java
View file @ 29a86624
...@@ -56,33 +56,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService ...@@ -56,33 +56,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
SysUser sysUser = sysUserMapper.selectUserById(tHiddenTrouble.getReportMan()); SysUser sysUser = sysUserMapper.selectUserById(tHiddenTrouble.getReportMan());
hiddenTroubleVo.setReportManName(sysUser.getNickName()); 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(tHiddenTrouble.getDeviceId() != null){
if("0".equals(tHiddenTrouble.getDeviceType())){ if("0".equals(tHiddenTrouble.getDeviceType())){
TPipe pipe = tPipeMapper.selectTPipeById(tHiddenTrouble.getDeviceId()); TPipe pipe = tPipeMapper.selectTPipeById(tHiddenTrouble.getDeviceId());
...@@ -131,22 +104,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService ...@@ -131,22 +104,6 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
hiddenTroubleVo.setReportManName(sysUser.getNickName()); 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); list.add(hiddenTroubleVo);
} }
} }
......
gassafety-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml
View file @ 29a86624
...@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -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="communicationStatus != null and communicationStatus != ''"> and t.communication_status = #{communicationStatus}</if>
<if test="deviceStatus != null and deviceStatus != ''"> and t.device_status = #{deviceStatus}</if> <if test="deviceStatus != null and deviceStatus != ''"> and t.device_status = #{deviceStatus}</if>
</where> </where>
order by t.report_time desc
</select> </select>
<select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo"> <select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">
......
gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml
View file @ 29a86624
...@@ -46,11 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -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="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="reportMan != null "> and report_man = #{reportMan}</if> <if test="reportMan != null "> and report_man = #{reportMan}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="getMapTHiddenTroubleList" resultMap="THiddenTroubleResult"> <select id="getMapTHiddenTroubleList" resultMap="THiddenTroubleResult">
<include refid="selectTHiddenTroubleVo"/> <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')
order by create_time desc
</select> </select>
<select id="selectTHiddenTroubleById" parameterType="int" resultMap="THiddenTroubleResult"> <select id="selectTHiddenTroubleById" parameterType="int" resultMap="THiddenTroubleResult">
......
gassafety-system/src/main/resources/mapper/system/TInspectionPlanMapper.xml
View file @ 29a86624
...@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -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="planStatus != null and planStatus != ''"> and plan_status = #{planStatus}</if>
<if test="remarks != null "> and remarks &lt;= #{remarks}</if> <if test="remarks != null "> and remarks &lt;= #{remarks}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="selectTInspectionPlanById" parameterType="int" resultMap="TInspectionPlanResult"> <select id="selectTInspectionPlanById" parameterType="int" resultMap="TInspectionPlanResult">
......
gassafety-system/src/main/resources/mapper/system/TWorkOrderMapper.xml
View file @ 29a86624
...@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -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="endAllotTime != null "> and t.allot_time &lt;= #{endAllotTime}</if>
<if test="userName != null and userName != ''"> and s.user_name = #{userName}</if> <if test="userName != null and userName != ''"> and s.user_name = #{userName}</if>
</where> </where>
order by t.allot_time desc
</select> </select>
<select id="selectTWorkOrderById" parameterType="String" resultMap="TWorkOrderResult"> <select id="selectTWorkOrderById" parameterType="String" resultMap="TWorkOrderResult">
......
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
View file @ 29a86624
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
<el-row style="padding-left: 50px;"> <el-row style="padding-left: 50px;">
<el-col :span="6"> <el-col :span="6">
<el-form ref="form" v-model="form" style="width: 100%;"> <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"> <el-form-item label="设备类型:" prop="deviceType">
<font>{{form.deviceType}}</font> <font>{{form.deviceType}}</font>
</el-form-item> </el-form-item>
<el-form-item label="设备编号:" prop="deviceCode">
<font>{{form.deviceCode}}</font>
</el-form-item>
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -548,9 +548,7 @@ export default { ...@@ -548,9 +548,7 @@ export default {
getDetail (){ getDetail (){
getDeviceAlarm(this.alarmId).then(response =>{ getDeviceAlarm(this.alarmId).then(response =>{
this.form = response.data; this.form = response.data;
this.active = parseInt(response.data.orderStatus) + 1; console.log("this.form", this.form);
// this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
// this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form);
if(this.form.pipeList != null){ if(this.form.pipeList != null){
let pipe = this.form.pipeList[0]; let pipe = this.form.pipeList[0];
...@@ -593,7 +591,6 @@ export default { ...@@ -593,7 +591,6 @@ export default {
console.log("getData2", getData2) console.log("getData2", getData2)
console.log("getData3", getData3) console.log("getData3", getData3)
console.log("55555555555", this.form.deviceReportDataList)
if(this.form.orderType == '1') { if(this.form.orderType == '1') {
// 获取设备列表树 // 获取设备列表树
......
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @ 29a86624
...@@ -91,8 +91,7 @@ ...@@ -91,8 +91,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange" > <el-table v-loading="loading" :data="deviceAlarmList.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="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <el-table-column label="设备编号" align="center" prop="deviceCode" />
<el-table-column label="设备类型" align="center" prop="deviceType" /> <el-table-column label="设备类型" align="center" prop="deviceType" />
...@@ -135,8 +134,8 @@ ...@@ -135,8 +134,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 添加工单信息对话框 --> <!-- 添加工单信息对话框 -->
...@@ -202,6 +201,8 @@ export default { ...@@ -202,6 +201,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 报警信息表格数据 // 报警信息表格数据
deviceAlarmList: [], deviceAlarmList: [],
// 报警类型字典 // 报警类型字典
...@@ -225,8 +226,6 @@ export default { ...@@ -225,8 +226,6 @@ export default {
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode: null, deviceCode: null,
orderId: null, orderId: null,
alarmType: null, alarmType: null,
...@@ -307,7 +306,7 @@ export default { ...@@ -307,7 +306,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/dataMonitoring/realtimeData/index.vue
View file @ 29a86624
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</el-form-item> </el-form-item>
</el-form> </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 type="selection" width="55" align="center" />-->
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <el-table-column label="设备编号" align="center" prop="deviceCode" />
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" /> <el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
<el-table-column label="温度(℃)" align="center" prop="temperature" /> <el-table-column label="温度(℃)" align="center" prop="temperature" />
<el-table-column label="压力(KPa)" align="center" prop="pressure" /> <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 label="设备状态" align="center" prop="deviceStatus" >
</el-table-column> </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">
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -89,6 +89,8 @@ export default { ...@@ -89,6 +89,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据 // 设备监控表格数据
dataList: [], dataList: [],
// 弹出层标题 // 弹出层标题
...@@ -97,8 +99,6 @@ export default { ...@@ -97,8 +99,6 @@ export default {
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
deviceNum: null, deviceNum: null,
standardConditionAccumulation: null, standardConditionAccumulation: null,
workingConditionAccumulation: null, workingConditionAccumulation: null,
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/dataMonitoring/reportData/index.vue
View file @ 29a86624
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
</el-form-item> </el-form-item>
</el-form> </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="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <el-table-column label="设备编号" align="center" prop="deviceCode" />
<el-table-column label="设备类型" align="center" prop="deviceType" > <el-table-column label="设备类型" align="center" prop="deviceType" >
...@@ -39,27 +38,16 @@ ...@@ -39,27 +38,16 @@
<el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" /> <el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
<el-table-column label="温度(℃)" align="center" prop="temperature" /> <el-table-column label="温度(℃)" align="center" prop="temperature" />
<el-table-column label="压力(KPa)" align="center" prop="pressure" /> <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 label="设备状态" align="center" prop="deviceStatus" >
</el-table-column> </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> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -89,6 +77,8 @@ export default { ...@@ -89,6 +77,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据 // 设备监控表格数据
dataList: [], dataList: [],
// 弹出层标题 // 弹出层标题
...@@ -97,8 +87,6 @@ export default { ...@@ -97,8 +87,6 @@ export default {
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
deviceNum: null, deviceNum: null,
standardConditionAccumulation: null, standardConditionAccumulation: null,
workingConditionAccumulation: null, workingConditionAccumulation: null,
...@@ -158,7 +146,7 @@ export default { ...@@ -158,7 +146,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
...@@ -172,15 +160,6 @@ export default { ...@@ -172,15 +160,6 @@ export default {
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 工单详细信息跳转 */
showDetail(row) {
this.$router.push({
path: '/reportData/reportdetail',
query:{
orderId : row.orderId
}
}) //带参跳转
},
} }
}; };
</script> </script>
gassafety-web/src/views/dataMonitoring/reportData/reportdetail.vue deleted 100644 → 0
View file @ a65e69c4
<template>
<div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<div style="padding-top: 10px;background: #fff;height: 100%;">
<div>
<div style="width: 5%;height: 45px;margin-left: 20px;" @click="$router.go(-1)">
<el-button
size="medium"
type="text"
style="font-size: 18px; color: rgb(7, 63, 112);float: left;"
>返回</el-button>
<div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
</div>
</div>
<div style="width: 100%;height: 350px;padding: 10px;height: 300px;">
<div style="width: 66.6%;float: left;height: 100%;">
<el-table
:data="tableData"
style="width: 100%">
<el-table-column
prop="date"
label="日期"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="地址">
</el-table-column>
</el-table>
<el-table
:data="tableData"
style="width: 100%;margin-top: 20px;">
<el-table-column
prop="date"
label="日期"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="地址">
</el-table-column>
</el-table>
<el-table
:data="tableData"
style="width: 100%;margin-top: 20px;">
<el-table-column
prop="date"
label="日期"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="地址">
</el-table-column>
</el-table>
</div>
<div id="marbox" style="width: 33%;height: 350px; border: 1px solid rgb(218, 213, 213);float: right;margin-top: -45px;">
<div style="width: 100%;height: 100%" id="container"></div>
</div>
</div>
<div style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;">
<div id="main1" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div>
<div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div>
</div>
<div style="height: 320px;width: 100%;padding: 10px;">
<div id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div>
<div id="main4" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div>
</div>
</div>
</div>
</template>
<script>
import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, exportBasicsInfo } from "@/api/workOrder/basicsInfo";
import { deviceTree } from "@/api/device/deviceInfo";
import gaodeMap from "utils/gaodeMap.js";
import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
import { inspectorList } from "@/api/system/user";
import echarts from 'echarts';
// Vue.prototype.$echarts = echarts;
export default {
name: "BasicsInfo",
components: {
},
data() {
return {
tableData: [{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
},],
inspector: [],
isDisplay:false,
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
imageUrl: '',
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 工单基础信息表格数据
basicsInfoList: [],
// feedbackList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 工单状态字典
typeOptions: [],
pickerOptions:[],
// 工单类型字典
ordertypeOptions: [],
// 设备树选项
deviceOptions: [
{
label: "设备列表",
childList: []
}
],
defaultProps: {
children: "childList",
label: "label"
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderType: null,
orderName: null,
orderStatus: null,
appointInspector: null,
allotTime: null,
actualInspector: null,
actualTime: null,
remarks: null
},
// 表单参数
form: {},
activity: {},
// 表单校验
rules: {
},
active : 0,
orderId : "",
showAndHide : false
};
},
created() {
// 如果是跳转来的，则接受初始化参数
// this.user_id = this.$route.query.id; //详细信息页接收参数
this.orderId = this.$route.query.orderId;
this.getList();
this.getDicts("t_order_status").then(response => {
this.typeOptions = response.data;
});
this.getDicts("t_order_type").then(response => {
this.ordertypeOptions = response.data;
});
this.getBasicsInfo();
},
mounted(){
let gaoMap = new gaodeMap("石家庄");
this.gaoMap = gaoMap;
this.getBasicsInfo();
this.initData();
this.drawPieChart();
this.main3();
this.main4();
},
methods: {
getInspectorList(){
this.loading = true;
inspectorList().then(response => {
this.inspector = response.data;
this.loading = false;
});
},
// getMap() {
// var myChart = this.$echarts.init(document.getElementById('map'))
// let option = {
// xAxis: {
// type: 'category',
// // data: this.dataX,
// data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
// boundaryGap: false, //控制日期是否在中间显示
// axisLabel: {
// show: true, //是否显示日期
// interval: 0, //强制显示全部 // rotate: 40,//倾斜的角度
// textStyle: {
// color: '#000', //日期的颜色
// fontSize: 12 //字体的大小
// }
// },
// axisLine: {
// lineStyle: {
// color: '#ccc' // x轴的颜色
// }
// }
// },
// yAxis: {
// type: 'value',
// axisLabel: {
// formatter: '{value}',
// textStyle: {
// color: '#000' //数字的颜色
// },
// inside: false //控制数据是否在内侧还是外侧显示
// },
// axisLine: {
// lineStyle: {
// color: '#ccc' // 折线的颜色
// }
// }
// },
// series: [
// {
// // data: this.dataY,
// data: [820, 932, 901, 934, 1290, 1330, 1320],
// type: 'line',
// symbol: 'circle', //是否显示实心的折线圆点
// smooth: true, //让折线有弧度
// symbolSize: 7, //折线圆点的大小
// itemStyle: {
// normal: {
// color: '#efc883', //折线点的颜色
// lineStyle: {
// color: '#efc883' //折线的颜色
// },
// label: { show: true } //是否在折线点上显示数字
// }
// }
// }
// ]
// }
// myChart.setOption(option)
// },
initData() {
// 基于准备好的dom，初始化echarts实例
var myChart1 = echarts.init(document.getElementById('main1'));
// let that=this;
// var getData1 = [];
// var getData2 = [];
// METHOD.axiosGet(
// this,
// `/enterpriseInfo/getNumberByRegulation`,
// function(res) {
// if (res.code === 0) {
// //先进行赋值
// for(let i=0; i<res.data.result.length; i++) {
// var obj = new Object();
// var arr = new Object();
// // obj.name = res.data.result[i].name;
// // obj.value = res.data.result[i].number;
// obj.name = res.data.result[i].type;
// obj.value = res.data.result[i].number;
// arr = res.data.result[i].type;
// getData1[i] = obj;
// getData2[i] = arr;
// }
// myChart1.setOption({
// legend: {
// data: getData2,
// },
// series:[{
// data: getData1,
// }]
// })
// }
// });
// 绘制图表
myChart1.setOption({
title: {
text: '折线图堆叠'
},
tooltip: {
trigger: 'axis'
},
legend: {
data: ['标况累积量', '工况累积量']
},
xAxis: {
type: 'category',
// data: this.dataX,
data: ['23', '44', '77', '34', '56', '88', '38','68','55','99','44','33'],
boundaryGap: false, //控制日期是否在中间显示
axisLabel: {
show: true, //是否显示日期
interval: 0, //强制显示全部 // rotate: 40,//倾斜的角度
textStyle: {
color: '#000', //日期的颜色
fontSize: 12 //字体的大小
}
},
axisLine: {
lineStyle: {
color: '#ccc' // x轴的颜色
}
}
},
yAxis: {
type: 'value',
axisLabel: {
formatter: '{value}',
textStyle: {
color: '#000' //数字的颜色
},
inside: false //控制数据是否在内侧还是外侧显示
},
axisLine: {
lineStyle: {
color: '#ccc' // 折线的颜色
}
}
},
series: [
{
// data: this.dataY,
name:'工况累计量',
data: [820, 232, 901, 534, 1290, 330, 1320, 345, 654, 189, 980, 234],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#efc883', //折线点的颜色
lineStyle: {
color: '#efc883' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
},
{
// data: this.dataY,
name:'工况累计量',
data: [500, 600, 700, 300, 1100, 130, 1200, 820, 932, 901, 934, 1290],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#053B6A', //折线点的颜色
lineStyle: {
color: '#053B6A' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
}
]
});
},
drawPieChart(){
// 基于准备好的dom，初始化echarts实例
var myChart2 = echarts.init(document.getElementById('main2'));
// let that=this;
// var getData1 = [];
// var getData2 = [];
// METHOD.axiosGet(
// this,
// `/enterpriseGoods/getNumberByEnterprise`,
// function(res) {
// if (res.code === 0) {
// //先进行赋值
// for(let i=0; i<res.data.result.length; i++) {
// var obj = new Object();
// var arr = new Object();
// // obj = res.data.result[i].number;
// // arr = res.data.result[i].type;
// obj = res.data.result[i].number;
// arr = res.data.result[i].name;
// getData1[i] = obj;
// getData2[i] = arr;
// }
// myChart2.setOption({
// xAxis: {
// data: getData2,
// },
// series:[{
// data: getData1,
// }]
// })
// }
// });
// 绘制图表
myChart2.setOption({
// color:['rgb(8,252,7)','rgb(255,168,0)','rgb(0,121,254)','rgb(0,255,251)','rgb(3,120,251)','rgb(0,200,251)'],
xAxis: {
type: 'category',
// data: this.dataX,
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
boundaryGap: false, //控制日期是否在中间显示
axisLabel: {
show: true, //是否显示日期
interval: 0, //强制显示全部 // rotate: 40,//倾斜的角度
textStyle: {
color: '#000', //日期的颜色
fontSize: 12 //字体的大小
}
},
axisLine: {
lineStyle: {
color: '#ccc' // x轴的颜色
}
}
},
yAxis: {
type: 'value',
axisLabel: {
formatter: '{value}',
textStyle: {
color: '#000' //数字的颜色
},
inside: false //控制数据是否在内侧还是外侧显示
},
axisLine: {
lineStyle: {
color: '#ccc' // 折线的颜色
}
}
},
series: [
{
// data: this.dataY,
data: [820, 932, 901, 934, 1290, 1330, 1320],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#efc883', //折线点的颜色
lineStyle: {
color: '#efc883' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
},
{
// data: this.dataY,
data: [500, 600, 700, 300, 1100, 130, 1200],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#053B6A', //折线点的颜色
lineStyle: {
color: '#053B6A' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
}
]
});
},
main3() {
// 基于准备好的dom，初始化echarts实例
var myChart3 = echarts.init(document.getElementById('main3'));
// let that=this;
// var getData1 = [];
// var getData2 = [];
// METHOD.axiosGet(
// this,
// `/enterpriseInfo/getNumberByRegulation`,
// function(res) {
// if (res.code === 0) {
// //先进行赋值
// for(let i=0; i<res.data.result.length; i++) {
// var obj = new Object();
// var arr = new Object();
// // obj.name = res.data.result[i].name;
// // obj.value = res.data.result[i].number;
// obj.name = res.data.result[i].type;
// obj.value = res.data.result[i].number;
// arr = res.data.result[i].type;
// getData1[i] = obj;
// getData2[i] = arr;
// }
// myChart1.setOption({
// legend: {
// data: getData2,
// },
// series:[{
// data: getData1,
// }]
// })
// }
// });
// 绘制图表
myChart3.setOption({
xAxis: {
type: 'category',
// data: this.dataX,
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
boundaryGap: false, //控制日期是否在中间显示
axisLabel: {
show: true, //是否显示日期
interval: 0, //强制显示全部 // rotate: 40,//倾斜的角度
textStyle: {
color: '#000', //日期的颜色
fontSize: 12 //字体的大小
}
},
axisLine: {
lineStyle: {
color: '#ccc' // x轴的颜色
}
}
},
yAxis: {
type: 'value',
axisLabel: {
formatter: '{value}',
textStyle: {
color: '#000' //数字的颜色
},
inside: false //控制数据是否在内侧还是外侧显示
},
axisLine: {
lineStyle: {
color: '#ccc' // 折线的颜色
}
}
},
series: [
{
// data: this.dataY,
data: [820, 932, 901, 934, 1290, 1330, 1320],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#efc883', //折线点的颜色
lineStyle: {
color: '#efc883' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
},
{
// data: this.dataY,
data: [500, 600, 700, 300, 1100, 130, 1200],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#053B6A', //折线点的颜色
lineStyle: {
color: '#053B6A' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
}
]
});
},
main4() {
// 基于准备好的dom，初始化echarts实例
var myChart4 = echarts.init(document.getElementById('main4'));
// let that=this;
// var getData1 = [];
// var getData2 = [];
// METHOD.axiosGet(
// this,
// `/enterpriseInfo/getNumberByRegulation`,
// function(res) {
// if (res.code === 0) {
// //先进行赋值
// for(let i=0; i<res.data.result.length; i++) {
// var obj = new Object();
// var arr = new Object();
// // obj.name = res.data.result[i].name;
// // obj.value = res.data.result[i].number;
// obj.name = res.data.result[i].type;
// obj.value = res.data.result[i].number;
// arr = res.data.result[i].type;
// getData1[i] = obj;
// getData2[i] = arr;
// }
// myChart1.setOption({
// legend: {
// data: getData2,
// },
// series:[{
// data: getData1,
// }]
// })
// }
// });
// 绘制图表
myChart4.setOption({
xAxis: {
type: 'category',
// data: this.dataX,
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
boundaryGap: false, //控制日期是否在中间显示
axisLabel: {
show: true, //是否显示日期
interval: 0, //强制显示全部 // rotate: 40,//倾斜的角度
textStyle: {
color: '#000', //日期的颜色
fontSize: 12 //字体的大小
}
},
axisLine: {
lineStyle: {
color: '#ccc' // x轴的颜色
}
}
},
yAxis: {
type: 'value',
axisLabel: {
formatter: '{value}',
textStyle: {
color: '#000' //数字的颜色
},
inside: false //控制数据是否在内侧还是外侧显示
},
axisLine: {
lineStyle: {
color: '#ccc' // 折线的颜色
}
}
},
series: [
{
// data: this.dataY,
data: [820, 932, 901, 934, 1290, 1330, 1320],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#efc883', //折线点的颜色
lineStyle: {
color: '#efc883' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
},
{
// data: this.dataY,
data: [500, 600, 700, 300, 1100, 130, 1200],
type: 'line',
symbol: 'circle', //是否显示实心的折线圆点
smooth: true, //让折线有弧度
symbolSize: 7, //折线圆点的大小
itemStyle: {
normal: {
color: '#053B6A', //折线点的颜色
lineStyle: {
color: '#053B6A' //折线的颜色
},
label: { show: true } //是否在折线点上显示数字
}
}
}
]
});
},
// 点击按钮显示隐藏
changeDisplay(e){
this.isDisplay = !this.isDisplay
let $timeline = this.$refs.timeline;
if(!this.showAndHide){
for(let i = 0; i< $timeline.$children.length; i++){
if(i>1){
$timeline.$children[i].$el.style.display = "block";
}
}
this.showAndHide = true;
}else{
for(let i = 0; i< $timeline.$children.length; i++){
if(i>1){
$timeline.$children[i].$el.style.display = "none";
}
}
this.showAndHide = false;
}
//$timeline.toggleRowExpansion(row,true)
},
handleRemove(file) {
console.log(file);
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
handleDownload(file) {
console.log(file);
},
/** 查询工单基础信息列表 */
getList() {
this.loading = true;
listBasicsInfo(this.queryParams).then(response => {
this.basicsInfoList = response.rows;
this.total = response.total;
this.loading = false;
});
},
getBasicsInfo (){
getBasicsInfo(this.orderId).then(response =>{
this.form = response.data;
this.active = parseInt(response.data.orderStatus) + 1;
if(this.form.deviceInfoList.length>0){
this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
}
for(var i = 0; i < this.form.deviceInfoList.length; i++){
let obj = this.form.deviceInfoList[i];
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
}
if(this.form.orderType == '1') {
// 获取设备列表树
let data = {
key1:this.form.deviceInfoList,
key2:this.form.pipeList
};
deviceTree(data).then(response => {
this.deviceOptions[0].childList = response.data;
});
}
});
},
// 筛选节点
// filterNode(value, data) {
// if (!value) return true;
// return data.label.indexOf(value) !== -1;
// },
// 节点单击事件
handleNodeClick(data) {
},
// 取消按钮
cancel() {
this.open = false;
// this.reset();
},
// 表单重置
reset() {
this.form = {
orderId: null,
orderType: null,
orderName: null,
orderStatus: "0",
createTime: null,
appointInspector: null,
allotTime: null,
actualInspector: null,
actualTime: null,
remarks: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工单基础信息";
},
/** 归档按钮操作 */
handleFinish(res) {
// this.reset();
getBasicsInfo(res).then(response => {
this.form = response.data;
this.open = true;
this.title = "工单信息归档";
});
},
/** 修改按钮操作 */
handleUpdate(res) {
// this.reset();
this.getInspectorList();
getBasicsInfo(this.orderId).then(response => {
this.form = response.data;
this.open = true;
this.title = "工单信息修改";
});
},
/** 提交按钮 */
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.orderStatus == '0') {
updateBasicsInfo(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else if(this.form.orderStatus == '2'){
updateOrderStatus(this.form).then(response => {
this.msgSuccess("操作成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const orderIds = row.orderId || this.ids;
this.$confirm('是否确认删除工单基础信息编号为"' + orderIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delBasicsInfo(orderIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有工单基础信息数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportBasicsInfo(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
}
</script>
<style>
.el-tree-node__content{
width: 150px;
}
.el-divider--horizontal {
display: block;
height: 1px;
width: 100%;
margin: 20px 0;
}
.feedbackTime-div{
float: left;margin-left: 150px;margin-top: 10px;
}
.feedbackTime{
height: 120px;
width: 120px;
float: left;
margin-left: 15px;
margin-top: 5px;
margin-bottom: 15px;
display: flex;
justify-content: center;
align-items: center;
}
.el-card__body {
padding: 5px 20px 20px 20px;
}
.detail .el-form{
width: 20%;
}
.detail .el-form-item{
margin-bottom: 0px;
}
.el-tree{
margin-top: 5px;
}
.avatar-uploader{
width: 25%;
float: left;
}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
li{
font-size: 15px;
font-weight: 900;
}
</style>
gassafety-web/src/views/device/deviceInfo/index.vue
View file @ 29a86624
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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="deviceName" />
<el-table-column label="所属管道" align="center" prop="pipeName" /> <el-table-column label="所属管道" align="center" prop="pipeName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <el-table-column label="设备编号" align="center" prop="deviceCode" />
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -308,6 +308,8 @@ ...@@ -308,6 +308,8 @@
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 设备信息表格数据 // 设备信息表格数据
deviceInfoList: [], deviceInfoList: [],
// 弹出层标题 // 弹出层标题
...@@ -325,8 +327,6 @@ ...@@ -325,8 +327,6 @@
typeOptions: [], typeOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
enterpriseId: null, enterpriseId: null,
deviceName: null, deviceName: null,
deviceCode: null, deviceCode: null,
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/device/devicemonitor/index.vue
View file @ 29a86624
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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 type="selection" width="55" align="center" />
<el-table-column label="设备监控id" align="center" prop="monitorId" /> <el-table-column label="设备监控id" align="center" prop="monitorId" />
<el-table-column label="设备" align="center" prop="deviceName" /> <el-table-column label="设备" align="center" prop="deviceName" />
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -295,6 +295,8 @@ export default { ...@@ -295,6 +295,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据 // 设备监控表格数据
deviceList: [], deviceList: [],
// 弹出层标题 // 弹出层标题
...@@ -303,8 +305,6 @@ export default { ...@@ -303,8 +305,6 @@ export default {
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
deviceId: null, deviceId: null,
deviceThreshold: null, deviceThreshold: null,
relationPipeId: null, relationPipeId: null,
...@@ -362,7 +362,7 @@ export default { ...@@ -362,7 +362,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/device/pipe/index.vue
View file @ 29a86624
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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="pipeName" />
<el-table-column label="管道编号" align="center" prop="pipeCode" /> <el-table-column label="管道编号" align="center" prop="pipeCode" />
<el-table-column label="管道类型" align="center" prop="pipeType" > <el-table-column label="管道类型" align="center" prop="pipeType" >
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -269,6 +269,8 @@ ...@@ -269,6 +269,8 @@
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 管道信息表格数据 // 管道信息表格数据
pipeList: [], pipeList: [],
// 弹出层标题 // 弹出层标题
...@@ -287,8 +289,6 @@ ...@@ -287,8 +289,6 @@
pressureOptions: [], pressureOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
enterpriseId: null, enterpriseId: null,
pipeName: null, pipeName: null,
pipeAddr: null, pipeAddr: null,
...@@ -405,7 +405,7 @@ ...@@ -405,7 +405,7 @@
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue
View file @ 29a86624
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="planStatus"> <el-form-item label="计划状态" prop="planStatus">
<el-select v-model="queryParams.planStatus" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable size="small">
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in typeOptions"
:key="dict.dictValue" :key="dict.dictValue"
...@@ -41,8 +41,7 @@ ...@@ -41,8 +41,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="inspectionPlanList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"/>-->
<el-table-column label="序号" type="index" align="center" prop="planName"/> <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="planName"/>
<el-table-column label="计划时间" align="center" prop="startTime" width="280"> <el-table-column label="计划时间" align="center" prop="startTime" width="280">
...@@ -53,7 +52,7 @@ ...@@ -53,7 +52,7 @@
</el-table-column> </el-table-column>
<el-table-column label="地址" align="center" prop="address"/> <el-table-column label="地址" align="center" prop="address"/>
<el-table-column label="计划描述" align="center" prop="remarks"/> <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"> <template slot-scope="scope">
<span v-if="scope.row.planStatus == 0">未生成工单</span> <span v-if="scope.row.planStatus == 0">未生成工单</span>
<span v-if="scope.row.planStatus == 1">已生成工单</span> <span v-if="scope.row.planStatus == 1">已生成工单</span>
...@@ -103,8 +102,8 @@ ...@@ -103,8 +102,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -216,6 +215,8 @@ ...@@ -216,6 +215,8 @@
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 巡检计划表格数据 // 巡检计划表格数据
inspectionPlanList: [], inspectionPlanList: [],
// 计划状态字典 // 计划状态字典
...@@ -241,8 +242,6 @@ ...@@ -241,8 +242,6 @@
open2: false, open2: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
planName: null, planName: null,
orderId: null, orderId: null,
startTime: null, startTime: null,
...@@ -349,7 +348,7 @@ ...@@ -349,7 +348,7 @@
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/enterprise/info/index.vue
View file @ 29a86624
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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="selection" width="55" align="center" />
<el-table-column type="index" label="序号" align="center" /> <el-table-column type="index" label="序号" align="center" />
<el-table-column label="企业名称" align="center" prop="unitName" /> <el-table-column label="企业名称" align="center" prop="unitName" />
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -194,6 +194,8 @@ export default { ...@@ -194,6 +194,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 企业基本信息表格数据 // 企业基本信息表格数据
infoList: [], infoList: [],
// 弹出层标题 // 弹出层标题
...@@ -203,8 +205,6 @@ export default { ...@@ -203,8 +205,6 @@ export default {
fileList: [], fileList: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
unitName: null, unitName: null,
orgCode: null, orgCode: null,
orgFilePath: null, orgFilePath: null,
...@@ -296,7 +296,7 @@ export default { ...@@ -296,7 +296,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue
View file @ 29a86624
...@@ -39,14 +39,24 @@ ...@@ -39,14 +39,24 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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="troubleName" />
<el-table-column label="隐患类型" align="center" prop="troubleType" /> <el-table-column label="隐患类型" align="center" prop="troubleType" >
<el-table-column label="隐患级别" align="center" prop="troubleLevel" /> <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" > <el-table-column label="图片" align="center" prop="pictureUrl" >
<template slot-scope="scope"> <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> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="上报人" align="center" prop="reportManName" /> <el-table-column label="上报人" align="center" prop="reportManName" />
...@@ -102,13 +112,13 @@ ...@@ -102,13 +112,13 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @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-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-col> <el-col>
<el-form-item label="隐患名称" prop="troubleName" style="width: 720px"> <el-form-item label="隐患名称" prop="troubleName" style="width: 720px">
...@@ -281,6 +291,8 @@ export default { ...@@ -281,6 +291,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 隐患信息表格数据 // 隐患信息表格数据
hiddenTroubleList: [], hiddenTroubleList: [],
// 隐患类型字典 // 隐患类型字典
...@@ -314,8 +326,6 @@ export default { ...@@ -314,8 +326,6 @@ export default {
open2: false, open2: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
troubleName: null, troubleName: null,
troubleType: null, troubleType: null,
deviceId: null, deviceId: null,
...@@ -478,7 +488,7 @@ export default { ...@@ -478,7 +488,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
...@@ -524,6 +534,7 @@ export default { ...@@ -524,6 +534,7 @@ export default {
const troubleId = row.troubleId || this.ids const troubleId = row.troubleId || this.ids
getHiddenTrouble(troubleId).then(response => { getHiddenTrouble(troubleId).then(response => {
this.form1 = response.data; this.form1 = response.data;
console.log("this.form1", this.form1);
if(this.form1.deviceType != null && this.form1.deviceId != null){ if(this.form1.deviceType != null && this.form1.deviceId != null){
this.form1.device = [this.form1.deviceType, this.form1.deviceId]; this.form1.device = [this.form1.deviceType, this.form1.deviceId];
} }
......
gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue
View file @ 29a86624
...@@ -29,10 +29,13 @@ ...@@ -29,10 +29,13 @@
<font>{{form.troubleName}}</font> <font>{{form.troubleName}}</font>
</el-form-item> </el-form-item>
<el-form-item label="隐患类型:" prop="troubleType"> <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>
<el-form-item label="隐患等级:" prop="troubleLevel"> <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>
<el-form-item label="隐患描述:" prop="remarks"> <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;"> <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 @@ ...@@ -50,12 +53,12 @@
<font>{{form.createTime}}</font> <font>{{form.createTime}}</font>
</el-form-item> </el-form-item>
<el-form-item label="处理状态:" prop="dealStatus"> <el-form-item label="处理状态:" prop="dealStatus">
<span v-if="form.orderId == null || form.orderId == ''">未生成工单</span> <font v-if="form.orderId == null || form.orderId == ''">未生成工单</font>
<span v-if="(form.dealStatus == null || form.dealStatus == '') && <font v-if="(form.dealStatus == null || form.dealStatus == '') &&
form.orderId != null && form.orderId != ''">暂未处理</span> form.orderId != null && form.orderId != ''">暂未处理</font>
<span v-if="form.dealStatus == 1">不需处理</span> <font v-if="form.dealStatus == 1">不需处理</font>
<span v-if="form.dealStatus == 2">已处理完成</span> <font v-if="form.dealStatus == 2">已处理完成</font>
<span v-if="form.dealStatus == 3">未处理完成</span> <font v-if="form.dealStatus == 3">未处理完成</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
......
gassafety-web/src/views/workOrder/basicsInfo/index.vue
View file @ 29a86624
<template> <template>
<div class="app-container basicsInfo"> <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-form-item label="工单类型" prop="orderType">
<el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small"> <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small">
<el-option <el-option
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</el-form-item> </el-form-item>
</el-form> </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="orderId" />
<el-table-column label="工单类型" align="center" prop="orderType" > <el-table-column label="工单类型" align="center" prop="orderType" >
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -118,8 +118,8 @@ ...@@ -118,8 +118,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -194,6 +194,8 @@ export default { ...@@ -194,6 +194,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 工单基础信息表格数据 // 工单基础信息表格数据
basicsInfoList: [], basicsInfoList: [],
// 弹出层标题 // 弹出层标题
...@@ -210,8 +212,6 @@ export default { ...@@ -210,8 +212,6 @@ export default {
ordertypeOptions: [], ordertypeOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null, orderId: null,
orderType: null, orderType: null,
orderName: null, orderName: null,
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
gassafety-web/src/views/workOrder/feedback/index.vue
View file @ 29a86624
<template> <template>
<div class="app-container basicsInfo"> <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-form-item label="工单类型" prop="orderType">
<el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small"> <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small">
<el-option <el-option
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</el-form-item> </el-form-item>
</el-form> </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="orderId" />
<el-table-column label="工单类型" align="center" prop="orderType" > <el-table-column label="工单类型" align="center" prop="orderType" >
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="pageSize"
@pagination="getList" @pagination="getList"
/> />
...@@ -207,6 +207,8 @@ ...@@ -207,6 +207,8 @@
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
pageNum: 1,
pageSize: 10,
// 工单基础信息表格数据 // 工单基础信息表格数据
basicsInfoList: [], basicsInfoList: [],
// 弹出层标题 // 弹出层标题
...@@ -226,8 +228,6 @@ ...@@ -226,8 +228,6 @@
fileIndex: 0, fileIndex: 0,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null, orderId: null,
orderType: null, orderType: null,
orderName: null, orderName: null,
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment