Skip to content

N
NewTruckTerminalSyetem
Commit 690dcc2c authored by xxx's avatar xxx
Browse files
Options

1

parent c437da7a
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 61 deletions
src/views/MLargeScreen/index.vue
View file @ 690dcc2c
......@@ -96,7 +96,7 @@ import smallWindow from './components/smallWindow/index.vue' //小窗口车辆
import mars3dViewerMap from '../../components/mars3d/Map.vue' //地图
import ElectricQuantity from '../../components/electricity/index.vue' //电池组件
axios.defaults.baseURL = "/jiankong";
//axios.defaults.baseURL = "/jiankong";
export default {
components: {
......@@ -197,37 +197,37 @@ export default {
}
});
//获取摄像头报警数据
if(that.devices != ''){
axios.get('/jiankong/StandardApiAction_vehicleAlarm.action', {
params: {
jsession:that.jsession,
DevIDNO:that.devices
}
}).then(function (response) {
if(response.data.alarmlist.length != 0){
that.$nextTick(()=>{
that.$notify({
title:
response.data.alarmlist[0].type == 620 ? "接打电话报警" :
response.data.alarmlist[0].type == 621 ? '接打电话报警' :
response.data.alarmlist[0].type == 624 ? '分神驾驶报警' :
response.data.alarmlist[0].type == 625 ? '分神驾驶报警' :
response.data.alarmlist[0].type == 600 ? '前向碰撞报警' :
response.data.alarmlist[0].type == 601 ? '前向碰撞报警' :
response.data.alarmlist[0].type == 172 ? '疲劳驾驶报警' :
response.data.alarmlist[0].type == 190 ? '疲劳驾驶报警' :
response.data.alarmlist[0].type == 430 ? '接近报警' :
response.data.alarmlist[0].type == 431 ? '接近报警' :
response.data.alarmlist[0].type == 432 ? '接近报警' :
response.data.alarmlist[0].type == 433 ? '接近报警' : '',
type: 'warning',
duration: 5000,
dangerouslyUseHTMLString: true,
});
})
}
})
}
// if(that.devices != ''){
// axios.get('/jiankong/StandardApiAction_vehicleAlarm.action', {
// params: {
// jsession:that.jsession,
// DevIDNO:that.devices
// }
// }).then(function (response) {
// if(response.data.alarmlist.length != 0){
// that.$nextTick(()=>{
// that.$notify({
// title:
// response.data.alarmlist[0].type == 620 ? "接打电话报警" :
// response.data.alarmlist[0].type == 621 ? '接打电话报警' :
// response.data.alarmlist[0].type == 624 ? '分神驾驶报警' :
// response.data.alarmlist[0].type == 625 ? '分神驾驶报警' :
// response.data.alarmlist[0].type == 600 ? '前向碰撞报警' :
// response.data.alarmlist[0].type == 601 ? '前向碰撞报警' :
// response.data.alarmlist[0].type == 172 ? '疲劳驾驶报警' :
// response.data.alarmlist[0].type == 190 ? '疲劳驾驶报警' :
// response.data.alarmlist[0].type == 430 ? '接近报警' :
// response.data.alarmlist[0].type == 431 ? '接近报警' :
// response.data.alarmlist[0].type == 432 ? '接近报警' :
// response.data.alarmlist[0].type == 433 ? '接近报警' : '',
// type: 'warning',
// duration: 5000,
// dangerouslyUseHTMLString: true,
// });
// })
// }
// })
// }
}
}
});
......@@ -249,27 +249,27 @@ export default {
this.$refs.startOrderReceivingMethod.loadData(this.carnumber);
this.$refs.voiceApplicationMethod.loadData3(this.carnumber);
//获取摄像头会话号
axios.get('/jiankong/StandardApiAction_login.action', {
params: {
account:'admin',
password:'admin'
}
}).then(function (response1) {
that.jsession = response1.data.jsession;
if(that.jsession != '' && that.carnumber != ''){
//获取摄像头车辆设备号
axios.get('/jiankong/StandardApiAction_getDeviceByVehicle.action', {
params: {
jsession:that.jsession,
vehiIdno:that.carnumber
}
}).then(function (response2) {
if(response2.data.result == 0 && response2.data.devices.length != 0){
that.devices = response2.data.devices[0].did;
}
})
}
})
// axios.get('/jiankong/StandardApiAction_login.action', {
// params: {
// account:'admin',
// password:'admin'
// }
// }).then(function (response1) {
// that.jsession = response1.data.jsession;
// if(that.jsession != '' && that.carnumber != ''){
// //获取摄像头车辆设备号
// axios.get('/jiankong/StandardApiAction_getDeviceByVehicle.action', {
// params: {
// jsession:that.jsession,
// vehiIdno:that.carnumber
// }
// }).then(function (response2) {
// if(response2.data.result == 0 && response2.data.devices.length != 0){
// that.devices = response2.data.devices[0].did;
// }
// })
// }
// })
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res1) => {
if(res1.code == 200){
if(res1.data.totalElements == 0){
......
vue.config.js
View file @ 690dcc2c
......@@ -40,14 +40,13 @@ module.exports = {
changeOrigin: true,
},
//获取会话号
'/jiankong': {
target: 'http://oa.gemho.cn:8088',
//target: '',
changeOrigin: true,
pathRewrite: {
'^/jiankong': ''
}
},
// '/jiankong': {
// target: 'http://oa.gemho.cn:8088',
// changeOrigin: true,
// pathRewrite: {
// '^/jiankong': ''
// }
// },
},
//https: true,
......
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