Skip to content

Z
ZiBoYingJI
Commit 22c444b2 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

parents 5d0dbed6 57533b63
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 15 deletions
public/datav/index.html
View file @ 22c444b2
......@@ -188,14 +188,16 @@
<option value="370322">高青县</option>
<option value="370323">沂源县</option>
</select>
<select style="margin:0 20px;" id="selectCompany">
<select style="margin:0 20px;width:120px;" id="selectCompany">
<option value="1">请选择矿山企业</option>
<option value="2">测试企业1</option>
<option value="3">测试企业2</option>
<option value="4">测试企业3</option>
<option value="2">淄博卓正新材料科技有限公司</option>
<option value="3">淄博凯运达运贸有限公司石厂</option>
<option value="4">淄博博望矿业有限责任公司</option>
<option value="5">淄博洪泉石料厂</option>
<option value="6">淄博市淄川区岭子镇杨家村石料厂</option>
<option value="7">山东宝山科技有限公司水泥用灰岩矿</option>
</select>
</div>
<div>
</div>
......@@ -1573,9 +1575,9 @@
this.right3();
// 在线实时报警
this.alarm = [
{ id: 1, name: this.marker[1].name, equipment: '氧气浓度', day: '2023-05-25', time: '00:49:48', statusTxt: '报警中', status: 0 },
{ id: 1, name: this.marker[1].name, equipment: '氧气浓度', day: '2023-05-25', time: '00:49:48', statusTxt: '已处理', status: 1 },
{ id: 2, name: this.marker[1].name, equipment: '二氧化碳浓度', day: '2023-05-25', time: '11:15:32', statusTxt: '已处理', status: 1 },
{ id: 3, name: this.marker[1].name, equipment: '一氧化碳浓度', day: '2023-05-25', time: '19:02:42', statusTxt: '报警中', status: 0 }
{ id: 3, name: this.marker[1].name, equipment: '一氧化碳浓度', day: '2023-05-25', time: '19:02:42', statusTxt: '已处理', status: 1 }
];
}
/*
......
public/datav/natural.html
View file @ 22c444b2
......@@ -790,11 +790,14 @@
<option value="370322">高青县</option>
<option value="370323">沂源县</option>
</select>
<select style="margin:0 20px;" id="selectCompany">
<select style="margin:0 20px;width:120px;" id="selectCompany">
<option value="1">请选择矿山企业</option>
<option value="2">测试企业1</option>
<option value="3">测试企业2</option>
<option value="4">测试企业3</option>
<option value="2">淄博卓正新材料科技有限公司</option>
<option value="3">淄博凯运达运贸有限公司石厂</option>
<option value="4">淄博博望矿业有限责任公司</option>
<option value="5">淄博洪泉石料厂</option>
<option value="6">淄博市淄川区岭子镇杨家村石料厂</option>
<option value="7">山东宝山科技有限公司水泥用灰岩矿</option>
</select>
</div>
</header>
......
public/datav/watersource.html
View file @ 22c444b2
......@@ -815,11 +815,14 @@
<option value="370322">高青县</option>
<option value="370323">沂源县</option>
</select>
<select style="margin:0 20px;" id="selectCompany">
<select style="margin:0 20px;width:120px;" id="selectCompany">
<option value="1">请选择矿山企业</option>
<option value="2">测试企业1</option>
<option value="3">测试企业2</option>
<option value="4">测试企业3</option>
<option value="2">淄博卓正新材料科技有限公司</option>
<option value="3">淄博凯运达运贸有限公司石厂</option>
<option value="4">淄博博望矿业有限责任公司</option>
<option value="5">淄博洪泉石料厂</option>
<option value="6">淄博市淄川区岭子镇杨家村石料厂</option>
<option value="7">山东宝山科技有限公司水泥用灰岩矿</option>
</select>
</div>
</header>
......
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