Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/public/static/config/basicConfig.js

@@ -8,8 +8,8 @@
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  // version: 'xihaian', // 西海岸
-  version: 'qingdao', // 开发
+  version: 'xihaian', // 西海岸
+  // version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
@@ -28,7 +28,8 @@ var CONFIGITEM = {
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
       //apiURL: 'http://15.72.183.90:8000/renren-admin',
-      websocketURL: '15.72.183.90:8000/renren-admin',
+      // websocketURL: '15.72.183.90:8000/renren-admin',
+      // websocketURL: '192.168.124.233:8888/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -62,8 +63,9 @@ var CONFIGITEM = {
       },
       // 获取摄像头的后端接口地址
       camreaInfo: {
-        // cameraUrl: '10.134.135.92:9537', // 测试环境
-        cameraUrl: '10.134.135.9:9537', // 生产环境
+        // 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/',

front/src/views/home/detailsPageInfrastructureTree.vue

@@ -91,6 +91,10 @@ export default defineComponent({
           })
         }
         treeData.value = res.data && res.data.data || []
+        // 只有一个，默认展开到二级菜单
+        if(res.data && res.data.data.length == 1) {
+          showBottom(treeData.value[0])
+        }
       }
     }
     mybus.on('getDeptList', () => {