3 changed files with 117 additions and 120 deletions
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@ -7,122 +7,119 @@
 */
 var _global = {}
 var CONFIGITEM = {
-  // version: 'qingdao', //青岛
-  // version: 'xihaian', // 西海岸
-  version: 'dev', // 开发
-  // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
-  // version: 'qingdao', // 测试
-  //version: 'frp', // 内网穿透
-  vNum: 'v0.8.15.2',
-  configData: {
-    // 青岛市大数据局
-    qingdao: {
-      loginInfo: {
-        // 视频平台登陆信息
-        loginIp: '10.132.191.3',
-        loginPort: '8320',
-        userName: 'ynszdz',
-        userPwd: 'Admin@123',
-      },
-      backUrl: 'http://15.72.183.90:8001',
-      previewUrl: 'http://15.72.183.90:7008/',
-      //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      websocketURL: '15.72.183.90:8000/ucs-admin',
-      // websocketURL: '192.168.124.233:8888/ucs-admin',
-      POI_URL:
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+    // version: 'qingdao', //青岛
+    version: 'xihaian', // 西海岸
+    //version: 'dev', // 开发
+    // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
+    // version: 'qingdao', // 测试
+    //version: 'frp', // 内网穿透
+    vNum: 'v0.8.15.2',
+    configData: {
+        // 青岛市大数据局
+        qingdao: {
+            loginInfo: {
+                // 视频平台登陆信息
+                loginIp: '10.132.191.3',
+                loginPort: '8320',
+                userName: 'ynszdz',
+                userPwd: 'Admin@123',
+            },
+            backUrl: 'http://15.72.183.90:8001',
+            previewUrl: 'http://15.72.183.90:7008/',
+            //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
+            apiURL: 'http://15.72.183.90:8000/ucs-admin',
+            websocketURL: '15.72.183.90:8000/ucs-admin',
+            // websocketURL: '192.168.124.233:8888/ucs-admin',
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+        },
+        // 研发展厅
+        zhanTingDev: {
+            loginInfo: {
+                // 视频平台登陆信息
+                loginIp: '10.132.191.3',
+                loginPort: '8320',
+                userName: 'ynszdz',
+                userPwd: 'Admin@123',
+            },
+            backUrl: 'http://15.72.183.90:8001',
+            previewUrl: 'http://15.72.183.90:7008/',
+            //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
+            //apiURL: 'http://15.72.183.90:8000/ucs-admin',
+            // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
+            websocketURL: '10.18.1.99:8889/ucs-admin',
+            // websocketURL: '10.16.5.35:8888/ucs-admin',
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+        },
+        // 西海岸大数据局
+        xihaian: {
+            loginInfo: {
+                // 视频平台登陆信息
+                loginIp: '',
+                loginPort: '',
+                userName: '',
+                userPwd: '',
+            },
+            // 获取摄像头的后端接口地址
+            camreaInfo: {
+                // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
+                // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
+                cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
+            },
+            backUrl: 'http://10.134.135.9:9797',
+            previewUrl: 'http://10.134.135.9:9796/',
+            // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
+            // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
+            // apiURL: 'http://10.134.135.92:8888/renren-admin',
+            apiURL: 'http://192.168.124.233:8888/ucs-admin',
+            // websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
+            // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
+            POI_URL:
+                'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+        },
+        // 开发
+        dev: {
+            loginInfo: {
+                // 视频平台登陆信息
+                loginIp: '',
+                loginPort: '',
+                userName: '',
+                userPwd: '',
+            },
+            backUrl: 'http://localhost:8001',
+            previewUrl: 'http://192.168.124.243:9796/',
+            apiURL: 'http://192.168.124.243:8888/ucs-admin',
+            websocketURL: '192.168.124.243:8888/ucs-admin',
+            // websocketURL: '10.18.1.99:8889/ucs-admin',
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+        },
+        // 测试
+        test: {
+            loginInfo: {
+                // 视频平台登陆信息
+                loginIp: '',
+                loginPort: '',
+                userName: '',
+                userPwd: '',
+            },
+            backUrl: 'http://192.168.124.243:9797',
+            previewUrl: 'http://192.168.124.243:9796/',
+            websocketURL: '192.168.124.243:8888/ucs-admin',
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+        },
+        // 内网穿透
+        frp: {
+            loginInfo: {
+                // 视频平台登陆信息
+                loginIp: '',
+                loginPort: '',
+                userName: '',
+                userPwd: '',
+            },
+            backUrl: 'http://124.222.94.39:9797',
+            previewUrl: 'http://124.222.94.39:9796/',
+            websocketURL: '124.222.94.39:8888/ucs-admin',
+            POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+        },
    },
-    // 研发展厅
-    zhanTingDev: {
-      loginInfo: {
-        // 视频平台登陆信息
-        loginIp: '10.132.191.3',
-        loginPort: '8320',
-        userName: 'ynszdz',
-        userPwd: 'Admin@123',
-      },
-      backUrl: 'http://15.72.183.90:8001',
-      previewUrl: 'http://15.72.183.90:7008/',
-      //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      //apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
-      websocketURL: '10.18.1.99:8889/ucs-admin',
-      // websocketURL: '10.16.5.35:8888/ucs-admin',
-      POI_URL:
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    },
-    // 西海岸大数据局
-    xihaian: {
-      loginInfo: {
-        // 视频平台登陆信息
-        loginIp: '',
-        loginPort: '',
-        userName: '',
-        userPwd: '',
-      },
-      // 获取摄像头的后端接口地址
-      camreaInfo: {
-        // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
-        // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
-        cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
-      },
-      backUrl: 'http://10.134.135.9:9797',
-      previewUrl: 'http://10.134.135.9:9796/',
-      // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
-      // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
-      websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
-      // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
-      POI_URL:
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    },
-    // 开发
-    dev: {
-      loginInfo: {
-        // 视频平台登陆信息
-        loginIp: '',
-        loginPort: '',
-        userName: '',
-        userPwd: '',
-      },
-      backUrl: 'http://localhost:8001',
-      previewUrl: 'http://192.168.124.243:9796/',
-      apiURL: 'http://192.168.124.243:8888/ucs-admin',
-      websocketURL: '192.168.124.243:8888/ucs-admin',
-      // websocketURL: '10.18.1.99:8889/ucs-admin',
-      POI_URL:
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    },
-    // 测试
-    test: {
-      loginInfo: {
-        // 视频平台登陆信息
-        loginIp: '',
-        loginPort: '',
-        userName: '',
-        userPwd: '',
-      },
-      backUrl: 'http://192.168.124.243:9797',
-      previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/ucs-admin',
-      POI_URL:
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    },
-    // 内网穿透
-    frp: {
-      loginInfo: {
-        // 视频平台登陆信息
-        loginIp: '',
-        loginPort: '',
-        userName: '',
-        userPwd: '',
-      },
-      backUrl: 'http://124.222.94.39:9797',
-      previewUrl: 'http://124.222.94.39:9796/',
-      websocketURL: '124.222.94.39:8888/ucs-admin',
-      POI_URL:
-        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    },
-  },
 }
-_global.config = CONFIGITEM.configData[CONFIGITEM.version]
+_global.config = CONFIGITEM.configData[CONFIGITEM.version]
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -2065,7 +2065,7 @@
    background: rgba(245, 243, 243, 0.3);

    .details-pageconetent-left {
-      max-height: 8.5rem;
+      max-height: 6.9rem;
      position: absolute;
      width: 2.5rem;
      top: 0.17rem;
--- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue
+++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
@ -291,9 +291,9 @@ export default defineComponent({
  text-align: left;
  position: relative;
  display: inline-block;
-  width: 45%;
+  width: 30%;
  margin-bottom: 10px;
-  margin-left: 10px;
+  margin-left: 6px;
 
  .glgknum {
    // width: 100px;