Skip to content

K
kd_control
Commit 7dc02d56 authored by zhanglw's avatar zhanglw
Browse files
Options

人员定位

parent 9ffcb9c1
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 245 deletions
.env.development
View file @ 7dc02d56
...@@ -3,10 +3,10 @@ ENV = 'development' ...@@ -3,10 +3,10 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://8.143.203.103:9091' #VUE_APP_BASE_API = 'http://8.143.203.103:9091'
#VUE_APP_BASE_API = 'http://192.168.3.216:9092' VUE_APP_BASE_API = 'http://192.168.3.216:9092'
#VUE_APP_LOCAL_API = 'http://192.168.3.216:9092' VUE_APP_LOCAL_API = 'http://192.168.3.216:9092'
VUE_APP_BASE_API = 'http://192.168.3.23:9092' #VUE_APP_BASE_API = 'http://192.168.3.23:9092'
VUE_APP_LOCAL_API = 'http://192.168.3.23:9092' #VUE_APP_LOCAL_API = 'http://192.168.3.23:9092'
VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/' VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/'
VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket' VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket'
......
src/assets/js/common.js
View file @ 7dc02d56
...@@ -2991,6 +2991,7 @@ var HttpReq = function(){ ...@@ -2991,6 +2991,7 @@ var HttpReq = function(){
url: '/tab/perequipment/out', url: '/tab/perequipment/out',
method: 'get', method: 'get',
params:param, params:param,
responseType: 'blob'
}) })
}, },
......
src/views/DeviceManage/callPolice/index.vue
View file @ 7dc02d56
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<el-date-picker <el-date-picker
v-model="query.createTime" v-model="query.createTime"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/DeviceManage/callPoliceLog/index.vue
View file @ 7dc02d56
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<el-date-picker <el-date-picker
v-model="query.createTime" v-model="query.createTime"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/personnelPositioning/beacon/index.vue
View file @ 7dc02d56
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">设备号</label> <label class="el-form-item-label" style="font-weight: 500;">信标名称</label>
<el-input v-model="query.beaconame" clearable size="small" placeholder="请输入设备号" style="width:180px;"/> <el-input v-model="query.beaconame" clearable size="small" placeholder="请输入名称" style="width:180px;"/>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div> </div>
...@@ -153,6 +153,8 @@ export default { ...@@ -153,6 +153,8 @@ export default {
var param = this.query; var param = this.query;
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.size = this.size;
param.vague = {beaconame:param.beaconame||undefined};
param.sort = `date,desc`;
this.$nextTick(() => { this.$nextTick(() => {
//获取安检信息 //获取安检信息
HttpReq.truckDispatching.propleGetPerbeacon(param).then((res) => { HttpReq.truckDispatching.propleGetPerbeacon(param).then((res) => {
......
src/views/personnelPositioning/peopleLocation/index.vue
View file @ 7dc02d56
...@@ -5,8 +5,19 @@ ...@@ -5,8 +5,19 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">设备号</label> <label class="el-form-item-label" style="font-weight: 500;">人员姓名</label>
<el-input v-model="query.beaconame" clearable size="small" placeholder="请输入设备号" style="width:180px;"/> <el-input v-model="query.name" clearable size="small" placeholder="请输入人员姓名" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">安全帽</label>
<el-input v-model="query.safetyhatmac" clearable size="small" placeholder="请输入安全帽MAC" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="query.timeList"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div> </div>
...@@ -35,7 +46,7 @@ ...@@ -35,7 +46,7 @@
<el-table-column prop="safetyhatelectricity" label="安全帽电量" align="center"></el-table-column> <el-table-column prop="safetyhatelectricity" label="安全帽电量" align="center"></el-table-column>
<el-table-column prop="safetyhatstatus" label="安全帽状态" align="center"> <el-table-column prop="safetyhatstatus" label="安全帽状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.safetyhatstatus=='2'?'在线':'离线' }}</span> <span>{{ scope.row.safetyhatstatus=='1'?'在线':'离线' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastonlinetime" label="最后一次在线时间" align="center"></el-table-column> <el-table-column prop="lastonlinetime" label="最后一次在线时间" align="center"></el-table-column>
...@@ -133,9 +144,9 @@ ...@@ -133,9 +144,9 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
<el-form-item label="身份证号：" class="form-cell" prop="idcard"> <el-form-item label="安全帽MAC：" class="form-cell" prop="safetyhatmac">
<div class="cell-box"> <div class="cell-box">
<el-input v-model="formData.idcard" class="cell-input"></el-input> <el-input v-model="formData.safetyhatmac" class="cell-input"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
...@@ -152,6 +163,17 @@ ...@@ -152,6 +163,17 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<div class="grid-content">
<el-form-item label="身份证号：" class="form-cell" prop="idcard">
<div class="cell-box">
<el-input v-model="formData.idcard" class="cell-input"></el-input>
</div>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="grid-content"> <div class="grid-content">
...@@ -212,7 +234,9 @@ export default { ...@@ -212,7 +234,9 @@ export default {
name: '', name: '',
sex: 1, sex: 1,
phone: '', phone: '',
cameraid: '',
idcard: '', idcard: '',
safetyhatmac: '',
color: '1', color: '1',
deptid: undefined, deptid: undefined,
postid: undefined, postid: undefined,
...@@ -221,8 +245,9 @@ export default { ...@@ -221,8 +245,9 @@ export default {
deptName: '', deptName: '',
rules: { rules: {
name: {required: true, message: ' ', trigger: 'blur'}, name: {required: true, message: ' ', trigger: 'blur'},
sex: {required: true, message: ' ', trigger: 'blur'},
phone: {required: true, message: ' ', trigger: 'blur'}, phone: {required: true, message: ' ', trigger: 'blur'},
cameraid: {required: true, message: ' ', trigger: 'blur'},
safetyhatmac: {required: true, message: ' ', trigger: 'blur'},
idcard: {required: true, message: ' ', trigger: 'blur'}, idcard: {required: true, message: ' ', trigger: 'blur'},
}, },
} }
...@@ -286,7 +311,13 @@ export default { ...@@ -286,7 +311,13 @@ export default {
var param = this.query; var param = this.query;
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.size = this.size;
param.type = 0; param.exact = {"type":"0"};
param.vague = {name:param.name||undefined,safetyhatmac:param.safetyhatmac||undefined};
param.sort = `date,desc`;
param.daterange = undefined;
if(param.timeList && param.timeList.length){
param.daterange=param.timeList.join(',');
}
this.$nextTick(() => { this.$nextTick(() => {
//获取安检信息 //获取安检信息
HttpReq.truckDispatching.propleGetPerequipment(param).then((res) => { HttpReq.truckDispatching.propleGetPerequipment(param).then((res) => {
...@@ -305,7 +336,9 @@ export default { ...@@ -305,7 +336,9 @@ export default {
name: '', name: '',
sex: 1, sex: 1,
phone: '', phone: '',
cameraid: '',
idcard: '', idcard: '',
safetyhatmac: '',
color: '1', color: '1',
deptid: undefined, deptid: undefined,
postid: undefined, postid: undefined,
...@@ -335,13 +368,11 @@ export default { ...@@ -335,13 +368,11 @@ export default {
}) })
}) })
}, },
download(obj, name, suffix) { download(text, name, suffix) {
var url = window.URL.createObjectURL(new Blob([obj]));
var link = document.createElement('a'); var link = document.createElement('a');
link.style.display = 'none'; link.style.display = 'none';
link.href = url; link.href = URL.createObjectURL(new Blob([text], { type: "application/vnd.ms-excel" }));
var fileName = name + '.' + suffix; link.setAttribute('download', name + '.' + suffix);
link.setAttribute('download', fileName);
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
document.body.removeChild(link); document.body.removeChild(link);
...@@ -356,12 +387,17 @@ export default { ...@@ -356,12 +387,17 @@ export default {
var param = this.query; var param = this.query;
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.size = this.size;
param.type = 0; param.vague = {name:param.name||undefined,safetyhatmac:param.safetyhatmac||undefined};
param.exact = {"type":"0"};
param.sort = `date,desc`;
param.daterange = undefined;
if(param.timeList && param.timeList.length){
param.daterange=param.timeList.join(',');
}
HttpReq.truckDispatching.propleGetPerequipmentOut(param).then((res) => { HttpReq.truckDispatching.propleGetPerequipmentOut(param).then((res) => {
if (res.code == 200) {
loading.close(); loading.close();
this.download(res.body, 'xxx', 'xlsx') let d = new Date();
} this.download(res, `人员设备定位_${d.getFullYear()}${('0'+(d.getMonth()+1)).substr(-2)}${('0'+(d.getDate())).substr(-2)}`, 'xlsx')
}) })
}, },
cancelForm() { cancelForm() {
......
src/views/personnelPositioning/visitPeople/index.vue
View file @ 7dc02d56
...@@ -5,12 +5,19 @@ ...@@ -5,12 +5,19 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">设备号</label> <label class="el-form-item-label" style="font-weight: 500;">摄像头id</label>
<el-input v-model="query.equipno" clearable size="small" placeholder="请输入设备号" style="width:180px;"/> <el-input v-model="query.cameraid" clearable size="small" placeholder="请输入id" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">在线状态</label> <label class="el-form-item-label" style="font-weight: 500;">安全帽</label>
<el-select v-model="query.onlineStatus" placeholder="请选择"> <el-input v-model="query.safetyhatmac" clearable size="small" placeholder="请输入安全帽MAC" style="width:180px;"/>
<el-option v-for="item in stuOpts" :key="item.value" :label="item.label" :value="item.value"></el-option> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
</el-select> <el-date-picker
v-model="query.timeList"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div> </div>
...@@ -23,21 +30,19 @@ ...@@ -23,21 +30,19 @@
<div class="content-fix"> <div class="content-fix">
<div class="toolbar"> <div class="toolbar">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="toAdd">新增</el-button> <el-button size="mini" type="primary" icon="el-icon-plus" @click="toAdd">新增</el-button>
<el-button size="mini" icon="el-icon-document" @click="downloadFile">导出</el-button>
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="equipname" label="设备名称" align="center"></el-table-column> <el-table-column prop="cameraid" label="摄像头id" align="center"></el-table-column>
<el-table-column prop="devicetype" label="设备类型" align="center"> <el-table-column prop="safetyhatmac" label="安全帽MAC" align="center"></el-table-column>
<el-table-column prop="safetyhatelectricity" label="安全帽电量" align="center"></el-table-column>
<el-table-column prop="safetyhatstatus" label="安全帽状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{formatOpt(devOpts, scope.row.devicetype)}}</span> <span>{{ scope.row.safetyhatstatus=='1'?'在线':'离线' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="equipno" label="设备编号" align="center"></el-table-column> <el-table-column prop="lastonlinetime" label="最后一次在线时间" align="center"></el-table-column>
<el-table-column prop="eqdanwei" label="数值单位" align="center"></el-table-column>
<el-table-column prop="installationdata" label="安装日期" align="center"></el-table-column>
<el-table-column prop="manufacture" label="生产厂家" align="center"></el-table-column>
<el-table-column prop="datarealtime" label="最后更新时间" align="center"></el-table-column>
<el-table-column prop="onlineStatus" label="状态" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button> <el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
...@@ -56,44 +61,22 @@ ...@@ -56,44 +61,22 @@
</div> </div>
<!-- 表单渲染 --> <!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="title" width="800px"> <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="title" width="800px">
<el-form :model="formData" :rules="rules" ref="formViewRef" :inline="true" :status-icon="true" size="mini"> <el-form :model="formData" :rules="rules" ref="formViewRef" :inline="true" :status-icon="true">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
<el-form-item label="设备名称：" prop="equipname" class="form-cell"> <el-form-item label="摄像头id：" class="form-cell" prop="cameraid">
<div class="cell-box"> <div class="cell-box">
<el-input v-model="formData.equipname" class="cell-input"></el-input> <el-input v-model="formData.cameraid" class="cell-input"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
<el-form-item label="设备类型：" class="form-cell" prop="devicetype"> <el-form-item label="安全帽MAC：" class="form-cell" prop="safetyhatmac">
<div class="cell-box"> <div class="cell-box">
<el-select v-model="formData.devicetype" placeholder="无" class="cell-input"> <el-input v-model="formData.safetyhatmac" class="cell-input"></el-input>
<el-option v-for="item in devOpts" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="grid-content">
<el-form-item label="设备编号：" class="form-cell" prop="equipno">
<div class="cell-box">
<el-input v-model="formData.equipno" class="cell-input"></el-input>
</div>
</el-form-item>
</div>
</el-col>
<el-col :span="12">
<div class="grid-content">
<el-form-item label="数值单位：" class="form-cell" prop="eqdanwei">
<div class="cell-box">
<el-input v-model="formData.eqdanwei" class="cell-input"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
...@@ -127,98 +110,16 @@ export default { ...@@ -127,98 +110,16 @@ export default {
query: {}, query: {},
map: null, map: null,
graphicLayer: null, graphicLayer: null,
stuOpts: [
{label: '全部', value: undefined},
{label: '离线', value: '离线'},
{label: '在线', value: '在线'},
],
devOpts: [
{label: '干滩', value: 1},
{label: '库水位', value: 2},
{label: '表面位移', value: 3},
{label: '内部位移', value: 4},
{label: '浸润线', value: 5},
{label: '降雨量', value: 6},
{label: '排流量', value: 7},
{label: '水质', value: 8},
{label: '渗流量', value: 9},
{label: '外坡比', value: 16},
],
datOpts:[
{label: '是', value: 1},
{label: '否', value: 0},
],
usedOpts:[
{label: '在用', value: 1},
{label: '不在用', value: 0},
],
eqtOpts:[
{label: '4G设备', value: 0},
{label: 'IP设备', value: 1},
{label: 'mqtt设备', value: 2},
],
bjOpts:[
{label: '报警', value: 1},
{label: '不报警', value: 0},
],
ssOpts: [
{label: 'gnss', value: 0},
{label: '超声', value: 1},
{label: '投入式水位计或渗压计', value: 2},
{label: '沉降', value: 3},
{label: '雨量', value: 5},
{label: '测斜', value: 7},
],
tableData: [], tableData: [],
formData: { formData: {
longitude: '', cameraid: '',
latitude: '', safetyhatmac: '',
equipname: '',
equipno: '',
devicetype: '',
eqdanwei: '',
installationdata: '',
manufacture: '',
datumpoint: 0,
installheight: '',
electricitysupply: '',
accuracy: '',
altitude: '',
onelevelalarm: '',
twolevelalarm: '',
threelevelalarm: '',
fourlevelalarm: '',
isUsed: '',
ipaddress: '',
eqtype: '',
initial: '',
initialx: '',
initialy: '',
initialz: '',
state: '',
burialDepth: '',
checkperiod: '',
sensortype: '',
bmwyX: '',
bmwyY: '',
bmwyZ: '',
jrxTrepanning: '',
jrxBurial: '',
jrxCoordX: '',
kswequipno: '',
gtwangle: '',
gtsafeheight: '',
pslspeed: '',
}, },
rules: { rules: {
longitude: {required: true, message: '请在地图上放置设备', trigger: 'blur'}, cameraid: {required: true, message: ' ', trigger: 'blur'},
equipname: {required: true, message: ' ', trigger: 'blur'}, safetyhatmac: {required: true, message: ' ', trigger: 'blur'},
equipno: {required: true, message: ' ', trigger: 'blur'},
devicetype: {required: true, message: ' ', trigger: 'blur'},
eqdanwei: {required: true, message: ' ', trigger: 'blur'},
installationdata: {required: true, message: ' ', trigger: 'blur'},
manufacture: {required: true, message: ' ', trigger: 'blur'},
datumpoint: {required: true, message: ' ', trigger: 'blur'},
}, },
} }
}, },
...@@ -228,64 +129,24 @@ export default { ...@@ -228,64 +129,24 @@ export default {
}) })
}, },
methods: { methods: {
formatOpt(arr,val){
let str='';
arr.forEach((item)=>{
if(item.value==val){
str = item.label;
}
});
return str;
},
onMapload(map) {
map.unbindContextMenu();
var graphicLayer = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer);
const graphic = new mars3d.graphic.PointEntity({
style: {
color: "#ff0000",
pixelSize: 10,
outlineColor: "#ffffff",
outlineWidth: 2,
label: {
text: "放置位置",
font_size: 18,
color: "#ff0000",
outline: true,
outlineColor: "#000000",
outlineWidth: 5,
pixelOffsetY: -24,
distanceDisplayCondition: true,
distanceDisplayCondition_far: 500000,
distanceDisplayCondition_near: 0
}
},
})
graphicLayer.addGraphic(graphic);
map.on(mars3d.EventType.click, (event) => {
let p = mars3d.LngLatPoint.fromCartesian(event.cartesian);
this.formData.longitude = p.lng;
this.formData.latitude = p.lat;
graphicLayer.eachGraphic((graphic) => {
graphic.addDynamicPosition(Cesium.Cartesian3.fromDegrees(p.lng, p.lat, 0), 0)
})
});
this.map = map;
this.graphicLayer = graphicLayer;
},
loadData() { loadData() {
var sort = 'id,desc';
var param = this.query; var param = this.query;
param.page = this.page - 1; param.page = this.page - 1;
param.pageSize = this.size; param.size = this.size;
param.sort = sort; param.vague = {cameraid:param.cameraid||undefined,safetyhatmac:param.safetyhatmac||undefined};
param.exact = {"type":"1"};
param.sort = `date,desc`;
param.daterange = undefined;
if(param.timeList && param.timeList.length){
param.daterange=param.timeList.join(',');
}
this.$nextTick(() => { this.$nextTick(() => {
//获取安检信息 //获取安检信息
HttpReq.truckDispatching.slopeGetDeviceList(param).then((res) => { HttpReq.truckDispatching.propleGetPerequipment(param).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.loading = false; this.loading = false;
this.tableData = res.data.records; this.tableData = res.body.list;
this.total = res.data.total; this.total = res.body.total;
} }
}) })
}) })
...@@ -293,21 +154,15 @@ export default { ...@@ -293,21 +154,15 @@ export default {
toAdd() { toAdd() {
this.title = '新增'; this.title = '新增';
this.visible = true; this.visible = true;
this.formData = {
cameraid: '',
safetyhatmac: '',
};
}, },
toEdit(item) { toEdit(item) {
HttpReq.truckDispatching.slopeGetDevice({id:item.id}).then((res) => {
if (res.code == 200) {
this.title = '编辑'; this.title = '编辑';
this.visible = true; this.visible = true;
this.formData = res.data; this.formData = item;
setTimeout(() => {
this.graphicLayer.eachGraphic((graphic) => {
graphic.addDynamicPosition(Cesium.Cartesian3.fromDegrees(this.formData.longitude, this.formData.latitude, 0), 0)
})
this.map.setCameraView({ lat: this.formData.latitude, lng: this.formData.longitude });
},5000)
}
})
}, },
toDelete(item) { toDelete(item) {
var id = item.id; var id = item.id;
...@@ -316,7 +171,7 @@ export default { ...@@ -316,7 +171,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then((e) => { }).then((e) => {
HttpReq.truckDispatching.slopeDeleteDevice({id}).then((res) => { HttpReq.truckDispatching.propleDeletePerequipment({id}).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
...@@ -327,9 +182,40 @@ export default { ...@@ -327,9 +182,40 @@ export default {
}) })
}) })
}, },
download(text, name, suffix) {
var link = document.createElement('a');
link.style.display = 'none';
link.href = URL.createObjectURL(new Blob([text], { type: "application/vnd.ms-excel" }));
link.setAttribute('download', name + '.' + suffix);
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
},
downloadFile() {
var loading = this.$loading({
lock: true,
text: '请稍后.....',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
var param = this.query;
param.page = this.page - 1;
param.size = this.size;
param.vague = {cameraid:param.cameraid||undefined,safetyhatmac:param.safetyhatmac||undefined};
param.exact = {"type":"1"};
param.sort = `date,desc`;
param.daterange = undefined;
if(param.timeList && param.timeList.length){
param.daterange=param.timeList.join(',');
}
HttpReq.truckDispatching.propleGetPerequipmentOut(param).then((res) => {
loading.close();
let d = new Date();
this.download(res, `人员设备定位_${d.getFullYear()}${('0'+(d.getMonth()+1)).substr(-2)}${('0'+(d.getDate())).substr(-2)}`, 'xlsx')
})
},
cancelForm() { cancelForm() {
this.visible = false; this.visible = false;
this.$refs.formViewRef.resetFields();
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
}, },
...@@ -352,11 +238,27 @@ export default { ...@@ -352,11 +238,27 @@ export default {
this.size = e this.size = e
this.loadData() this.loadData()
}, },
//图片上传
excelImport(event) {
let file = event.target.files[0];
let formData = new FormData();
formData.append("files", file);
HttpReq.truckDispatching.proplePostPerequipmentUpload(formData).then((res) => {
this.$notify({
title: '上传成功！',
type: 'success',
duration: 2500
});
this.formData.photo = res.body;
})
},
submitForm(validateName, item) { submitForm(validateName, item) {
this.$refs[validateName].validate(valid => { this.$refs[validateName].validate(valid => {
if (valid) { if (valid) {
item.type = 1;
item.deptid = this.deptName;
if (this.title === '新增') { if (this.title === '新增') {
HttpReq.truckDispatching.slopePostDevice(item).then((res) => { HttpReq.truckDispatching.proplePostPerequipment(item).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
...@@ -367,7 +269,7 @@ export default { ...@@ -367,7 +269,7 @@ export default {
} }
}) })
} else { } else {
HttpReq.truckDispatching.slopePutDevice(item).then((res) => { HttpReq.truckDispatching.proplePutPerequipment(item).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
......
src/views/safetyManagement/checkLog/index.vue
View file @ 7dc02d56
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">生成日期</label> <label class="el-form-item-label" style="font-weight: 500;">生成日期</label>
<el-date-picker <el-date-picker
v-model="query.createTime" v-model="query.createTime"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/slopeMonitoring/alarmManagement/index.vue
View file @ 7dc02d56
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="query.timeList" v-model="query.timeList"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/slopeMonitoring/environmentalAlarm/index.vue
View file @ 7dc02d56
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="query.createTime" v-model="query.createTime"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/slopeMonitoring/environmentalMonitoring/index.vue
View file @ 7dc02d56
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="query.timeList" v-model="query.timeList"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/slopeMonitoring/precipitationLog/index.vue
View file @ 7dc02d56
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="query.timeList" v-model="query.timeList"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="search.timeList" v-model="search.timeList"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/slopeMonitoring/surfaceDisplacementLog/index.vue
View file @ 7dc02d56
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="query.timeList" v-model="query.timeList"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label> <label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker <el-date-picker
v-model="search.timeList" v-model="search.timeList"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
src/views/system/logmanage/index.vue
View file @ 7dc02d56
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<el-date-picker <el-date-picker
v-model="query.createTime" v-model="query.createTime"
type="datetimerange" type="daterange"
value-format="yyyy-MM-dd HH:MM:SS" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
......
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