Commit b8e614d5 authored by xxx's avatar xxx

修改

parent 18d1ad72
...@@ -153,18 +153,6 @@ export default { ...@@ -153,18 +153,6 @@ export default {
carFleetData:[], carFleetData:[],
carsInforData:[], carsInforData:[],
selectCarRadioArray:[], selectCarRadioArray:[],
situationData:[
{name:'语音1',fleetName:'运输一队',number:0},
{name:'语音1',fleetName:'运输一队',number:0},
{name:'语音1',fleetName:'运输一队',number:0},
{name:'语音1',fleetName:'运输一队',number:12},
{name:'语音1',fleetName:'运输一队',number:12},
{name:'语音1',fleetName:'运输一队',number:12},
{name:'语音1',fleetName:'运输一队',number:12},
{name:'语音1',fleetName:'运输一队',number:12},
{name:'语音1',fleetName:'运输一队',number:12},
],
situationWhich:10000,
situationPic1:situationPic1, situationPic1:situationPic1,
situationPic2:situationPic2, situationPic2:situationPic2,
tonghuadisabled:false, tonghuadisabled:false,
...@@ -187,12 +175,11 @@ export default { ...@@ -187,12 +175,11 @@ export default {
}; };
}, },
methods: { methods: {
loadData(value) { loadData(value,tishi) {
this.showDecide = true; this.showDecide = true;
this.selectCarFleet = ''; this.selectCarFleet = '';
this.searchText = ''; this.searchText = '';
this.selectCarRadioArray = []; this.selectCarRadioArray = [];
this.situationWhich = 10000;
this.userName1 = value; //车牌号 this.userName1 = value; //车牌号
this.recOpen(); this.recOpen();
//车队 //车队
...@@ -201,12 +188,11 @@ export default { ...@@ -201,12 +188,11 @@ export default {
this.carFleetData = res.data.content; this.carFleetData = res.data.content;
} }
}); });
if(tishi){
this.carsInforData = [{number:'pcBigScreen'}];
}else{
this.loadData2(); this.loadData2();
//页面刚进入时开启长连接 }
// this.initWebSocket();
// this.heartbeatTimer = setInterval(() => {
// this.reconnect();
// }, 10000)
}, },
//获取车辆数据 //获取车辆数据
loadData2() { loadData2() {
...@@ -215,7 +201,7 @@ export default { ...@@ -215,7 +201,7 @@ export default {
query.page = 0; query.page = 0;
query.number = this.searchText; query.number = this.searchText;
query.road = this.selectCarFleet; query.road = this.selectCarFleet;
//车辆 //获取车辆信息并添加调度大屏的语音id
httpGet(vehicleInformationQuery,query).then((res) => { httpGet(vehicleInformationQuery,query).then((res) => {
if(res.code == 200){ if(res.code == 200){
let obj1 = res.data.content; let obj1 = res.data.content;
...@@ -238,7 +224,6 @@ export default { ...@@ -238,7 +224,6 @@ export default {
this.selectCarFleet = ''; this.selectCarFleet = '';
this.searchText = ''; this.searchText = '';
this.selectCarRadioArray = []; this.selectCarRadioArray = [];
this.situationWhich = 10000;
this.recClose(); this.recClose();
//页面销毁时关闭长连接 //页面销毁时关闭长连接
// this.websocketclose(); // this.websocketclose();
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<img src="../../assets/images/truckTuPian/luzhang.png" height="17"> <img src="../../assets/images/truckTuPian/luzhang.png" height="17">
<span>路障申报</span> <span>路障申报</span>
</div> </div>
<div class="dispatchCenterStyle" @click="voiceApFn()"> <div class="dispatchCenterStyle" @click="voiceApFn('右下角')">
<img src="../../assets/images/truckTuPian/diaoduzhongxin.png" height="20"> <img src="../../assets/images/truckTuPian/diaoduzhongxin.png" height="20">
<span>调度中心</span> <span>调度中心</span>
</div> </div>
...@@ -237,7 +237,7 @@ export default { ...@@ -237,7 +237,7 @@ export default {
// this.$refs.smallWindowMethod.carInCloseFn(); // this.$refs.smallWindowMethod.carInCloseFn();
}, },
//语音申请 //语音申请
voiceApFn(){ voiceApFn(tishi){
if(this.selectFunction != 2){ if(this.selectFunction != 2){
this.selectFunction = 2; this.selectFunction = 2;
this.$refs.failureDeclarationMethod.failureDeCloseFn(); this.$refs.failureDeclarationMethod.failureDeCloseFn();
...@@ -246,7 +246,7 @@ export default { ...@@ -246,7 +246,7 @@ export default {
this.$refs.personalCenterMethod.personalCenCloseFn(); this.$refs.personalCenterMethod.personalCenCloseFn();
this.$refs.smallWindowMethod.carInCloseFn(); this.$refs.smallWindowMethod.carInCloseFn();
let byValue = this.carnumber; let byValue = this.carnumber;
this.$refs.voiceApplicationMethod.loadData(byValue); this.$refs.voiceApplicationMethod.loadData(byValue,tishi);
}else{ }else{
this.selectFunction = 0; this.selectFunction = 0;
this.$refs.voiceApplicationMethod.voiceAppCloseFn(); this.$refs.voiceApplicationMethod.voiceAppCloseFn();
......
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