合并代码，切换环境为测试环境

src/components/monitoring/lift.vue

@@ -173,8 +173,8 @@ export default {
 			pos: 0,
 			height: 5350,
 			offsetZ: 250,
-			// path: "ws://192.168.1.3/blade-websocket/ws?lift",
+			path: "ws://192.168.1.3/blade-websocket/ws?lift",
-			path: "ws://10.90.100.204/blade-websocket/ws?lift",
+			// path: "ws://10.90.100.204/blade-websocket/ws?lift",
 			socket: "",
 			arr: [], //电梯信息
 			listData: [],

src/components/monitoring/light.vue

@@ -310,8 +310,8 @@ export default {
   },
   data() {
     return {
-      path:'ws://10.90.100.204/blade-websocket/ws?light_kk',//socket地址
+      // path:'ws://10.90.100.204/blade-websocket/ws?light_kk',//socket地址
-      // path:'ws://192.168.1.3/blade-websocket/ws?light_kk',//socket地址
+      path:'ws://192.168.1.3/blade-websocket/ws?light_kk',//socket地址
       build: "00", //楼
       floored: null, //楼层
       controlAll: 2, //批量控制开关

src/util/bfHelper.js

@@ -2862,12 +2862,12 @@ const loadModel = (i) => {
   // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080";
   BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local;
   BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk";
-  // BimfaceLoaderConfig.path = i == 1 ? '/bimfaceApi/ywq/viewToken.json' :
+  BimfaceLoaderConfig.path = i == 1 ? '/bimfaceApi/ywq/viewToken.json' :
-  // 	'/bimfaceApi/tt/viewToken.json';
+  	'/bimfaceApi/tt/viewToken.json';
-  BimfaceLoaderConfig.path =
+  // BimfaceLoaderConfig.path =
-    i == 1
+  //   i == 1
-      ? "http://10.90.100.203:8080/ywq/viewToken.json"
+  //     ? "http://10.90.100.203:8080/ywq/viewToken.json"
-      : "http://10.90.100.203:8080/tt/viewToken.json";
+  //     : "http://10.90.100.203:8080/tt/viewToken.json";
 
   BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded, (err) => {
     console.log('err', err)

vue.config.js

@@ -46,8 +46,8 @@ module.exports = {
         // target: 'http://192.168.0.105:80',
         // target: "http://192.168.43.35",
         // target: 'http://192.168.1.106',
-        // target: "http://192.168.1.3",
+        target: "http://192.168.1.3",
-        target: "http://10.90.100.204",
+        // target: "http://10.90.100.204",
         // target: "http://rsvz4t.natappfree.cc",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',