Commit 08902c49 authored by Kimber's avatar Kimber

'up'

parent 1ccfa5b6
......@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"dev": "vue-cli-service serve",
"build": "vue-cli-service build"
},
"dependencies": {
......
......@@ -202,7 +202,7 @@ export function start(data) {
// 隐患
export function findHiddenTimeout(data) {
return request4({
return request2({
url: "api/hiddenTroubleCheck/findAllwarningHiddenTrouble",
method: "get",
params: data
......@@ -211,7 +211,7 @@ export function findHiddenTimeout(data) {
// 重大隐患
export function undergroundSeriousHiddenTrouble(data) {
return request4({
return request2({
url: "/api/undergroundSeriousHiddenTrouble/warn",
method: "get",
params: data
......@@ -226,3 +226,23 @@ export function weather(data) {
params: data
});
}
// 新气象接口
export function getWeather(data) {
return request4({
url: '/weather',
method: 'get',
params: data,
data: data
})
}
// 突发事件报警
export function getEmergency(param) {
return request2({
url: 'api/emergency',
method: 'get',
data: {},
params: param
})
}
\ No newline at end of file
......@@ -91,3 +91,31 @@ export function wkkNeiBuWeiYiChenJiang(data) {
});
}
// 内部位移沉降
export function personSelectList(data) {
return request5({
url: "api/personnelRealTimeData/distinctCurrentBaseStationByCompanycode",
method: "get",
params: data
});
}
// 人员定位统计
export function findPersonLocationStatistic(data) {
return request5({
url: "api/personnelRealTimeData/countEachZonePeople",
method: "get",
params: data
});
}
// 尾矿库报警 新
export function wkkAlarm(data) {
return request5({
url: "api/alarm",
method: "get",
params: data
});
}
\ No newline at end of file
......@@ -30,6 +30,11 @@
<el-col class="text_look" :span="12"><span @click="onTextLook(0, 'rydw')">查看</span></el-col>
</el-row>
<el-row class="text">
<el-col :span="12">人员定位统计</el-col>
<el-col class="text_look" :span="12"><span @click="onTextLook(0, 'rydwtj')">查看</span></el-col>
</el-row>
<div v-if="hidePartBaseInfo">
<el-row class="text">
<el-col :span="12">降雨量</el-col>
......@@ -67,14 +72,14 @@
</el-row>
</div>
<el-row class="text">
<!-- <el-row class="text">
<el-col :span="12">预警值</el-col>
<el-col class="text_look" :span="12"><span @click="onTextLook(7, 'yjz')">查看</span></el-col>
</el-row>
</el-row> -->
<el-row class="text">
<el-col :span="12">报警记录</el-col>
<el-col class="text_look" :span="12"><span @click="onTextLook(6, 'yj')">查看</span></el-col>
<el-col class="text_look" :span="12"><span @click="onTextLook(6, 'bjjl')">查看</span></el-col>
</el-row>
<el-row class="text">
......@@ -273,7 +278,7 @@ export default {
}
.base-type{
height:37vh;
min-height:37vh;
}
}
}
......
......@@ -18,7 +18,7 @@
<span>{{ tian_qi_data.wea }}</span>
<span>{{ tian_qi_data.win + tian_qi_data.win_speed }}</span> -->
<div style="font-size: 2vw">
<img src="@/assets/images/tian_qi2.png" alt="" />
<img :src="tian_qi_data.img || '/image/tian_qi2.png'" alt="" />
</div>
<span>{{ tian_qi_data.air_level }}</span>
<span>{{ tian_qi_data.temp }}</span>
......@@ -30,7 +30,7 @@
<script>
import { randNum } from '@/utils'
import { dept, weather } from '@/api'
import { dept, /* weather, */ getWeather} from '@/api'
export default {
data() {
return {
......@@ -53,8 +53,35 @@ export default {
this.tian_qi_data = res.data
}) */
var that = this;
weather({}).then(function(res){
if(res.replace(/\s+/g, '')){
getWeather({c:'code', id:12, icon:1, num:3, py:'neimenggu'}).then(function(res){
var body = document.createElement("div");
setTimeout(function(){
body.innerHTML = res;
var styles = body.querySelectorAll("link");
for(var style of styles){
body.removeChild(style)
};
var scripts = body.querySelectorAll("script");
for(var script of scripts){
script.parentNode.removeChild(script)
};
var day_1 = body.querySelector("#day_1");
var img = day_1.querySelector(".pngtqico");
var wtline = day_1.querySelector(".wtline").nextElementSibling;
var flag = day_1.parentNode.title;
var temp = wtline.innerText;
var div2 = document.createElement("p");
div2.innerHTML = img.outerHTML;
that.tian_qi_data = {
temp: temp,
wea: flag,
img: 'http://i.tianqi.com/static' + img.src.split('/static')[1],
}
}, 300);
/* if(res.replace(/\s+/g, '')){
var str = res.replace(/(\r\n)|(\n)/g, '&').split(/&&|&/g);
var todayStr = str[1];
if(todayStr){
......@@ -70,7 +97,7 @@ export default {
};
that.tian_qi_data = data;
};
};
}; */
})
this.dept()
......@@ -81,7 +108,7 @@ export default {
dept() {
dept().then(res => {
this.listText = []
this.listAll = res
this.listAll = res;
res.content.map(item => {
if (item.name == '东乌珠穆沁旗应急管理局') {
return
......@@ -130,9 +157,9 @@ export default {
watch: {
title(e) {
let select_item = this.$store.state.select_item
this.listText = []
this.listText = [];
for (let name of select_item) {
if (name.value == e) {
if (name.value == e && this.listAll.content) {
this.listAll.content.map(item => {
if (item.name == '东乌珠穆沁旗应急管理局') {
return
......@@ -150,9 +177,9 @@ export default {
}
}
for (let i of this.listText) {
/* for (let i of this.listText) {
i.is = false
}
} */
},
},
}
......
......@@ -135,7 +135,7 @@ export default {
return
}
let indexVideo = 0
let indexVideo = 0;
for (let item of data.list) {
start(
{
......@@ -143,13 +143,13 @@ export default {
code: item.code,
}
).then(res => {
if(typeof res === 'object'){
if (res && res.WS_FLV) {
this.dataList.push(res)
}
indexVideo++
let dataLen = data.list.length;
if (dataLen == indexVideo) {
let dataLen = data.list.length;
if (0 === indexVideo) {
setTimeout(() => {
let len = this.dataList.length
if (len < 16) {
......@@ -166,7 +166,9 @@ export default {
this.videoItem = item;
};
}, 100)
}
};
indexVideo++
};
})
}
});
......
......@@ -13,6 +13,7 @@
<script>
import { environment } from '@/api/weikuangku'
import { getValueUnit, getCompanyCodes } from '@/utils'
export default {
data() {
return {
......@@ -29,11 +30,14 @@ export default {
},
environmentData() {
var componyName = this.$store.state.compony_info.name;
var companycode = getCompanyCodes()[componyName];
const params = {
page: this.page_index,
size: 10,
sort: 'id,desc',
item: '可燃气体'
item: '可燃气体',
companycode:companycode,
}
environment(params).then(res => {
let content = res.content
......
......@@ -25,8 +25,15 @@
<el-col class="text_look" :span="12"><span @click="onTextLook(1, 'third')">查看</span></el-col>
</el-row>
<div>
<el-row class="text">
<el-col :span="12">三维</el-col>
<el-col class="text_look" :span="12"><span @click="onClickthree">查看</span></el-col>
</el-row>
</div>
</div>
<br />
<div class="base_left_box_line">
......@@ -45,7 +52,10 @@ import LivePlayer from '@liveqing/liveplayer'
import eventBus from '@/utils/eventbus'
import { grouptree, start } from '@/api'
import mixin_index from '@/mixins'
export default {
mixins: [mixin_index],
data() {
return {
dataObj: '',
......@@ -93,6 +103,7 @@ export default {
grouptree().then(res => {
const serial = res[0].serial
this.loading = true
grouptree({
serial,
}).then(res => {
......
......@@ -16,7 +16,7 @@
</template>
<script>
import { dept } from '@/api'
import { dept, getEmergency } from '@/api'
export default {
name: 'home-map',
......@@ -65,7 +65,8 @@ export default {
// 企业管理
dept().then(res => {
let select_item = this.$store.state.select_item
let arr = []
let arr = [];
res.content.map(item => {
for (let i of select_item) {
if (item.type == i.id) {
......@@ -74,37 +75,44 @@ export default {
}
if (item.typeName) {
var url
if (item.typeName == '非煤矿山') {
url = '/image/fei.png'
}
if (item.typeName == '煤矿') {
url = '/image/mei.png'
}
if (item.typeName == '危险化学品企业') {
url = '/image/hua.png'
}
if(item.jd && !item.jd.match(/°|′/)){
arr.push({
title: item.name,
typeName: item.typeName,
position: [item.jd, item.wd],
address: item.address,
url,
label: {
tip: [item.typeName],
},
item,
})
});
};
}
})
});
//突发事件
getEmergency({sort: 'emergencyTime,desc'}).then(res => {
//var select_item = this.$store.state.select_item;
var list = res.content || [];
for(var item of list){
arr.push({
title: item.emergencyTitle + '' + item.emergencyContent + '',
typeName: item.emergencyContent,
position: [item.emergencyLng, item.emergencyLat],
address: item.emergencyPlace,
label: {
tip: [item.emergencyTitle],
},
type:226,
})
};
this.markerArr = arr
this.onMarker(map)
})
});
});
this.$store.commit('SET_APP_MAP', map)
this.init(map)
......@@ -199,6 +207,10 @@ export default {
url = '/image/hua.png'
}
if (item.type == 226) {
url = 'https://webapi.amap.com/theme/v1.3/markers/n/mark_rs.png'
};
var icon = new AMap.Icon({
image: url,
size: new AMap.Size(36, 36),
......
......@@ -5,7 +5,7 @@
<img src="@/assets/images/error.png" @click="onClickDel">
<div class="base_left_box_line">
<div class="title">基础信息</div>
<div class="title">基础信息44</div>
<el-row class="text">
<el-col :span="8">名称</el-col>
......@@ -41,8 +41,15 @@
<el-row class="text">
<el-col :span="12">车辆信息</el-col>
<el-col class="text_look" :span="12"><span @click="onTextLook(4, 'fourth')">查看</span></el-col>
</el-row>
<div>
<el-row class="text">
<el-col :span="12">三维</el-col>
<el-col class="text_look" :span="12"><span @click="onClickthree">查看</span></el-col>
</el-row>
</div>
</div>
<div class="base_left_box_line">
<div class="title">视频监控 <span class="position_look" @click="onClickVideo">更多</span> </div>
......@@ -86,7 +93,10 @@ import LivePlayer from '@liveqing/liveplayer'
import eventBus from "@/utils/eventbus"
import LineChart from '@/components/Echarts/LineChart'
import mixin_index from '@/mixins'
export default {
mixins: [mixin_index],
data() {
return {
dataObj: '',
......
......@@ -22,7 +22,11 @@
</el-table-column>
<el-table-column prop="location" label="采集站"></el-table-column>
<el-table-column prop="item" label="检测项"></el-table-column>
<el-table-column prop="value" label="数据值"></el-table-column>
<el-table-column prop="value" label="数据值">
<template slot-scope="scope">
{{scope.row.value.trim() !== void 0 ? scope.row.value.trim() +' '+ (itemUnit[scope.row.item.trim()] || '') : ''}}
</template>
</el-table-column>
<el-table-column prop="deviceid" label="设备标识"></el-table-column>
<el-table-column prop="insertTime" label="采集时间"></el-table-column>
</el-table>
......@@ -31,7 +35,7 @@
</template>
<script>
import { timeParse, randNum } from '@/utils'
import { timeParse, randNum, getValueUnit } from '@/utils'
import { environment } from '@/api/weikuangku'
export default {
data() {
......@@ -43,8 +47,8 @@ export default {
tableData: [],
total: 0,
page: 0,
companyName: '',
itemUnit:getValueUnit(),
}
},
......
......@@ -3,17 +3,28 @@
<el-tabs v-model="activeName" @tab-click="tabClick">
<el-tab-pane label="人员定位" name="rydw">
<div class="func_comm">
<strong>开始时间</strong>
<el-date-picker v-model="start_time" @change="onChangeStart" type="datetime" placeholder="选择日期"></el-date-picker>
开始时间
<el-date-picker v-model="query.startTime" @change="onChangeStart" type="datetime" placeholder="选择日期" style="width:200px;margin-bottom:5px;"></el-date-picker>
<strong>结束时间</strong>
<el-date-picker v-model="stop_time" @change="onChangeStop" type="datetime" placeholder="选择日期"></el-date-picker>
结束时间
<el-date-picker v-model="query.endTime" @change="onChangeStop" type="datetime" placeholder="选择日期" style="width:200px;margin-bottom:5px;"></el-date-picker>
<el-input placeholder="请输入姓名" prefix-icon="el-icon-search" v-model="query.personnelName" style="width:120px;margin-bottom:5px;"></el-input>
<strong>监测站</strong>
<el-select v-model="rydw_value" placeholder="请选择">
位置
<el-select v-model="query.currentBaseStation" placeholder="请选择" style="width:120px;margin-bottom:5px;" clearable>
<el-option v-for="item in personSelects" :key="item.key" :label="item.value" :value="item.value"></el-option>
</el-select>
类型
<el-select v-model="query.dataType" placeholder="请选择" style="width:120px;margin-bottom:5px;" clearable >
<el-option v-for="item in rydw_options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
<!-- <el-select v-model="query.rydw_value" placeholder="请选择" style="width:120px;margin-bottom:5px;">
<el-option v-for="item in rydw_options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> -->
<el-button type="primary" @click="onClickSelect">查询</el-button>
</div>
......@@ -21,6 +32,7 @@
<el-table-column property="personnelName" label="姓名"></el-table-column>
<el-table-column property="dataType" label="类型">
<template slot-scope="scope">
<span v-if="scope.row.dataType == 0"> 井口 </span>
<span v-if="scope.row.dataType == 1"> 井下 </span>
<span v-if="scope.row.dataType == 2"> 井内 </span>
<span v-if="scope.row.dataType == 3"> 出井 </span>
......@@ -31,6 +43,13 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="人员定位统计" name="rydwtj">
<el-table :data="rydwtj_tableList" height="58vh">
<el-table-column property="position" label="位置"></el-table-column>
<el-table-column property="num" label="人数"></el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="降雨量" name="jyl" v-if="hidePartBaseInfo">
<div class="func_comm">
<strong>开始时间</strong>
......@@ -55,7 +74,11 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="监测站"></el-table-column>
<el-table-column property="rainfallValue" label="监测值"></el-table-column>
<el-table-column property="rainfallValue" label="监测值">
<template slot-scope="scope">
{{ scope.row.rainfallValue + ' ' + (itemUnit['降雨量'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
......@@ -84,7 +107,11 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="监测站"></el-table-column>
<el-table-column property="groundwaterLevelValue" label="监测值"></el-table-column>
<el-table-column property="groundwaterLevelValue" label="监测值">
<template slot-scope="scope">
{{ scope.row.groundwaterLevelValue + ' ' + (itemUnit['浸润线'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
......@@ -113,7 +140,11 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="监测站"></el-table-column>
<el-table-column property="waterLevelValue" label="监测值"></el-table-column>
<el-table-column property="waterLevelValue" label="监测值">
<template slot-scope="scope">
{{ scope.row.waterLevelValue + ' ' + (itemUnit['库水位'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
......@@ -142,7 +173,11 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="监测站"></el-table-column>
<el-table-column property="beachLengthValue" label="监测值"></el-table-column>
<el-table-column property="beachLengthValue" label="监测值">
<template slot-scope="scope">
{{ scope.row.beachLengthValue + ' ' + (itemUnit['干滩'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
......@@ -171,9 +206,21 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="监测站"></el-table-column>
<el-table-column property="valueX" label="水平位移"></el-table-column>
<el-table-column property="valueY" label="沉降位移"></el-table-column>
<el-table-column property="valueX" label="竖向位移"></el-table-column>
<el-table-column property="valueX" label="水平位移">
<template slot-scope="scope">
{{ scope.row.valueX + ' ' + (itemUnit['表面位移'] || '')}}
</template>
</el-table-column>
<el-table-column property="valueY" label="沉降位移">
<template slot-scope="scope">
{{ scope.row.valueY + ' ' + (itemUnit['表面位移'] || '')}}
</template>
</el-table-column>
<el-table-column property="valueZ" label="竖向位移">
<template slot-scope="scope">
{{ scope.row.valueZ + ' ' + (itemUnit['表面位移'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
......@@ -202,7 +249,11 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="传感器名称"></el-table-column>
<el-table-column property="sedimentationValue" label="沉降值"></el-table-column>
<el-table-column property="sedimentationValue" label="沉降值">
<template slot-scope="scope">
{{ scope.row.sedimentationValue + ' ' + (itemUnit['内部位移沉降'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
......@@ -231,12 +282,16 @@
</template>
</el-table-column>
<el-table-column property="sensorName" label="传感器名称"></el-table-column>
<el-table-column property="inclineValue" label="倾斜值"></el-table-column>
<el-table-column property="inclineValue" label="倾斜值">
<template slot-scope="scope">
{{ scope.row.inclineValue + ' ' + (itemUnit['内部位移倾斜'] || '')}}
</template>
</el-table-column>
<el-table-column property="acquisitionTime" label="时间"></el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="预警值" name="yjz">
<!-- <el-tab-pane label="预警值" name="yjz">
<el-table :data="yjz_tableList" height="60vh">
<el-table-column label="企业名称">
<template>
......@@ -244,21 +299,34 @@
</template>
</el-table-column>
<el-table-column property="yiz_type" label="监测类型"></el-table-column>
<el-table-column property="yiz_one" label="红色预警"></el-table-column>
<el-table-column property="yiz_two" label="橙色预警"></el-table-column>
<el-table-column property="yiz_three" label="黄色预警"></el-table-column>
<el-table-column property="yiz_one" label="红色预警">
<template slot-scope="scope">
{{ scope.row.yiz_one + ' ' + (itemUnit[scope.row.yiz_type] || '')}}
</template>
</el-table-column>
<el-table-column property="yiz_two" label="橙色预警">
<template slot-scope="scope">
{{ scope.row.yiz_two + ' ' + (itemUnit[scope.row.yiz_type] || '')}}
</template>
</el-table-column>
<el-table-column property="yiz_three" label="黄色预警">
<template slot-scope="scope">
{{ scope.row.yiz_three + ' ' + (itemUnit[scope.row.yiz_type] || '')}}
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="报警记录" name="yj">
<el-table :data="yj_tableList" height="60vh">
<el-tab-pane label="报警记录" name="bjjl">
<el-table :data="temp_bjjl_tableList" height="60vh">
<el-table-column label="企业名称">
<template>
{{ wkk_name }}
</template>
</el-table-column>
<el-table-column property="deviceName" label="设备名"></el-table-column>
<el-table-column property="msg" label="报警信息"></el-table-column>
<el-table-column property="monitorStation" label="检测站"></el-table-column>
<el-table-column property="sensorId" label="设备标识"></el-table-column>
<el-table-column property="item" label="报警信息"></el-table-column>
<el-table-column property="level" label="报警等级"> </el-table-column>
<el-table-column property="alarmTime" label="预警时间"></el-table-column>
</el-table>
......@@ -271,10 +339,10 @@
<script>
import { wkk, getRYDWData } from '@/api'
import { jiangYuLiang, jinRunXian, ganTan, kuShuiWei, biaoMianWeiYi, wkkAlarmMsg, findPersonnelReal, neiBuWeiYiQingXie, wkkNeiBuWeiYiChenJiang } from '@/api/weikuangku'
import { jiangYuLiang, jinRunXian, ganTan, kuShuiWei, biaoMianWeiYi, wkkAlarm, findPersonnelReal, neiBuWeiYiQingXie, wkkNeiBuWeiYiChenJiang, personSelectList, findPersonLocationStatistic } from '@/api/weikuangku'
import { mapState } from 'vuex'
import eventBus from '@/utils/eventbus'
import { timeParse, randNum } from '@/utils'
import { timeParse, randNum, getValueUnit, getCompanyCodes } from '@/utils'
import { ExcelExport } from 'pikaz-excel-js'
export default {
components: {
......@@ -286,6 +354,14 @@ export default {
dialogTableVisible: false,
wkk_name: '山金阿尔哈达', // 名称
query:{
startTime: '',
endTime: '',
personnelName:'',
dataType:'',
currentBaseStation:'',
},
start_time: '',
stop_time: '',
......@@ -339,34 +415,49 @@ export default {
nbwyqx_tableList: [],
yjz_tableList: [],
yj_tableList: [],
// 报警记录
bjjl_cur_page: 0,
bjjl_tableList: [],
temp_bjjl_tableList: [],
// 人员定位
rydw_tableList: [],
rydw_cur_page: 0,
rydw_value: '',
rydw_options: [
{
value: '0',
label: '井口',
},
{
value: '1',
label: '井下',
},
{
value: '2',
label: '井内',
},
{
value: '3',
label: '出井',
},
],
personSelects:[], // 人员定位-位置信息
// 人员定位统计
rydwtj_tableList:[],
rydwtj_cur_page: 0,
comm_total: 0,
companycode: '',
hidePartBaseInfo:true
hidePartBaseInfo:true,
itemUnit:getValueUnit(),
}
},
......@@ -374,38 +465,30 @@ export default {
eventBus.$on('dialog_show', data => {
// 隐藏部分菜单
this.hidePartBaseInfo = data.isShow;
this.yjz_tableList = []
let arrName = ['降雨量', '浸润线', '库水位', '干滩', '表面位移']
for (let i of arrName) {
this.yjz_tableList = [
{yiz_type:'降雨量', yiz_one:40, yiz_two:50, yiz_three:60},
{yiz_type:'浸润线', yiz_one:9, yiz_two:8, yiz_three:7},
{yiz_type:'库水位', yiz_one:873.788, yiz_two:874.788, yiz_three:875.788},
{yiz_type:'干滩', yiz_one:90, yiz_two:80, yiz_three:70},
{yiz_type:'表面位移', yiz_one:30, yiz_two:40, yiz_three:50},
{yiz_type:'内部位移沉降', yiz_one:30, yiz_two:40, yiz_three:50},
{yiz_type:'内部位移倾斜', yiz_one:30, yiz_two:40, yiz_three:50},
];
/* for (let i of arrName) {
this.yjz_tableList.push({
yiz_type: i,
yiz_one: randNum(50, 70, 1),
yiz_two: randNum(40, 50, 1),
yiz_three: randNum(30, 20, 1),
})
}
} */
this.activeName = data.activeName
this.dialogTableVisible = true
this.wkk_name = data.dataObj.name
this.companycode = data.dataObj.companycode
wkkAlarmMsg({
page: 0,
size: 1000,
sort: 'id,desc',
companycode: this.companycode,
}).then(res => {
this.yj_tableList = res.content.map(item => {
item.level = item.level + ''
// 操作时间
let index1 = item.alarmTime.indexOf('T')
let str1 = item.alarmTime.substr(0, index1)
let str2 = ' ' + item.alarmTime.slice(index1 + 1, -1)
item.alarmTime = str1.concat(str2)
return item
})
})
let day = 3 * 1 * 86400 * 1000
let dateCur = Date.parse(new Date())
......@@ -445,13 +528,24 @@ export default {
this.rydw_cur_page = 0
this.bmwy_cur_page = 0
this.nbwy_cur_page = 0
this.nbwyqx_cur_page = 0
this.nbwyqx_cur_page = 0;
this.bjjl_cur_page = 0;
this.VisiblePagination = false
this.comm_total = 0
setTimeout(() => {
this.VisiblePagination = true
}, 300)
}, 300);
// get
this.reqPersonSelectList();
},
// 获取企业编码
getCompanyCode(){
var companyCodes = getCompanyCodes();
return companyCodes[this.wkk_name]
},
// 选择站点
......@@ -502,6 +596,10 @@ export default {
this.onGetRYDWData()
}
if (this.activeName == 'rydwtj') {
this.onGetRYDWTJData()
}
if (this.activeName == 'jyl') {
this.jylData()
}
......@@ -528,6 +626,10 @@ export default {
if (this.activeName == 'nbwyqx') {
this.nbwyqxData()
};
if (this.activeName == 'bjjl') {
this.reqAlarmRecord()
}
},
......@@ -548,6 +650,10 @@ export default {
this.onGetRYDWData()
}
if (this.activeName == 'rydwtj') {
this.onGetRYDWTJData()
}
if (e.name == 'jyl') {
this.jylData()
}
......@@ -575,45 +681,54 @@ export default {
if (e.name == 'nbwyqx') {
this.nbwyqxData()
}
if (e.name == 'bjjl') {
this.reqAlarmRecord()
}
},
// 人员定位
onGetRYDWData() {
var MiningAreaId = ''
if (this.wkk_name == '锡林矿业') {
MiningAreaId = 152525002
}
if (this.wkk_name == '山金阿尔哈达') {
MiningAreaId = 152525003
}
if (this.wkk_name == '融冠矿业') {
MiningAreaId = 152525001
}
if (this.wkk_name == '钨矿') {
MiningAreaId = 152525004
}
if (this.wkk_name == '山金白音呼布') {
MiningAreaId = 152525005
}
var MiningAreaId = this.getCompanyCode();
var query = this.query;
findPersonnelReal({
companycode: MiningAreaId,
page: this.rydw_cur_page,
size: 10,
startTime: this.start_time,
endTime: this.stop_time,
order: 'acquisition,desc',
dataType: this.rydw_value,
sort: 'id,desc',
startTime: query.startTime,
endTime: query.endTime,
dataType: query.dataType,
personnelName: query.personnelName,
currentBaseStation: query.currentBaseStation,
}).then(res => {
this.rydw_tableList = res.content
this.comm_total = res.totalElements
})
},
// 人员定位统计
onGetRYDWTJData() {
var MiningAreaId = this.getCompanyCode();
var query = this.query;
findPersonLocationStatistic({
companycode: MiningAreaId,
page: this.rydwtj_cur_page,
size: 10,
sort: 'id,desc',
}).then(res => {
var json = res, list = [];
for(var key in json){
list.push({
position:key,
num:json[key]
})
};
this.rydwtj_tableList = list
})
},
// 降雨量
jylData() {
let params = {
......@@ -808,6 +923,11 @@ export default {
this.onGetRYDWData()
}
if (this.activeName == 'rydwtj') {
this.rydwtj_cur_page = e
this.onGetRYDWTJData()
}
if (this.activeName == 'jyl') {
this.jyl_cur_page = e
this.jylData()
......@@ -842,6 +962,49 @@ export default {
this.nbwyqx_cur_page = e
this.nbwyqxData()
}
if (this.activeName == 'bjjl') {
this.bjjl_cur_page = e
this.reqAlarmRecord()
}
},
// 获取人员选择列表
reqPersonSelectList(){
var companycode = this.getCompanyCode();
personSelectList({companycode:companycode}).then(res => {
var list = res, len = list.length;
var selects = [];
for(var i=0; i<len; i++){
selects.push({key:i, value:list[i]});
};
this.personSelects = selects;
})
},
// 报警记录
reqAlarmRecord() {
this.bjjl_tableList = [];
wkkAlarm({
page: this.bjjl_cur_page,
size: 10,
sort: 'id,desc',
companycode: this.companycode,
}).then(res => {
this.bjjl_tableList = res.content;
this.comm_total = res.totalElements
/* this.bjjl_tableList = res.content.map(item => {
item.level = item.level + '级'
// 操作时间
let index1 = item.alarmTime.indexOf('T')
let str1 = item.alarmTime.substr(0, index1)
let str2 = ' ' + item.alarmTime.slice(index1 + 1, -1)
item.alarmTime = str1.concat(str2)
return item
}) */
})
},
},
......
......@@ -9,18 +9,36 @@ export default {
// 展示三维
onClickthree() {
let title = this.$store.state.compony_info.name;
if (title == '锡林矿业') {
window.open('http://dwqdp.jingkongyun.com/three/?id=5', '_blank');
window.open('http://dwqdp.jingkongyun.com/xilin/', '_blank');
} else if (title == '融冠矿业') {
//window.open('http://ndwqu3.jingkongyun.com/3DRongGuan/', '_blank');
window.open('http://dwqdp.jingkongyun.com/3DRongGuan/index.html', '_blank');
} else if (title == '钨矿') {
window.open('http://dwqdp.jingkongyun.com/three/?id=3', '_blank');
window.open('http://dwqdp.jingkongyun.com/wukuang/', '_blank');
} else if (title == '山金阿尔哈达') {
//window.open('http://dwqdp.jingkongyun.com/three/?id=2', '_blank');
window.open('http://dwqdp.jingkongyun.com/aerhada/index.html', '_blank');
window.open('http://dwqdp.jingkongyun.com/aerhada/', '_blank');
} else if (title == '山金白音呼布') {
window.open('http://dwqdp.jingkongyun.com/three/?id=1', '_blank');
//window.open('http://dwqdp.jingkongyun.com/three/?id=1', '_blank');
window.open('http://dwqdp.jingkongyun.com/baiyinhubu/', '_blank');
} else if (title == '宝力格') {
window.open('http://dwqdp.jingkongyun.com/baolige/', '_blank');
} else if (title == '雅斯作业区') {
window.open('http://dwqdp.jingkongyun.com/yasi/', '_blank');
} else if (title == '阿尔作业区') {
window.open('http://dwqdp.jingkongyun.com/aer/', '_blank');
} else if (title == '沈铁物流') {
window.open('http://dwqdp.jingkongyun.com/shentiewuliu/', '_blank');
} else if (title == '延长宏博') {
window.open('http://dwqdp.jingkongyun.com/yanchanghongbo/', '_blank');
} else if (title == '中康石油') {
window.open('http://dwqdp.jingkongyun.com/zhongkangshiyou/', '_blank');
} else if (title == '天地煤矿') {
window.open('http://dwqdp.jingkongyun.com/tiandimeikuang/', '_blank');
} else if (title == '乌尼特煤矿') {
window.open('http://dwqdp.jingkongyun.com/wunite/', '_blank');
} else {
this.$notify.error({
title: '错误',
......
......@@ -74,4 +74,53 @@ export function randNum(min, max, len, isRound) {
}
export const imgBase64 = 'image://data:image/png;base64,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'
\ No newline at end of file
// 环境检测单位
export function getValueUnit() {
// .....
return {
'风速':'m/s',
'一氧化碳':'ppm',
'二氧化碳':'ppm',
'二氧化氮':'%',
'温度':'°C',
'压差':'kPa',
'负压':'kPa',
'降雨量':'mm',
'浸润线':'m',
'库水位':'m',
'干滩':'m',
'表面位移':'mm',
'内部位移沉降':'mm',
'内部位移倾斜':'mm',
};
};
// 获取企业编码
export function getCompanyCodes() {
return {
'锡林矿业':152525002,
'山金阿尔哈达':152525003,
'融冠矿业':152525001,
'钨矿':152525004,
'山金白音呼布':152525005,
'宝力格':152525006,
'雅斯作业区':152525007,
'阿尔作业区':152525008,
'测试企业':111,
'沈铁物流':152525009,
'延长宏博':152525010,
'中康石油':152525011,
'天地煤矿':152525012,
};
};
export const imgBase64 = 'image://data:image/png;base64,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';
\ No newline at end of file
import axios from 'axios'
//import router from '@/router/routers'
//import Config from '@/config'
import { Message, Notification } from 'element-ui'
const service = axios.create({
// baseURL: 'http://192.168.1.123:8000/', //小葱
baseURL: 'http://39.98.150.124:8000/',
//## baseURL: 'http://39.98.150.124:8000/',
//## timeout: 30000,
baseURL: process.env.NODE_ENV === 'production' ? process.env.BASE_API : '/', // api 的 base_url
timeout: 30000,
})
......
......@@ -15,6 +15,20 @@ module.exports = {
disableHostCheck: true
},
// vue-cli3 配置举例, vue.config.js中
devServer: {
proxy: {
// 天气接口
'/weather': {
target: 'http://i.tianqi.com/', // 真实请求URl
changeOrigin: true, // 允许跨域
pathRewrite: { // 替换,通配/api的替换成/
'^/weather': '/'
}
},
}
},
// devServer: {
// proxy: {
// '/index': {
......
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