Skip to content

G
gassafety
Commit 6234df10 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

parents f62e1b08 70c96a11
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 97 deletions
gassafety-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml
View file @ 6234df10
...@@ -38,25 +38,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -38,25 +38,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="deviceCode != null "> and d.device_code like concat('%',#{deviceCode},'%')</if> <if test="deviceCode != null "> and d.device_code like concat('%',#{deviceCode},'%')</if>
<if test="deviceType != null "> and d.device_type = #{deviceType}</if> <if test="deviceType != null "> and d.device_type = #{deviceType}</if>
<if test="startReportTime != null "> and report_time &gt;= #{startReportTime}</if> <if test="startReportTime != null "> and t.report_time &gt;= #{startReportTime}</if>
<if test="endReportTime != null "> and report_time &lt;= #{endReportTime}</if> <if test="endReportTime != null "> and t.report_time &lt;= #{endReportTime}</if>
<if test="communicationStatus != null and communicationStatus != ''"> and communication_status = #{communicationStatus}</if> <if test="communicationStatus != null and communicationStatus != ''"> and t.communication_status = #{communicationStatus}</if>
<if test="deviceStatus != null and deviceStatus != ''"> and device_status = #{deviceStatus}</if> <if test="deviceStatus != null and deviceStatus != ''"> and t.device_status = #{deviceStatus}</if>
</where> </where>
</select> </select>
<select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResult"> <select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResult">
select max(t.report_time), t.device_report_data_id, t.device_num, t.standard_condition_accumulation, t.working_condition_accumulation, t.residual_quantity, t.standard_condition_flow, t.working_condition_flow, t.temperature, t.pressure, t.communication_status, t.device_status, t.create_time, t.update_time, select max(t.report_time) report_time, t.device_report_data_id, t.device_num, t.standard_condition_accumulation, t.working_condition_accumulation, t.residual_quantity, t.standard_condition_flow, t.working_condition_flow, t.temperature, t.pressure, t.communication_status, t.device_status, t.create_time, t.update_time,
d.device_name, d.device_code, d.device_type, d.device_model d.device_name, d.device_code, d.device_type, d.device_model
from t_device_report_data t from t_device_report_data t
left join t_device_info d on t.device_num = d.iot_no left join t_device_info d on t.device_num = d.iot_no
<where> <where>
<if test="deviceCode != null "> and d.device_code like concat('%',#{deviceCode},'%')</if> <if test="deviceCode != null "> and d.device_code like concat('%',#{deviceCode},'%')</if>
<if test="deviceType != null "> and d.device_type = #{deviceType}</if> <if test="deviceType != null "> and d.device_type = #{deviceType}</if>
<if test="startReportTime != null "> and report_time &gt;= #{startReportTime}</if> <if test="startReportTime != null "> and t.report_time &gt;= #{startReportTime}</if>
<if test="endReportTime != null "> and report_time &lt;= #{endReportTime}</if> <if test="endReportTime != null "> and t.report_time &lt;= #{endReportTime}</if>
<if test="communicationStatus != null and communicationStatus != ''"> and communication_status = #{communicationStatus}</if> <if test="communicationStatus != null and communicationStatus != ''"> and t.communication_status = #{communicationStatus}</if>
<if test="deviceStatus != null and deviceStatus != ''"> and device_status = #{deviceStatus}</if> <if test="deviceStatus != null and deviceStatus != ''"> and t.device_status = #{deviceStatus}</if>
</where> </where>
group by t.device_num group by t.device_num
</select> </select>
...@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_name, d.device_code, d.device_type, d.device_model d.device_name, d.device_code, d.device_type, d.device_model
from t_device_report_data t from t_device_report_data t
left join t_device_info d on t.device_num = d.iot_no left join t_device_info d on t.device_num = d.iot_no
where device_report_data_id = #{deviceReportDataId} where t.device_report_data_id = #{deviceReportDataId}
</select> </select>
<insert id="insertTDeviceReportData" parameterType="TDeviceReportData" useGeneratedKeys="true" keyProperty="deviceReportDataId"> <insert id="insertTDeviceReportData" parameterType="TDeviceReportData" useGeneratedKeys="true" keyProperty="deviceReportDataId">
......
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @ 6234df10
...@@ -91,81 +91,51 @@ ...@@ -91,81 +91,51 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange" >
v-loading="loading" <!-- <el-table-column type="selection" width="55" align="center" />-->
:data="deviceAlarmList" <el-table-column label="设备名称" align="center" prop="deviceName" />
@selection-change="handleSelectionChange" <el-table-column label="设备编号" align="center" prop="deviceCode" />
> <el-table-column label="报警类型" align="center" prop="alarmType" />
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.deviceName }}</span>
</template>
</el-table-column>
<el-table-column label="设备编号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.deviceCode }}</span>
</template>
</el-table-column>
<el-table-column label="报警类型" align="center" prop="alarmType">
<template slot-scope="scope">
<span>{{ scope.row.alarmType }}</span>
</template>
</el-table-column>
<el-table-column label="报警值" align="center" prop="alarmValue" /> <el-table-column label="报警值" align="center" prop="alarmValue" />
<el-table-column <el-table-column label="报警开始时间" align="center" prop="startTime" />
label="报警开始时间" <el-table-column label="报警结束时间" align="center" prop="endTime" />
align="center"
prop="startTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="报警结束时间"
align="center"
prop="endTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime) }}</span>
</template>
</el-table-column>
<el-table-column label="处理状态" align="center" prop="dealStatus"> <el-table-column label="处理状态" align="center" prop="dealStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.orderId == null || scope.row.orderId == ''" <span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span>
>未生成工单</span <span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
> scope.row.orderId != null && scope.row.orderId != ''">未处理</span>
<span
v-if="
(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
scope.row.orderId != null &&
scope.row.orderId != ''
"
>未处理</span
>
<span v-if="scope.row.dealStatus == 1">不需处理</span> <span v-if="scope.row.dealStatus == 1">不需处理</span>
<span v-if="scope.row.dealStatus == 2">已处理完成</span> <span v-if="scope.row.dealStatus == 2">已处理完成</span>
<span v-if="scope.row.dealStatus == 3">未处理完成</span> <span v-if="scope.row.dealStatus == 3">未处理完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="normal" type="text" icon="el-icon-edit" @click="handleIssue(scope.row)" <el-button
v-hasPermi="['workOrder:basicsInfo:add']" v-if="scope.row.orderId == '' || scope.row.orderId == null">生成工单 size="normal"
type="text"
icon="el-icon-edit"
@click="handleIssue(scope.row)"
v-hasPermi="['workOrder:basicsInfo:add']"
v-if="scope.row.orderId == '' || scope.row.orderId == null">
生成工单
</el-button>
<el-button
size="normal"
type="text"
icon="el-icon-edit"
@click="showDetail(scope.row)">
详情
</el-button> </el-button>
<el-button size="normal" type="text" icon="el-icon-edit" @click="showDetail(scope.row)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 添加工单信息对话框 --> <!-- 添加工单信息对话框 -->
...@@ -185,16 +155,16 @@ ...@@ -185,16 +155,16 @@
</el-form-item> </el-form-item>
<el-form-item label="指定执行人员" prop="appointInspector"> <el-form-item label="指定执行人员" prop="appointInspector">
<el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId"> <el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId">
<el-option v-for="item in inspector" :key="item.userId" :label="item.nickName" :value="item.userId"> <el-option
</el-option> v-for="item in inspector"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工单描述" prop="remarks"> <el-form-item label="工单描述" prop="remarks">
<el-input <el-input type="textarea" v-model="form.remarks" placeholder="请输入工单描述" />
type="textarea"
v-model="form.remarks"
placeholder="请输入工单描述"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -292,7 +262,7 @@ export default { ...@@ -292,7 +262,7 @@ export default {
vm.fromGisMap=false; vm.fromGisMap=false;
} }
}); });
}, },
methods: { methods: {
/** 查询报警信息列表 */ /** 查询报警信息列表 */
...@@ -362,7 +332,6 @@ export default { ...@@ -362,7 +332,6 @@ export default {
this.title = "填写工单信息"; this.title = "填写工单信息";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
......
gassafety-web/src/views/dataMonitoring/realtimeData/index.vue
View file @ 6234df10
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dataList" @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" />
<el-table-column label="设备类型" align="center" prop="deviceType" > <el-table-column label="设备类型" align="center" prop="deviceType" >
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
<span v-if="scope.row.deviceType == '4'">压力表</span> <span v-if="scope.row.deviceType == '4'">压力表</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标况累计量" align="center" prop="standardConditionAccumulation" /> <el-table-column label="标况累计量(m³)" align="center" prop="standardConditionAccumulation" />
<el-table-column label="工况累计量" align="center" prop="workingConditionAccumulation" /> <el-table-column label="工况累计量(m³)" align="center" prop="workingConditionAccumulation" />
<el-table-column label="剩余量" align="center" prop="residualQuantity" /> <el-table-column label="剩余量(m³)" align="center" prop="residualQuantity" />
<el-table-column label="标况流量" align="center" prop="standardConditionFlow" /> <el-table-column label="标况流量(m³/h)" align="center" prop="standardConditionFlow" />
<el-table-column label="工况流量" 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="压力" 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" />
<el-table-column label="设备状态" align="center" prop="deviceStatus" > <el-table-column label="设备状态" align="center" prop="deviceStatus" >
</el-table-column> </el-table-column>
......
gassafety-web/src/views/dataMonitoring/reportData/index.vue
View file @ 6234df10
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dataList" @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" />
<el-table-column label="设备类型" align="center" prop="deviceType" > <el-table-column label="设备类型" align="center" prop="deviceType" >
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
<span v-if="scope.row.deviceType == '4'">压力表</span> <span v-if="scope.row.deviceType == '4'">压力表</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标况累计量" align="center" prop="standardConditionAccumulation" /> <el-table-column label="标况累计量(m³)" align="center" prop="standardConditionAccumulation" />
<el-table-column label="工况累计量" align="center" prop="workingConditionAccumulation" /> <el-table-column label="工况累计量(m³)" align="center" prop="workingConditionAccumulation" />
<el-table-column label="剩余量" align="center" prop="residualQuantity" /> <el-table-column label="剩余量(m³)" align="center" prop="residualQuantity" />
<el-table-column label="标况流量" align="center" prop="standardConditionFlow" /> <el-table-column label="标况流量(m³/h)" align="center" prop="standardConditionFlow" />
<el-table-column label="工况流量" 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="压力" 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" />
<el-table-column label="设备状态" align="center" prop="deviceStatus" > <el-table-column label="设备状态" align="center" prop="deviceStatus" >
</el-table-column> </el-table-column>
......
gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue
View file @ 6234df10
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="inspectionPlanList" @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="序号" 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">
......
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