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

@@ -1,14 +1,14 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-13 21:31:09
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-22 11:08:16
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  version: 'xihaian', // 西海岸
+  version: 'dev', // 西海岸
   // version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
@@ -86,8 +86,8 @@ var CONFIGITEM = {
         userPwd: '',
       },
       backUrl: 'http://localhost:8001',
-      previewUrl: 'http://192.168.124.236:9796/',
-      websocketURL: '192.168.124.233:8888/renren-admin',
+      previewUrl: 'http://192.168.124.243:9796/',
+      websocketURL: '192.168.124.243: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/views/cimSpecialArea/components/algorithm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-19 10:00:16
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-19 15:55:05
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-21 17:29:46
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -42,7 +42,7 @@
   }
 </script>
 <style lang="less" scoped>
-  .algorithm {
+.algorithm {
   padding: 0.7rem 1.05rem 0.5rem;
   .header {
     padding-bottom: 0.15rem;
@@ -68,6 +68,9 @@
       .name {
         font-size: 26px;
         color: #7dbbff;
+        max-height: 26px;
+        line-height: 26px;
+        overflow: hidden;
       }
       .img {
         width: 0.57rem;
@@ -83,5 +86,5 @@
       margin: 0.25rem 0.17rem -0.05rem;
     }
   }
-  }
+}
 </style>