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

front/public/static/config/basicConfig.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: Light
- * @LastEditTime: 2022-10-22 11:08:16
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-24 11:50:52
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -13,7 +13,7 @@ var CONFIGITEM = {
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
-  vNum: 'v0.8.7.2',
+  vNum: 'v0.8.14.2',
   configData: {
     // 青岛市大数据局
     qingdao: {
@@ -27,8 +27,8 @@ var CONFIGITEM = {
       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/renren-admin',
-      // websocketURL: '15.72.183.90:8000/renren-admin',
+      apiURL: 'http://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',
@@ -87,7 +87,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.254:8888/renren-admin',
       // websocketURL: '10.18.1.99:8889/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

front/src/api/personalCenter.js

@@ -308,4 +308,4 @@ export function getDeviceDetail(deviceId) {
     url: `/device/${deviceId}`,
     method: 'get',
   })
-}
+}

front/src/views/capacitySquare/components/algorithm.vue

@@ -53,9 +53,9 @@
   }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
-      if (val.dictLabel !== '其他') {
-        dictList.value.push(val.dictLabel)
-      }
+      // if (val.dictLabel !== '其他') {
+      dictList.value.push(val.dictLabel)
+      // }
     })
   })
   const params = {

front/src/views/capacitySquare/components/application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-09 09:31:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-09-19 10:19:02
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-24 10:44:50
  * @Description: 应用资源
 -->
 <template>
@@ -74,9 +74,9 @@
   }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
-      if (val.dictLabel !== '其他') {
-        dictList.value.push(val.dictLabel)
-      }
+      // if (val.dictLabel !== '其他') {
+      dictList.value.push(val.dictLabel)
+      // }
     })
   })
   let dom = null

front/src/views/capacitySquare/components/layer.vue

@@ -53,9 +53,9 @@
   }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
-      if (val.dictLabel !== '其他') {
-        dictList.value.push(val.dictLabel)
-      }
+      // if (val.dictLabel !== '其他') {
+      dictList.value.push(val.dictLabel)
+      // }
     })
   })
   const params = {

front/src/views/home/infrastructurePage.vue

@@ -820,7 +820,7 @@
   })
   const videoList = ref([])
   const initMeeting = () => {
-    initiateMeet('一网统揽平台组/').then((res) => {
+    initiateMeet('青岛市一网统揽项目组/一网统揽平台组/').then((res) => {
       console.log('组会=========>', res)
     })
   }