Commit 2e25aecb authored by xxx's avatar xxx

1

parent adef5e25
// 项目配置相关 // 项目配置相关
const config = { const config = {
// BASE_URL: 'http://8.143.203.103:9090', //线上地址2 BASE_URL: 'http://8.143.203.103:9090', //线上地址2
// REAL_URL: 'http://8.143.203.103:9090', //线上地址2 REAL_URL: 'http://8.143.203.103:9090', //线上地址2
BASE_URL: 'http://192.168.0.108:8001', // BASE_URL: 'http://192.168.0.108:8001',
REAL_URL: 'http://192.168.0.108:8001', // REAL_URL: 'http://192.168.0.108:8001',
TOKEN_KEY: 'token', TOKEN_KEY: 'token',
USER_KEY: 'userInfo', USER_KEY: 'userInfo',
......
...@@ -16,11 +16,8 @@ ...@@ -16,11 +16,8 @@
</div> </div>
</div> </div>
<div class="centerViews"> <div class="centerViews">
<!-- <div :class="orderReceiving == '停止接单' ? 'IntelligentDis1' : 'IntelligentDis2'" @click="IntelligentDisFn()"> <div :class="orderReceiving ? 'IntelligentDis1' : 'IntelligentDis2'" @click="IntelligentDisFn()">
<div :class="orderReceiving == '停止接单' ? 'centerViewsTitle1' : 'centerViewsTitle2'">{{orderReceiving}}</div> <div :class="orderReceiving ? 'centerViewsTitle1' : 'centerViewsTitle2'">智能派单</div>
</div> -->
<div class="IntelligentDis1">
<div class="centerViewsTitle1">接收派单</div>
</div> </div>
<div :class="selectFunction == 2 ? 'voiceAp2' : 'voiceAp1'" @click="voiceApFn()"> <div :class="selectFunction == 2 ? 'voiceAp2' : 'voiceAp1'" @click="voiceApFn()">
<div :class="selectFunction == 2 ? 'centerViewsTitle1' : 'centerViewsTitle2'">语音申请</div> <div :class="selectFunction == 2 ? 'centerViewsTitle1' : 'centerViewsTitle2'">语音申请</div>
...@@ -118,7 +115,7 @@ export default { ...@@ -118,7 +115,7 @@ export default {
configUrl: basePathUrl + 'config/config.json', configUrl: basePathUrl + 'config/config.json',
notifyPromise:Promise.resolve(), notifyPromise:Promise.resolve(),
systemTitle:'卡车调度系统卡车终端', systemTitle:'卡车调度系统卡车终端',
orderReceiving:'开始接单', orderReceiving:false,
personalName:'', personalName:'',
zongTimer1:null, zongTimer1:null,
zongTimer2:null, zongTimer2:null,
...@@ -224,7 +221,7 @@ export default { ...@@ -224,7 +221,7 @@ export default {
} }
}); });
//展示二维地图 //展示二维地图
//this.$refs.mars3dViewerMapMethod.getCarInforFn(); this.$refs.mars3dViewerMapMethod.getCarInforFn();
}, },
//获取待装卡车列表 //获取待装卡车列表
...@@ -257,23 +254,13 @@ export default { ...@@ -257,23 +254,13 @@ export default {
}, },
//接受派单 //接受派单
IntelligentDisFn(){ IntelligentDisFn(){
// if(this.orderReceiving == "停止接单"){ if(this.orderReceiving){
// this.orderReceiving = '开始接单'; this.orderReceiving = false;
// this.$refs.startOrderReceivingMethod.loadData(this.carnumber,false); this.$refs.startOrderReceivingMethod.zhinengpaidanFn(false);
// }else{ }else{
// this.orderReceiving = '停止接单'; this.orderReceiving = true;
// this.$refs.startOrderReceivingMethod.loadData(this.carnumber,true); this.$refs.startOrderReceivingMethod.zhinengpaidanFn(true);
// } }
// this.$refs.voiceApplicationMethod.voiceAppCloseFn();
// this.$refs.failureDeclarationMethod.failureDeCloseFn();
// this.$refs.performanceStatisticsMethod.achievementCloseFn();
// this.$refs.carInformationMethod.carInCloseFn();
// this.$refs.personalCenterMethod.personalCenCloseFn();
// this.$refs.smallWindowMethod.carInCloseFn();
}, },
//语音申请 //语音申请
voiceApFn(tishi){ voiceApFn(tishi){
......
...@@ -16,30 +16,30 @@ module.exports = { ...@@ -16,30 +16,30 @@ module.exports = {
open: true, // 配置自动启动浏览器 open: true, // 配置自动启动浏览器
proxy: { proxy: {
// '/dianziweilan': {
// target: 'http://8.143.203.103:9090'
// },
// '/auth': {
// target: 'http://8.143.203.103:9090',
// },
// '/pic': {
// target: 'http://8.143.203.103/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
'/dianziweilan': { '/dianziweilan': {
target: 'http://192.168.0.108:8001' target: 'http://8.143.203.103:9090'
}, },
'/auth': { '/auth': {
target: 'http://192.168.0.108:8001', target: 'http://8.143.203.103:9090',
}, },
'/pic': { '/pic': {
target: 'http://192.168.0.108/avatar/', target: 'http://8.143.203.103/avatar/',
pathRewrite: { '^/pic': '' }, pathRewrite: { '^/pic': '' },
changeOrigin: true, changeOrigin: true,
}, },
// '/dianziweilan': {
// target: 'http://192.168.0.108:8001'
// },
// '/auth': {
// target: 'http://192.168.0.108:8001',
// },
// '/pic': {
// target: 'http://192.168.0.108/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
}, },
//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