1

src/components/mars3d/Map.vue

@@ -217,8 +217,8 @@ export default {
       //模型配置
       const graphic = new mars3d.graphic.BillboardEntity({
         style: {
-          //image: pic ? 'http://8.143.203.103:9092/avatar/' + pic : ddd,
-          image: pic ? 'http://120.224.103.84:9092/avatar/' + pic : ddd,
+          image: pic ? 'http://8.143.203.103:9092/avatar/' + pic : ddd,
+          // image: pic ? 'http://120.224.103.84:9092/avatar/' + pic : ddd,
           width:35,
           height:35,
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER,

src/config.js

 // 项目配置相关
 const config = {
 
-    // BASE_URL: 'http://8.143.203.103:9092',
-    // REAL_URL: 'http://8.143.203.103:9092',
+    BASE_URL: 'http://8.143.203.103:9092',
+    REAL_URL: 'http://8.143.203.103:9092',
 
-    BASE_URL: 'http://120.224.103.84:9092', 
-    REAL_URL: 'http://120.224.103.84:9092', 
+    // BASE_URL: 'http://120.224.103.84:9092', 
+    // REAL_URL: 'http://120.224.103.84:9092', 
     
     TOKEN_KEY: 'token',
     USER_KEY: 'userInfo',

src/views/MLargeScreen/components/startOrderReceiving/index.vue

@@ -600,6 +600,7 @@ export default {
                                 this.btnShow4 = false;
                                 this.paidanFlag = 0;
                                 this.zuizhongpaidanFlag = 0;
+                                this.$nextTick(()=>{
                                     httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
                                         if(res.code == 200){
                                             putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {});
@@ -617,6 +618,7 @@ export default {
                                     httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {
                                         this.$parent.zhixinglujing(false,this.carnumber,this.carDestination);
                                     });
+                                })
                                 this.$nextTick(()=>{
                                     this.oldxy.lat = 0;
                                     this.oldxy.lng = 0;
@@ -665,6 +667,7 @@ export default {
                                 this.showDe = false;
                                 this.paidanFlag = 0;
                                 this.zuizhongpaidanFlag = 0;
+                                this.$nextTick(()=>{
                                     httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
                                         if(res.code == 200){
                                             putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {});
@@ -682,6 +685,7 @@ export default {
                                     httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {
                                         this.$parent.zhixinglujing(false,this.carnumber,this.carDestination);
                                     });
+                                })
                                 this.$nextTick(()=>{
                                     this.oldxy.lat = 0;
                                     this.oldxy.lng = 0;

src/views/MLargeScreen/components/voiceApplication/index.vue

@@ -248,8 +248,8 @@ export default {
 
 		//初始化weosocket
         initWebSocket(){
-            //const wsuri = 'ws://8.143.203.103:9092/webSocket' + '/' + this.userName1;
-            const wsuri = 'ws://120.224.103.84:9092/webSocket' + '/' + this.userName1;
+            const wsuri = 'ws://8.143.203.103:9092/webSocket' + '/' + this.userName1;
+            // const wsuri = 'ws://120.224.103.84:9092/webSocket' + '/' + this.userName1;
             this.websocket = new WebSocket(wsuri);
             this.websocket.onopen = this.websocketonopen;
             this.websocket.onerror = this.websocketonerror;

vue.config.js

@@ -15,30 +15,30 @@ module.exports = {
     open: true, // 配置自动启动浏览器
     proxy: {
 
-      // '/dianziweilan': {
-      //   target: 'http://8.143.203.103:9092'
-      // },
-      // '/auth': {
-      //   target: 'http://8.143.203.103:9092',
-      // },
-      // '/pic': {
-      //   target: 'http://8.143.203.103/avatar/',
-      //   pathRewrite: { '^/pic': '' },
-      //   changeOrigin: true,
-      // },
-
-
       '/dianziweilan': {
-        target: 'http://120.224.103.84:9092'
+        target: 'http://8.143.203.103:9092'
       },
       '/auth': {
-        target: 'http://120.224.103.84:9092',
+        target: 'http://8.143.203.103:9092',
       },
       '/pic': {
-        target: 'http://120.224.103.84/avatar/',
+        target: 'http://8.143.203.103/avatar/',
         pathRewrite: { '^/pic': '' },
         changeOrigin: true,
       },
+
+
+      // '/dianziweilan': {
+      //   target: 'http://120.224.103.84:9092'
+      // },
+      // '/auth': {
+      //   target: 'http://120.224.103.84:9092',
+      // },
+      // '/pic': {
+      //   target: 'http://120.224.103.84/avatar/',
+      //   pathRewrite: { '^/pic': '' },
+      //   changeOrigin: true,
+      // },
       //获取会话号
       // '/jiankong': {
       //   target: 'http://oa.gemho.cn:8088',