Skip to content

Z
ZiBoYingJI
Commit 5f11c39f authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

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

parents 1969fda2 5d5c7818
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 106 deletions
public/datav/index.html
View file @ 5f11c39f
...@@ -146,6 +146,26 @@ ...@@ -146,6 +146,26 @@
.a0a_ ul .active{ .a0a_ ul .active{
background-image:url(static/img/h_btn_a.png); background-image:url(static/img/h_btn_a.png);
} }
.selects{
width:400px;text-align:center;position:absolute;top:0;left:50%;margin-left:-200px;padding:12px 0;z-index:1000;margin-top:90px;
}
.selects:before/* , .selects:after */{
content:"";position:absolute;top:0;left:0;height:100%;width:100%;
border-style:solid;
border-width:1px 0 1px 0;
border-image:linear-gradient(90deg, transparent 10%, #19b597 30%, #19b597 70%, transparent 90%) 1 1;
background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent);
}
.selects select{
position:relative;z-index:2;
background-color:transparent;color:#92f9ff;
border-color:transparent;outline:none;
option{
background-color:rgba(20, 72, 247, .5);
}
}
</style> </style>
</head> </head>
...@@ -154,7 +174,7 @@ ...@@ -154,7 +174,7 @@
<div class="fixed wp100 hv100" style="background-color: #000000;left: 0;top: 0;z-index: 1999;" <div class="fixed wp100 hv100" style="background-color: #000000;left: 0;top: 0;z-index: 1999;"
v-show="!isReady"></div> v-show="!isReady"></div>
<!-- title --> <!-- title -->
<div style="height: 120px;"> <div style="height:120px;display:flow-root;">
<div class="flex-text color-theme f30 wp100 relative maxIndex fixed" <div class="flex-text color-theme f30 wp100 relative maxIndex fixed"
:class="isFullScreen?'tr-top':'tr-top-re'" :class="isFullScreen?'tr-top':'tr-top-re'"
style="height: 120px;background-image: url('static/title.png');background-size: 100% 100%;"> style="height: 120px;background-image: url('static/title.png');background-size: 100% 100%;">
...@@ -174,7 +194,7 @@ ...@@ -174,7 +194,7 @@
</div> </div>
<!-- 选择列表 --> <!-- 选择列表 -->
<div class="selects" style="width:500px;text-align:center;position:relative;z-index:1000;margin:0 auto;padding-top:100px;"> <div class="selects" >
<select style="margin:0 20px;"> <select style="margin:0 20px;">
<option value="1">淄博市</option> <option value="1">淄博市</option>
</select> </select>
...@@ -822,8 +842,10 @@ ...@@ -822,8 +842,10 @@
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script> <script>
//const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.2.200' : '192.168.13.200') + ':8013';
// 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.2.200' : '192.168.13.200') + ':8013';
const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : location.protocol + '//' + window.location.host;
...@@ -974,6 +996,7 @@ ...@@ -974,6 +996,7 @@
} }
}, },
mounted() { mounted() {
var self = this;
if (!token) { if (!token) {
window.open(selfHost + '/#/login', '_self') window.open(selfHost + '/#/login', '_self')
return return
...@@ -985,8 +1008,7 @@ ...@@ -985,8 +1008,7 @@
location.reload() location.reload()
} }
// 获取数据
this.getData();
// 开启自动切换通知 // 开启自动切换通知
setInterval(() => { setInterval(() => {
...@@ -1039,7 +1061,7 @@ ...@@ -1039,7 +1061,7 @@
var selectArea = document.getElementById("selectArea"); var selectArea = document.getElementById("selectArea");
selectArea.onchange = function(e){ selectArea.onchange = function(e){
var value = this.selectedOptions[0].value; var value = this.selectedOptions[0].value;
this.reqEnterprise(value); self.reqEnterprise(value);
}; };
// 企业选择列表 // 企业选择列表
...@@ -1047,6 +1069,10 @@ ...@@ -1047,6 +1069,10 @@
selectCompany.onchange = function(e){ selectCompany.onchange = function(e){
var value = this.selectedOptions[0].value; var value = this.selectedOptions[0].value;
//window.location.reload() //window.location.reload()
self.reqMines(this.enterpriseId = value);
}; };
}, },
methods: { methods: {
...@@ -1066,15 +1092,15 @@ ...@@ -1066,15 +1092,15 @@
}; };
axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => {
res = res.data; res = res.data;
console.log('enterprise ________________ ', res); var body = res.body || [];
this.selectUnit = res.body; console.log('enterprise ________________ ', body);
this.selectUnit = body;
var value = res.body[0].id;
this.reqMines(value); body[0] && this.reqMines(this.enterpriseId = body[0].id);
}); });
}, },
// 请求矿山列表
reqMines(id){ reqMines(id){
var loading = this.$loading({ var loading = this.$loading({
lock: true, lock: true,
...@@ -1083,7 +1109,6 @@ ...@@ -1083,7 +1109,6 @@
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
// 查询全部矿山
var req = { var req = {
params: { params: {
enterpriseId:id enterpriseId:id
...@@ -1126,7 +1151,6 @@ ...@@ -1126,7 +1151,6 @@
this.marker = [...markerUpdater]; this.marker = [...markerUpdater];
console.log('this.marker ________________ ', this.marker);
loading.close(); loading.close();
this.isReady = true; this.isReady = true;
// 准备地图 // 准备地图
...@@ -1134,6 +1158,8 @@ ...@@ -1134,6 +1158,8 @@
// 初始化 // 初始化
//_5minus(); //_5minus();
//this.getData();
// 获取数据
this.getData(); this.getData();
}); });
}, },
...@@ -1542,6 +1568,10 @@ ...@@ -1542,6 +1568,10 @@
}); });
}, },
right2() { right2() {
const pie = (data) => { const pie = (data) => {
// 基于准备好的dom，初始化echarts实例 // 基于准备好的dom，初始化echarts实例
pieChart = echarts.init(document.getElementById("pie")); pieChart = echarts.init(document.getElementById("pie"));
...@@ -1575,6 +1605,32 @@ ...@@ -1575,6 +1605,32 @@
this.isMaskShow = true this.isMaskShow = true
}); });
} }
console.log('right2 ________________ ', this.enterpriseId);
var req = {
params: {
enterpriseId:this.enterpriseId,
auditStatus:'0',
}
};
axios.get(host + '/api/yingji/dangerousworkaudit/dangerwork-list', req).then(res => {
return ;
if (res && res.data) {
pie(res.data)
}
});
return ;
axios.get(host + '/api/datav/dangerous-work/audit-state').then(res => { axios.get(host + '/api/datav/dangerous-work/audit-state').then(res => {
if (res && res.data) { if (res && res.data) {
pie(res.data) pie(res.data)
...@@ -1583,6 +1639,13 @@ ...@@ -1583,6 +1639,13 @@
}, },
right3() { right3() {
if (this.overviewTabCur === 0) { if (this.overviewTabCur === 0) {
console.log('right3 ________________ ', this.overviewTabCur);
const rn1 = Math.round(Math.random() * 60) const rn1 = Math.round(Math.random() * 60)
const rn2 = Math.round(Math.random() * rn1) const rn2 = Math.round(Math.random() * rn1)
const rn3 = Math.round(Math.random() * 10) const rn3 = Math.round(Math.random() * 10)
...@@ -1660,12 +1723,15 @@ ...@@ -1660,12 +1723,15 @@
this.right1(); this.right1();
this.right2(); this.right2();
this.right3(); this.right3();
if(this.marker[0]){
// 在线实时报警 // 在线实时报警
this.alarm = [ this.alarm = [
{ id: 1, name: this.marker[1].name, equipment: '氧气浓度', day: '2023-05-25', time: '00:49:48', statusTxt: '已处理', status: 1 }, { 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: 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: 1 } { 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 @ 5f11c39f
...@@ -157,10 +157,8 @@ ...@@ -157,10 +157,8 @@
select{ select{
margin-right:.20rem; margin-right:.20rem;
background-color:transparent;color:#21817E; background-color:transparent;color:#21817E;
border-color:transparent; border-color:transparent;outline:none;
} }
//display:none;
} }
} }
} }
...@@ -952,7 +950,6 @@ ...@@ -952,7 +950,6 @@
<script src="js/axios.min.js"></script> <script src="js/axios.min.js"></script>
<!-- cookie --> <!-- cookie -->
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script src="js/highcharts.js"></script> <script src="js/highcharts.js"></script>
<!-- <script type="text/javascript" src="static/js/jessibuca/jessibuca.js"></script> <!-- <script type="text/javascript" src="static/js/jessibuca/jessibuca.js"></script>
......
public/datav/open-air.html
View file @ 5f11c39f
...@@ -441,90 +441,21 @@ ...@@ -441,90 +441,21 @@
} }
this.getData(); this.getData();
console.log('selectedMineJson ________________ ', this.selectedMine);
// 视频列表 // 视频列表
Axiosx.get('/api/video/link-mine', { Axiosx.get(host + '/api/video-mine/mineId', {
params: { params: {
mineType: this.selectedMine.mineType, //mineType: this.selectedMine.mineType,
mineId: this.selectedMine.id, mineId: this.selectedMine.id,
} }
}).then(res => { }).then(res => {
res = res.data.body;
res = {
"appKey": "54309ca903e94a9bb14b7f0a69b0da94",
"appSecret": "446ece35fb3a65264a04375b72246b1f",
"list": [
/* {
"name": "视频1",
"channel": "1.hd.live",
"id": "G67791074",
"remark": "无",
"captcha": ""
},
{
"name": "视频2",
"channel": "2.hd.live",
"id": "G67791073",
"remark": "无",
"captcha": ""
} */
],
};
if(this.selectedMine.code === "3703023006"){
res = {
"appKey": "6039de9e0bf44407a15a15553986433c",
"appSecret": "fb498de47fb488e14305ff300bd30d27",
"list": [
{
"name": "视频1",
"channel": "1.hd.live",
"id": "D14924613",
"remark": "无",
"captcha": "kyd001"
},
{
"name": "视频2",
"channel": "2.hd.live",
"id": "D14924613",
"remark": "无",
"captcha": "kyd001"
},
{
"name": "视频3",
"channel": "3.hd.live",
"id": "D14924613",
"remark": "无",
"captcha": "kyd001"
},
{
"name": "视频4",
"channel": "4.hd.live",
"id": "D14924613",
"remark": "无",
"captcha": "kyd001"
}
],
};
};
this.info = { this.info = {
appKey:res.appKey, appKey:res.appKey,
appSecret:res.appSecret, appSecret:res.appSecret,
}; };
this.videos = res.videoChannelList || [];
this.videos = res.list || []; this.createVideo(res.videoChannelList[0]);
this.createVideo(res.list[0]);
}); });
//
}, },
methods: { methods: {
createVideo: function(item){ createVideo: function(item){
...@@ -576,16 +507,11 @@ ...@@ -576,16 +507,11 @@
var id = item.id || this.info.id || ''; var id = item.id || this.info.id || '';
return 'ezopen://'+captcha+'open.ys7.com/'+id+'/'+item.channel; return 'ezopen://'+captcha+'open.ys7.com/'+id+'/'+item.channel;
}, },
chickVideo(video, index) { chickVideo(video, index) {
console.log('chickVideo ________________ ', video, index);
this.createVideo(video); this.createVideo(video);
this.TabCur = index; this.TabCur = index;
this.showMask = false; this.showMask = false;
}, },
...@@ -872,7 +798,7 @@ ...@@ -872,7 +798,7 @@
// 模拟请求 // 模拟请求
setTimeout(() => { setTimeout(() => {
setTimeout(() => this.getData('refesh'), 5000); setTimeout(() => this.getData('refesh'), 15000);
// 圆环图 // 圆环图
// 基于准备好的dom，初始化echarts实例 // 基于准备好的dom，初始化echarts实例
...@@ -925,7 +851,7 @@ ...@@ -925,7 +851,7 @@
] ]
}); });
loading.close(); loading && loading.close();
this.isReady = true this.isReady = true
}, 1000); }, 1000);
} }
......
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