Skip to content

G
gassafety
Commit 4d7aa47a authored by yaqizhang's avatar yaqizhang
Browse files
Options

详情

parent 8f884de5
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 35 deletions
gassafety-web/src/views/dataMonitoring/deviceAlarm/alarmdetail.vue
View file @ 4d7aa47a
...@@ -100,16 +100,40 @@ ...@@ -100,16 +100,40 @@
</div> </div>
</div> </div>
<div style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> <div v-if="form.deviceType != '压力表'" 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="main1" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
<div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div> </div>
<div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
</div>
</div> </div>
<div style="height: 320px;width: 100%;padding: 10px;"> <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;">
<div id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div> <div v-if="form.deviceType != '压力表'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
<div id="main4" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"></div> </div>
<div id="main4" style="float: left;width: 49.8%;margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;">
</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> -->
<!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 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: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;margin-left: 5px;">
</div>
</div> -->
</div> </div>
</div> </div>
...@@ -196,7 +220,6 @@ export default { ...@@ -196,7 +220,6 @@ export default {
created() { created() {
// 如果是跳转来的，则接受初始化参数 // 如果是跳转来的，则接受初始化参数
// this.user_id = this.$route.query.id; //详细信息页接收参数 // this.user_id = this.$route.query.id; //详细信息页接收参数
this.alarmId = +this.$route.query.alarmId; this.alarmId = +this.$route.query.alarmId;
console.log("query",this.$route.query.alarmId) console.log("query",this.$route.query.alarmId)
...@@ -555,28 +578,28 @@ export default { ...@@ -555,28 +578,28 @@ export default {
}, },
// 点击按钮显示隐藏 // 点击按钮显示隐藏
changeDisplay(e){ // changeDisplay(e){
this.isDisplay = !this.isDisplay // this.isDisplay = !this.isDisplay
let $timeline = this.$refs.timeline; // let $timeline = this.$refs.timeline;
if(!this.showAndHide){ // if(!this.showAndHide){
for(let i = 0; i< $timeline.$children.length; i++){ // for(let i = 0; i< $timeline.$children.length; i++){
if(i>1){ // if(i>1){
$timeline.$children[i].$el.style.display = "block"; // $timeline.$children[i].$el.style.display = "block";
} // }
} // }
this.showAndHide = true; // this.showAndHide = true;
}else{ // }else{
for(let i = 0; i< $timeline.$children.length; i++){ // for(let i = 0; i< $timeline.$children.length; i++){
if(i>1){ // if(i>1){
$timeline.$children[i].$el.style.display = "none"; // $timeline.$children[i].$el.style.display = "none";
} // }
} // }
this.showAndHide = false; // this.showAndHide = false;
} // }
//$timeline.toggleRowExpansion(row,true) // //$timeline.toggleRowExpansion(row,true)
}, // },
handleRemove(file) { handleRemove(file) {
...@@ -609,6 +632,7 @@ export default { ...@@ -609,6 +632,7 @@ export default {
this.dataListdetail3.push(obj3); this.dataListdetail3.push(obj3);
this.form = response.data; this.form = response.data;
console.log("this.form",this.form)
this.active = parseInt(response.data.orderStatus) + 1; this.active = parseInt(response.data.orderStatus) + 1;
this.gaoMap.resetMapCenter([this.form.longitude,this.form.latitude]); this.gaoMap.resetMapCenter([this.form.longitude,this.form.latitude]);
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form) this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
...@@ -642,7 +666,7 @@ export default { ...@@ -642,7 +666,7 @@ export default {
console.log("getData3",getData3) console.log("getData3",getData3)
console.log("this.form",this.form)
// this.active = parseInt(response.data.orderStatus) + 1; // this.active = parseInt(response.data.orderStatus) + 1;
// if(this.form.deviceInfoList.length>0){ // if(this.form.deviceInfoList.length>0){
// this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]); // this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
......
gassafety-web/src/views/dataMonitoring/realtimeData/realtimedetail.vue
View file @ 4d7aa47a
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<div style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> <div v-if="form.deviceType != '压力表'" 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 id="main1" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
</div> </div>
<div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"> <div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
</div> </div>
<div style="height: 320px;width: 100%;padding: 10px;"> <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;">
<div id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"> <div v-if="form.deviceType != '压力表'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
</div> </div>
<div id="main4" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;"> <div id="main4" style="float: left;width: 49.8%;margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;">
</div> </div>
</div> </div>
</div> </div>
......
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