Merge branch 'main' of http://182.92.203.107:3000/libingkun/skyeyesystem

frontend/Skyeye-sys-ui/src/utils/flexible.js

@@ -1,120 +1,148 @@
+; (function (win, lib) {
+  var doc = win.document
+  var docEl = doc.documentElement
+  var metaEl = doc.querySelector('meta[name="viewport"]')
+  var flexibleEl = doc.querySelector('meta[name="flexible"]')
+  var dpr = 0
+  var scale = 0
+  var tid
+  var flexible = lib.flexible || (lib.flexible = {})
 
-;(function(win, lib) {
+  if (metaEl) {
-    var doc = win.document;
+    console.warn('将根据已有的meta标签来设置缩放比例')
-    var docEl = doc.documentElement;
+    var match = metaEl.getAttribute('content').match(/initial\-scale=([\d\.]+)/)
-    var metaEl = doc.querySelector('meta[name="viewport"]');
+    if (match) {
-    var flexibleEl = doc.querySelector('meta[name="flexible"]');
+      scale = parseFloat(match[1])
-    var dpr = 0;
+      dpr = parseInt(1 / scale)
-    var scale = 0;
-    var tid;
-    var flexible = lib.flexible || (lib.flexible = {});
-
-    if (metaEl) {
-        console.warn('将根据已有的meta标签来设置缩放比例');
-        var match = metaEl.getAttribute('content').match(/initial\-scale=([\d\.]+)/);
-        if (match) {
-            scale = parseFloat(match[1]);
-            dpr = parseInt(1 / scale);
-        }
-    } else if (flexibleEl) {
-        var content = flexibleEl.getAttribute('content');
-        if (content) {
-            var initialDpr = content.match(/initial\-dpr=([\d\.]+)/);
-            var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/);
-            if (initialDpr) {
-                dpr = parseFloat(initialDpr[1]);
-                scale = parseFloat((1 / dpr).toFixed(2));
-            }
-            if (maximumDpr) {
-                dpr = parseFloat(maximumDpr[1]);
-                scale = parseFloat((1 / dpr).toFixed(2));
-            }
-        }
     }
-
+  } else if (flexibleEl) {
-    if (!dpr && !scale) {
+    var content = flexibleEl.getAttribute('content')
-        var isAndroid = win.navigator.appVersion.match(/android/gi);
+    if (content) {
-        var isIPhone = win.navigator.appVersion.match(/iphone/gi);
+      var initialDpr = content.match(/initial\-dpr=([\d\.]+)/)
-        var devicePixelRatio = win.devicePixelRatio;
+      var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/)
-        if (isIPhone) {
+      if (initialDpr) {
-            // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
+        dpr = parseFloat(initialDpr[1])
-            if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
+        scale = parseFloat((1 / dpr).toFixed(2))
-                dpr = 3;
+      }
-            } else if (devicePixelRatio >= 2 && (!dpr || dpr >= 2)){
+      if (maximumDpr) {
-                dpr = 2;
+        dpr = parseFloat(maximumDpr[1])
-            } else {
+        scale = parseFloat((1 / dpr).toFixed(2))
-                dpr = 1;
+      }
-            }
-        } else {
-            // 其他设备下，仍旧使用1倍的方案
-            dpr = 1;
-        }
-        scale = 1 / dpr;
     }
+  }
 
-    docEl.setAttribute('data-dpr', dpr);
+  if (!dpr && !scale) {
-    if (!metaEl) {
+    var isAndroid = win.navigator.appVersion.match(/android/gi)
-        metaEl = doc.createElement('meta');
+    var isIPhone = win.navigator.appVersion.match(/iphone/gi)
-        metaEl.setAttribute('name', 'viewport');
+    var devicePixelRatio = win.devicePixelRatio
-        metaEl.setAttribute('content', 'initial-scale=' + scale + ', maximum-scale=' + scale + ', minimum-scale=' + scale + ', user-scalable=no');
+    if (isIPhone) {
-        if (docEl.firstElementChild) {
+      // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
-            docEl.firstElementChild.appendChild(metaEl);
+      if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
-        } else {
+        dpr = 3
-            var wrap = doc.createElement('div');
+      } else if (devicePixelRatio >= 2 && (!dpr || dpr >= 2)) {
-            wrap.appendChild(metaEl);
+        dpr = 2
-            doc.write(wrap.innerHTML);
+      } else {
-        }
+        dpr = 1
-    }
+      }
-
-    function refreshRem(){
-        var width = docEl.getBoundingClientRect().width;
-        if (width / dpr < 1980) {
-            width = 1980 * dpr;
-        } else if (width / dpr > 5760) {
-            width = 5760 * dpr;
-        }
-        var rem = width / 10;
-        docEl.style.fontSize = rem + 'px';
-        flexible.rem = win.rem = rem;
-    }
-
-    win.addEventListener('resize', function() {
-        clearTimeout(tid);
-        tid = setTimeout(refreshRem, 300);
-    }, false);
-    win.addEventListener('pageshow', function(e) {
-        if (e.persisted) {
-            clearTimeout(tid);
-            tid = setTimeout(refreshRem, 300);
-        }
-    }, false);
-
-    if (doc.readyState === 'complete') {
-        doc.body.style.fontSize = 12 * dpr + 'px';
     } else {
-        doc.addEventListener('DOMContentLoaded', function(e) {
+      // 其他设备下，仍旧使用1倍的方案
-            doc.body.style.fontSize = 12 * dpr + 'px';
+      dpr = 1
-        }, false);
     }
+    scale = 1 / dpr
+  }
 
-
+  docEl.setAttribute('data-dpr', dpr)
-    refreshRem();
+  if (!metaEl) {
-
+    metaEl = doc.createElement('meta')
-    flexible.dpr = win.dpr = dpr;
+    metaEl.setAttribute('name', 'viewport')
-    flexible.refreshRem = refreshRem;
+    metaEl.setAttribute(
-    flexible.rem2px = function(d) {
+      'content',
-        var val = parseFloat(d) * this.rem;
+      'initial-scale=' +
-        if (typeof d === 'string' && d.match(/rem$/)) {
+      scale +
-            val += 'px';
+      ', maximum-scale=' +
-        }
+      scale +
-        return val;
+      ', minimum-scale=' +
-    }
+      scale +
-    flexible.px2rem = function(d) {
+      ', user-scalable=no'
-        var val = parseFloat(d) / this.rem;
+    )
-        if (typeof d === 'string' && d.match(/px$/)) {
+    if (docEl.firstElementChild) {
-            val += 'rem';
+      docEl.firstElementChild.appendChild(metaEl)
-        }
+    } else {
-        return val;
+      var wrap = doc.createElement('div')
+      wrap.appendChild(metaEl)
+      doc.write(wrap.innerHTML)
     }
+  }
 
-})(window, window['lib'] || (window['lib'] = {}));
+  function refreshRem() {
+    var width = docEl.getBoundingClientRect().width
+    if (width / dpr <= 1366) {
+      width = 1366 * dpr
+    } else if (width / dpr <= 1440) {
+      width = 1440 * dpr
+    } else if (width / dpr <= 1600) {
+      width = 1600 * dpr
+    } else if (width / dpr <= 1680) {
+      width = 1680 * dpr
+    } else if (width / dpr <= 1768) {
+      width = 1768 * dpr
+    } else if (width / dpr <= 1980) {
+      width = 1980 * dpr
+    } else if (width / dpr > 5760) {
+      width = 5760 * dpr
+    }
+    var rem = width / 10
+    docEl.style.fontSize = rem + 'px'
+    flexible.rem = win.rem = rem
+  }
+
+  win.addEventListener(
+    'resize',
+    function () {
+      clearTimeout(tid)
+      tid = setTimeout(refreshRem, 300)
+    },
+    false
+  )
+  win.addEventListener(
+    'pageshow',
+    function (e) {
+      if (e.persisted) {
+        clearTimeout(tid)
+        tid = setTimeout(refreshRem, 300)
+      }
+    },
+    false
+  )
+
+  if (doc.readyState === 'complete') {
+    doc.body.style.fontSize = 12 * dpr + 'px'
+  } else {
+    doc.addEventListener(
+      'DOMContentLoaded',
+      function (e) {
+        doc.body.style.fontSize = 12 * dpr + 'px'
+      },
+      false
+    )
+  }
+
+  refreshRem()
+
+  flexible.dpr = win.dpr = dpr
+  flexible.refreshRem = refreshRem
+  flexible.rem2px = function (d) {
+    var val = parseFloat(d) * this.rem
+    if (typeof d === 'string' && d.match(/rem$/)) {
+      val += 'px'
+    }
+    return val
+  }
+  flexible.px2rem = function (d) {
+    var val = parseFloat(d) / this.rem
+    if (typeof d === 'string' && d.match(/px$/)) {
+      val += 'rem'
+    }
+    return val
+  }
+})(window, window['lib'] || (window['lib'] = {}))

frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss

@@ -292,7 +292,7 @@
     position: fixed;
     top: 60px;
     right: 10px;
-    height: calc(100vh - 270px);
+    height: calc(100vh - 220px);
   }
 
   .detail-info {
@@ -1036,13 +1036,7 @@
 
   .detail-uav {
     width: 410px;
-    // position: fixed;
+    height: calc(100vh - 220px);
-    top: 60px;
-    //bottom: 5px;
-    right: 10px;
-    //right: 510px;
-    height: calc(100vh - 270px);
-    //height: calc(100vh - 620px);
     transition: 0.2s ease-in-out;
     z-index: 2;
 

frontend/Skyeye-sys-ui/vue.config.js

@@ -147,18 +147,18 @@ module.exports = {
   css: {
     loaderOptions: {
       postcss: {
-        // plugins: [
+        plugins: [
-        //   require('postcss-pxtorem')({
+          require('postcss-pxtorem')({
-        //     rootValue: 192, // 正常适配
+            rootValue: 192, // 正常适配
-        //     // rootValue: 280, // 3840 * 2160
+            // rootValue: 280, // 3840 * 2160
-        //     propList: ['*'], // 可以从px更改为rem的属性
+            propList: ['*'], // 可以从px更改为rem的属性
-        //     selectorBlackList: [
+            selectorBlackList: [
-        //       // 匹配不被转换为rem的选择器
+              // 匹配不被转换为rem的选择器
-        //       'super-cesium-timeline-icon16'
+              'super-cesium-timeline-icon16'
-        //       // 'card-position'
+              // 'card-position'
-        //     ]
+            ]
-        //   })
+          })
-        // ]
+        ]
       }
     }
   }