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
+ * @LastEditors: Light
- * @LastEditTime: 2022-10-13 21:31:09
+ * @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/',
+      previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.233:8888/renren-admin',
+      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
+ * @LastEditors: Light
- * @LastEditTime: 2022-08-19 15:55:05
+ * @LastEditTime: 2022-10-21 17:29:46
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -42,46 +42,49 @@
   }
 </script>
 <style lang="less" scoped>
-  .algorithm {
+.algorithm {
-    padding: 0.7rem 1.05rem 0.5rem;
+  padding: 0.7rem 1.05rem 0.5rem;
-    .header {
+  .header {
-      padding-bottom: 0.15rem;
+    padding-bottom: 0.15rem;
-      border-bottom: 1px solid #bdbdbd;
+    border-bottom: 1px solid #bdbdbd;
-      font-size: 30px;
+    font-size: 30px;
-      font-weight: 600;
+    font-weight: 600;
-    }
+  }
-    .main {
+  .main {
-      padding: 0 0.93rem;
+    padding: 0 0.93rem;
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+      width: 3.39rem;
+      height: 1rem;
+      border: 2px solid #7dbbff;
+      border-radius: 0.2rem;
+      margin: 0.3rem 0.2rem 0;
       display: flex;
-      flex-wrap: wrap;
+      justify-content: space-between;
-      .item {
+      align-items: center;
-        width: 3.39rem;
+      padding: 0.41rem 0.4rem;
-        height: 1rem;
+      transition: all 0.5s;
-        border: 2px solid #7dbbff;
+      .name {
-        border-radius: 0.2rem;
+        font-size: 26px;
-        margin: 0.3rem 0.2rem 0;
+        color: #7dbbff;
-        display: flex;
+        max-height: 26px;
-        justify-content: space-between;
+        line-height: 26px;
-        align-items: center;
+        overflow: hidden;
-        padding: 0.41rem 0.4rem;
-        transition: all 0.5s;
-        .name {
-          font-size: 26px;
-          color: #7dbbff;
-        }
-        .img {
-          width: 0.57rem;
-          height: 0.57rem;
-          background: url('~@/assets/cimSpecialArea/zj.png') no-repeat;
-          background-size: 100%;
-        }
       }
-      .item:hover {
+      .img {
-        cursor: pointer;
+        width: 0.57rem;
-        width: 3.45rem;
+        height: 0.57rem;
-        height: 1.1rem;
+        background: url('~@/assets/cimSpecialArea/zj.png') no-repeat;
-        margin: 0.25rem 0.17rem -0.05rem;
+        background-size: 100%;
       }
     }
+    .item:hover {
+      cursor: pointer;
+      width: 3.45rem;
+      height: 1.1rem;
+      margin: 0.25rem 0.17rem -0.05rem;
+    }
   }
+}
 </style>