Skip to content

G
gassafety
Commit 1b36e54c authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

parents 5b078f81 370a644d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 438 additions and 335 deletions
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @ 1b36e54c
...@@ -351,7 +351,8 @@ export default { ...@@ -351,7 +351,8 @@ export default {
this.$router.push({ this.$router.push({
path: '/dataMonitoring/alarmdetail', path: '/dataMonitoring/alarmdetail',
query: { query: {
alarmId: row.alarmId alarmId: row.alarmId,
deviceType:row.deviceType
} }
}) //带参跳转 }) //带参跳转
}, },
......
gassafety-web/src/views/dataMonitoring/realtimeData/index.vue
View file @ 1b36e54c
...@@ -177,7 +177,8 @@ export default { ...@@ -177,7 +177,8 @@ export default {
this.$router.push({ this.$router.push({
path: '/dataMonitoring/realtimedetail', path: '/dataMonitoring/realtimedetail',
query:{ query:{
deviceId : row.deviceId deviceId : row.deviceId,
deviceType: row.deviceType
} }
}) //带参跳转 }) //带参跳转
}, },
......
gassafety-web/src/views/dataMonitoring/realtimedetail/index.vue
View file @ 1b36e54c
<template> <template>
<div class="app-container detail" style="background-color: rgb(238, 241, 245);"> <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<div style="padding-top: 10px;background: #fff;height: 100%;"> <div style="padding-top: 10px;background: #fff;height: 100%;">
<div>
<div style="width: 5%;height: 45px;margin-left: 20px;" @click="$router.go(-1)"> <el-row>
<el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回 <el-col :span="24" style="padding-left: 15px;">
</el-button> <div style="height: 45px;" @click="$router.go(-1)">
<div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
style="width: 25px;" alt=""></div> </el-button>
</div> <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
</div> </div>
</el-col>
<div style="width: 100%;height: 350px;padding: 10px;height: 300px;"> </el-row>
<div style="width: 66.6%;float: left;height: 100%;">
<el-table :data="dataListdetail1" style="width: 100%"> <el-row>
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-col :span="16" style="padding: 10px;">
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <div style="height: 100%;">
<el-table-column label="设备类型" align="center" prop="deviceType"> <el-table :data="dataListdetail1" style="width: 100%">
<template slot-scope="scope"> <el-table-column label="设备名称" align="center" prop="deviceName" />
<span v-if="scope.row.deviceType == '3'">流量计</span> <el-table-column label="设备编号" align="center" prop="deviceCode" />
<span v-if="scope.row.deviceType == '4'">压力表</span> <el-table-column label="设备类型" align="center" prop="deviceType">
</template> <template slot-scope="scope">
</el-table-column> <span v-if="scope.row.deviceType == '3'">流量计</span>
<el-table-column label="标况累计量" align="center" prop="standardConditionAccumulation" /> <span v-if="scope.row.deviceType == '4'">压力表</span>
</el-table> </template>
</el-table-column>
<el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;"> <el-table-column label="标况累计量" align="center" prop="standardConditionAccumulation" />
<el-table-column label="工况累计量" align="center" prop="workingConditionAccumulation" /> </el-table>
<el-table-column label="剩余量" align="center" prop="residualQuantity" />
<el-table-column label="标况流量" align="center" prop="standardConditionFlow" /> <el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;">
<el-table-column label="工况流量" align="center" prop="workingConditionFlow" /> <el-table-column label="工况累计量" align="center" prop="workingConditionAccumulation" />
</el-table> <el-table-column label="剩余量" align="center" prop="residualQuantity" />
<el-table-column label="标况流量" align="center" prop="standardConditionFlow" />
<el-table-column label="工况流量" align="center" prop="workingConditionFlow" />
<el-table :data="dataListdetail3" style="width: 100%;margin-top: 20px;"> </el-table>
<el-table-column label="温度" align="center" prop="temperature" />
<el-table-column label="压力" align="center" prop="pressure" />
<el-table-column label="上报时间" align="center" prop="reportTime" /> <el-table :data="dataListdetail3" style="width: 100%;margin-top: 20px;">
<el-table-column label="设备状态" align="center" prop="deviceStatus"> <el-table-column label="温度" align="center" prop="temperature" />
</el-table-column> <el-table-column label="压力" align="center" prop="pressure" />
</el-table> <el-table-column label="上报时间" align="center" prop="reportTime" />
<el-table-column label="设备状态" align="center" prop="deviceStatus">
</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 v-if="form.deviceType != '4'" 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 v-if = "form.deviceReportDataList == null" class="div-null">
<p>暂无数据</p>
</div>
</div> </div>
<div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"> </el-col>
<div v-if = "form.deviceReportDataList == null" class="div-null"> <el-col :span="8" style="padding: 10px;padding-left: 0px;">
<p>暂无数据</p> <div id="marbox" style="height: 350px; border: 1px solid rgb(218, 213, 213);margin-top: -45px;">
<div style="width: 100%;height: 100%" id="container"></div>
</div> </div>
</div> </el-col>
</div> </el-row>
<div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;">
<div v-if="form.deviceType != '4'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"> <template v-if="$route.query.deviceType !='0'">
<div v-if = "form.deviceReportDataList == null" class="div-null"> <el-row v-if="form.deviceType != '4'">
<p>暂无数据</p> <el-col :span="12" style="padding: 10px;">
</div> <div id="main1" style="height:300px;background-color: rgb(247 247 247);padding: 5px;">
</div> <div v-if = "form.deviceReportDataList == null" class="div-null">
<div id="main4" style="float: left;width: 49.8%;margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;"> <p>暂无数据</p>
<div v-if = "form.deviceReportDataList == null" class="div-null"> </div>
<p>暂无数据</p> </div>
</div> </el-col>
</div> <el-col :span="12" style="padding: 10px;">
</div> <div id="main2" style="height:300px;background-color: rgb(247 247 247);padding: 5px;">
<div v-if = "form.deviceReportDataList == null" class="div-null">
<p>暂无数据</p>
</div>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="padding: 10px;" v-if="form.deviceType != '4'">
<div id="main3" style="height:300px;background-color: rgb(247 247 247);padding: 5px;">
<div v-if = "form.deviceReportDataList == null" class="div-null">
<p>暂无数据</p>
</div>
</div>
</el-col>
<el-col :span="12" style="padding: 10px;">
<div id="main4" style="margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;">
<div v-if = "form.deviceReportDataList == null" class="div-null">
<p>暂无数据</p>
</div>
</div>
</el-col>
</el-row>
<!-- <div v-if="form.deviceType != '4'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> -->
<!-- </div> -->
<!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;"> -->
<!-- </div> -->
</template>
</div> </div>
......
gassafety-web/src/views/device/deviceInfo/index.vue
View file @ 1b36e54c
...@@ -457,8 +457,4 @@ export default { ...@@ -457,8 +457,4 @@ export default {
}; };
</script> </script>
<style> <style>
.el-col {
margin-left: 0;
margin-right: 10px;
}
</style> </style>
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