libingkun/skyeyesystem
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: libingkun:fa40aea621ec85867bdae971bf2a271a8fca9864
Branches Tags
libingkun:main
libingkun:dev_20260130_RemoveRedis
libingkun:dev-i18n
libingkun:splicing_test
..
compare: libingkun:62317aab51a5d7eb85c2630fe1baa276ffaac6a9
Branches Tags
libingkun:dev_20260130_RemoveRedis
libingkun:main
libingkun:dev-i18n
libingkun:splicing_test

No commits in common. "fa40aea621ec85867bdae971bf2a271a8fca9864" and "62317aab51a5d7eb85c2630fe1baa276ffaac6a9" have entirely different histories.
fa40aea621 ... 62317aab51

3 changed files with 132 additions and 154 deletions
Show Stats Expand all files Collapse all files

162
frontend/Skyeye-sys-ui/src/utils/flexible.js
View File

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

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

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

24
frontend/Skyeye-sys-ui/vue.config.js
View File

@ -147,18 +147,18 @@ module.exports = {
css: { css: {
loaderOptions: { loaderOptions: {
postcss: { 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'
] // ]
}) // })
] // ]
} }
} }
} }