Skip to content

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

1

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