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

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-29 11:21:41
+ * @LastEditTime: 2022-12-02 16:52:28
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -68,7 +68,7 @@ var CONFIGITEM = {
         // cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
-      apiURL: 'http://10.134.135.92:8888/renren-admin',
+      apiURL: 'http://10.134.135.9:8888/renren-admin',
       // apiURL: 'http://192.168.124.233:8888/ucs-admin',
       // previewUrl: 'http://10.134.135.9:9796/',
       // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境

front/public/static/css/modal.css

@@ -86,6 +86,10 @@ z-index: 10010!important;
 .ant-popconfirm {
 z-index: 10010!important;
 }
+.ant-tooltip{
+z-index: 10010!important;
+}
+
 .model-container .confirmChrome {
   width: 140px;
   height: 36px;

front/src/views/home/components/header.vue

@@ -469,7 +469,7 @@
     // padding: 0 1rem;
     background-color: rgba(0, 0, 25, 0.7);
     position: fixed;
-    z-index: 10010;
+    z-index: 10012;
     top: 0;
 
     div {