Skip to content

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

人员定位

parent 9ffcb9c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 245 deletions
.env.development
View file @ 7dc02d56
......@@ -3,10 +3,10 @@ ENV = 'development'
# 接口地址
#VUE_APP_BASE_API = 'http://8.143.203.103:9091'
#VUE_APP_BASE_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_LOCAL_API = 'http://192.168.3.23:9092'
VUE_APP_BASE_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_LOCAL_API = 'http://192.168.3.23:9092'
VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9091/'
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(){
url: '/tab/perequipment/out',
method: 'get',
params:param,
responseType: 'blob'
})
},
......
src/views/DeviceManage/callPolice/index.vue
View file @ 7dc02d56
......@@ -22,8 +22,8 @@
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/DeviceManage/callPoliceLog/index.vue
View file @ 7dc02d56
......@@ -22,8 +22,8 @@
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/personnelPositioning/beacon/index.vue
View file @ 7dc02d56
......@@ -5,8 +5,8 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">设备号</label>
<el-input v-model="query.beaconame" clearable size="small" placeholder="请输入设备号" style="width:180px;"/>
<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-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>
</div>
......@@ -153,6 +153,8 @@ export default {
var param = this.query;
param.page = this.page - 1;
param.size = this.size;
param.vague = {beaconame:param.beaconame||undefined};
param.sort = `date,desc`;
this.$nextTick(() => {
//获取安检信息
HttpReq.truckDispatching.propleGetPerbeacon(param).then((res) => {
......
src/views/personnelPositioning/peopleLocation/index.vue
View file @ 7dc02d56
......@@ -5,8 +5,19 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">设备号</label>
<el-input v-model="query.beaconame" clearable size="small" placeholder="请输入设备号" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">人员姓名</label>
<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" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div>
......@@ -35,7 +46,7 @@
<el-table-column prop="safetyhatelectricity" label="安全帽电量" align="center"></el-table-column>
<el-table-column prop="safetyhatstatus" label="安全帽状态" align="center">
<template slot-scope="scope">
<span>{{ scope.row.safetyhatstatus=='2'?'在线':'离线' }}</span>
<span>{{ scope.row.safetyhatstatus=='1'?'在线':'离线' }}</span>
</template>
</el-table-column>
<el-table-column prop="lastonlinetime" label="最后一次在线时间" align="center"></el-table-column>
......@@ -133,9 +144,9 @@
<el-row>
<el-col :span="12">
<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">
<el-input v-model="formData.idcard" class="cell-input"></el-input>
<el-input v-model="formData.safetyhatmac" class="cell-input"></el-input>
</div>
</el-form-item>
</div>
......@@ -152,6 +163,17 @@
</div>
</el-col>
</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-col :span="24">
<div class="grid-content">
......@@ -212,7 +234,9 @@ export default {
name: '',
sex: 1,
phone: '',
cameraid: '',
idcard: '',
safetyhatmac: '',
color: '1',
deptid: undefined,
postid: undefined,
......@@ -221,8 +245,9 @@ export default {
deptName: '',
rules: {
name: {required: true, message: ' ', trigger: 'blur'},
sex: {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'},
},
}
......@@ -286,7 +311,13 @@ export default {
var param = this.query;
param.page = this.page - 1;
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(() => {
//获取安检信息
HttpReq.truckDispatching.propleGetPerequipment(param).then((res) => {
......@@ -305,7 +336,9 @@ export default {
name: '',
sex: 1,
phone: '',
cameraid: '',
idcard: '',
safetyhatmac: '',
color: '1',
deptid: undefined,
postid: undefined,
......@@ -335,13 +368,11 @@ export default {
})
})
},
download(obj, name, suffix) {
var url = window.URL.createObjectURL(new Blob([obj]));
download(text, name, suffix) {
var link = document.createElement('a');
link.style.display = 'none';
link.href = url;
var fileName = name + '.' + suffix;
link.setAttribute('download', fileName);
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);
......@@ -356,12 +387,17 @@ export default {
var param = this.query;
param.page = this.page - 1;
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) => {
if (res.code == 200) {
loading.close();
this.download(res.body, 'xxx', 'xlsx')
}
loading.close();
let d = new Date();
this.download(res, `人员设备定位_${d.getFullYear()}${('0'+(d.getMonth()+1)).substr(-2)}${('0'+(d.getDate())).substr(-2)}`, 'xlsx')
})
},
cancelForm() {
......
src/views/safetyManagement/checkLog/index.vue
View file @ 7dc02d56
......@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">生成日期</label>
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/slopeMonitoring/alarmManagement/index.vue
View file @ 7dc02d56
......@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="query.timeList"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/slopeMonitoring/environmentalAlarm/index.vue
View file @ 7dc02d56
......@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/slopeMonitoring/environmentalMonitoring/index.vue
View file @ 7dc02d56
......@@ -10,8 +10,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="query.timeList"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/slopeMonitoring/precipitationLog/index.vue
View file @ 7dc02d56
......@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="query.timeList"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......@@ -72,8 +72,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="search.timeList"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/slopeMonitoring/surfaceDisplacementLog/index.vue
View file @ 7dc02d56
......@@ -14,8 +14,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="query.timeList"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......@@ -69,8 +69,8 @@
<label class="el-form-item-label" style="font-weight: 500;">日期范围</label>
<el-date-picker
v-model="search.timeList"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......
src/views/system/logmanage/index.vue
View file @ 7dc02d56
......@@ -9,8 +9,8 @@
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......@@ -106,7 +106,7 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
this.loading = true;
HttpReq.reoperationlog.getLog(param).then((res) => {
......@@ -179,7 +179,7 @@ export default {
.el-table .success-row {
background: #f0f9eb;
}
.dialog-map{border:1px solid green;height:300px;width:480px;}
</style>
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