diff --git a/package.json b/package.json index 8a9fecb..1c9903c 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "lib-flexible": "^0.3.2", "lodash": "^4.17.21", "nprogress": "0.2.0", "ol": "^6.5.0", diff --git a/public/index.html b/public/index.html index 2f1f41e..d5109ac 100644 --- a/public/index.html +++ b/public/index.html @@ -3,6 +3,7 @@
+ diff --git a/public/lib-flexible.js b/public/lib-flexible.js new file mode 100644 index 0000000..4ae2ada --- /dev/null +++ b/public/lib-flexible.js @@ -0,0 +1,51 @@ +/* + * @Author: SunTao 328867980@qq.com + * @Date: 2024-12-09 17:19:23 + * @LastEditors: SunTao 328867980@qq.com + * @LastEditTime: 2024-12-09 17:19:28 + * @FilePath: \znxjxt-ui\public\lib-flexible.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +(function flexible(window, document) { + var docEl = document.documentElement + var dpr = window.devicePixelRatio || 1 + + // adjust body font size + function setBodyFontSize() { + if (document.body) { + document.body.style.fontSize = (16 * dpr) + 'px' + } + else { + document.addEventListener('DOMContentLoaded', setBodyFontSize) + } + } + setBodyFontSize(); + + function setRemUnit() { + var rem = docEl.clientWidth / 120 + docEl.style.fontSize = rem + 'px' + } + + setRemUnit() + + // reset rem unit on page resize + window.addEventListener('resize', setRemUnit) + window.addEventListener('pageshow', function (e) { + if (e.persisted) { + setRemUnit() + } + }) + + // detect 0.5px supports + if (dpr >= 2) { + var fakeBody = document.createElement('body') + var testElement = document.createElement('div') + testElement.style.border = '.5px solid transparent' + fakeBody.appendChild(testElement) + docEl.appendChild(fakeBody) + if (testElement.offsetHeight === 1) { + docEl.classList.add('hairlines') + } + docEl.removeChild(fakeBody) + } +}(window, document)) diff --git a/src/views/big-screen/disease-components/traffic-statistic.vue b/src/views/big-screen/disease-components/traffic-statistic.vue index 28b4b8b..8ce1c51 100644 --- a/src/views/big-screen/disease-components/traffic-statistic.vue +++ b/src/views/big-screen/disease-components/traffic-statistic.vue @@ -42,7 +42,7 @@ - + - + \ No newline at end of file + diff --git a/src/views/big-screen/disease-components/traffic-trend.vue b/src/views/big-screen/disease-components/traffic-trend.vue index 4c82852..ee30ad4 100644 --- a/src/views/big-screen/disease-components/traffic-trend.vue +++ b/src/views/big-screen/disease-components/traffic-trend.vue @@ -166,7 +166,7 @@ export default { backgroundColor: "rgba(9, 24, 48, 0.5)", borderColor: "rgba(75, 253, 238, 0.4)", textStyle: { - fontSize: 12, + fontSize: "0.8rem", color: "#808C9F", }, }, @@ -184,7 +184,7 @@ export default { data: xData, axisLabel: { color: "#808C9F", - fontSize: 12, + fontSize: "0.8rem", interval: 0, }, axisLine: { @@ -223,7 +223,7 @@ export default { axisLabel: { show: true, color: "#808C9F", - fontSize: 12, + fontSize: "0.8rem", }, }, ], @@ -246,7 +246,7 @@ export default { formatter: "{c}", position: "top", color: "#fff", - fontSize: 14, + fontSize: "0.8rem", }, data: yData, }, @@ -309,6 +309,7 @@ export default { .content { width: 100%; height: 100%; + overflow: hidden; position: relative; .traffic-select { @@ -324,4 +325,4 @@ export default { overflow: hidden; } } - \ No newline at end of file + diff --git a/src/views/big-screen/overview-components/disease-current.vue b/src/views/big-screen/overview-components/disease-current.vue index 7b9c6b6..42a7ae5 100644 --- a/src/views/big-screen/overview-components/disease-current.vue +++ b/src/views/big-screen/overview-components/disease-current.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-18 10:19:56 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-03 11:41:07 + * @LastEditTime: 2024-12-09 17:38:03 * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\disease-current.vue * @Description: 总览大屏-病害三维饼图 --> @@ -57,7 +57,7 @@ - + - + - \ No newline at end of file diff --git a/src/views/big-screen/overview-components/disease-trends.vue b/src/views/big-screen/overview-components/disease-trends.vue index 7e7709d..9c583f4 100644 --- a/src/views/big-screen/overview-components/disease-trends.vue +++ b/src/views/big-screen/overview-components/disease-trends.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-18 10:16:30 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-14 15:49:52 + * @LastEditTime: 2024-12-09 17:39:15 * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\disease-trends.vue * @Description: 总览大屏-病害趋势 --> @@ -57,7 +57,7 @@ export default { text: "", textStyle: { color: "#fff", - fontSize: 12, + fontSize: "0.8rem", }, }, legend: { @@ -84,7 +84,7 @@ export default { backgroundColor: "rgba(9, 24, 48, 0.5)", borderColor: "rgba(75, 253, 238, 0.4)", textStyle: { - fontSize: 12, + fontSize: "0.8rem", color: "#808C9F", }, confine: true, @@ -103,7 +103,7 @@ export default { axisLabel: { interval: 0, color: "#808C9F", - fontSize: 12, + fontSize: "0.8rem", }, boundaryGap: false, // true折线图以x轴刻度为中心点 false折线图折线从头开始 data: xData, @@ -118,7 +118,7 @@ export default { }, axisLabel: { color: "#808C9F", - fontSize: 12, + fontSize: "0.8rem", formatter: function (value) { return value + ""; }, @@ -235,7 +235,8 @@ export default { // 是否显示detail,即拖拽时候显示详细数值信息 showDetail: false, // 数据窗口范围的起始数值 - startValue: this.echartList.length > 6 ? this.echartList.length - 6 : 0, + startValue: + this.echartList.length > 6 ? this.echartList.length - 6 : 0, // 数据窗口范围的结束数值(一页显示多少条数据) endValue: this.echartList.length, // empty:当前数据窗口外的数据,被设置为空。 @@ -280,4 +281,4 @@ export default { height: 100%; overflow: hidden; } - \ No newline at end of file + diff --git a/src/views/big-screen/overview-components/inspection-vehicles.vue b/src/views/big-screen/overview-components/inspection-vehicles.vue index 594a44b..60ef6a4 100644 --- a/src/views/big-screen/overview-components/inspection-vehicles.vue +++ b/src/views/big-screen/overview-components/inspection-vehicles.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-11-08 09:40:18 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-06 15:53:55 + * @LastEditTime: 2024-12-09 17:44:25 * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue * @Description: 总览大屏-巡检车辆 --> @@ -40,7 +40,7 @@ header-row-class-name="headerRow" row-class-name="bodayRow" style="width: 100%; background: none" - height="85%" + height="80%" >