diff --git a/src/assets/company.png b/src/assets/company.png index a62667c..ae1b137 100644 Binary files a/src/assets/company.png and b/src/assets/company.png differ diff --git a/src/assets/fonts/zkqkhy.ttf b/src/assets/fonts/zcoolqingkehuangyouti-Regular.ttf similarity index 94% rename from src/assets/fonts/zkqkhy.ttf rename to src/assets/fonts/zcoolqingkehuangyouti-Regular.ttf index f8f46ee..04aeb2e 100644 Binary files a/src/assets/fonts/zkqkhy.ttf and b/src/assets/fonts/zcoolqingkehuangyouti-Regular.ttf differ diff --git a/src/assets/header.png b/src/assets/header.png index 3bdb875..0b734ee 100644 Binary files a/src/assets/header.png and b/src/assets/header.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index cfd02df..85b4929 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/tv.png b/src/assets/tv.png new file mode 100644 index 0000000..33552aa Binary files /dev/null and b/src/assets/tv.png differ diff --git a/src/assets/video-crash.png b/src/assets/video-crash.png new file mode 100644 index 0000000..0f70302 Binary files /dev/null and b/src/assets/video-crash.png differ diff --git a/src/components/boxes/HistoryTemp.vue b/src/components/boxes/HistoryTemp.vue index 25e5462..693c50a 100644 --- a/src/components/boxes/HistoryTemp.vue +++ b/src/components/boxes/HistoryTemp.vue @@ -38,7 +38,7 @@ h3 { margin: 0; font-family: sans-serif; font-weight: 400; - font-size: adjust(10px); + font-size: adjust(14px); letter-spacing: adjust(1px); color: #52fff8; margin: adjust(12px) 0; diff --git a/src/components/boxes/InWater.vue b/src/components/boxes/InWater.vue index 0e94d74..35afceb 100644 --- a/src/components/boxes/InWater.vue +++ b/src/components/boxes/InWater.vue @@ -58,8 +58,8 @@ export default { position: absolute; top: adjust(24px); right: 0; - width: adjust(w(386px)); - height: adjust(h(364px)); + width: adjust(w(440px)); + height: adjust(h(380px)); } .content { @@ -69,7 +69,7 @@ export default { .wave { transform: translateX(adjust(-16px)); width: adjust(w(793px)); - height: adjust(h(72px)); + height: adjust(h(76px)); background: url(../../assets/inwater.png) no-repeat; background-size: 100% 100%; } diff --git a/src/components/boxes/OutWater.vue b/src/components/boxes/OutWater.vue index 31d2dfe..a6979c8 100644 --- a/src/components/boxes/OutWater.vue +++ b/src/components/boxes/OutWater.vue @@ -58,8 +58,8 @@ export default { position: absolute; top: adjust(24px); right: 0; - width: adjust(w(386px)); - height: adjust(h(364px)); + width: adjust(w(440px)); + height: adjust(h(380px)); } .content { @@ -69,7 +69,7 @@ export default { .wave { transform: translateX(adjust(-16px)); width: adjust(w(793px)); - height: adjust(h(72px)); + height: adjust(h(76px)); background: url(../../assets/inwater.png) no-repeat; background-size: 100% 100%; } diff --git a/src/components/charts/BarChart.vue b/src/components/charts/BarChart.vue index 635d24e..f6da90c 100644 --- a/src/components/charts/BarChart.vue +++ b/src/components/charts/BarChart.vue @@ -63,16 +63,16 @@ export default { this.chart = echarts.init(document.getElementById(this.id)); this.chart.setOption({ grid: { - top: adjust(28), + top: adjust(10), left: adjust(28), bottom: adjust(18), right: adjust(12), }, xAxis: { type: "category", - data: Array(31) + data: Array(24) .fill(1) - .map((_, index) => index + 1), + .map((_, index) => index + 1 + ':00'), axisLine: { lineStyle: { color: "#5982b2a0", @@ -85,17 +85,18 @@ export default { color: "#ffffff", fontSize: adjust(7), lineHeight: adjust(1), - margin: adjust(8), + margin: adjust(6), + rotate: 30 }, }, yAxis: { type: "value", - name: "单位/℃", - nameTextStyle: { - color: "#fff9", - fontSize: adjust(8), - align: "right", - }, + // name: "单位/℃", + // nameTextStyle: { + // color: "#fff9", + // fontSize: adjust(8), + // align: "right", + // }, axisLine: { show: true, lineStyle: { diff --git a/src/components/charts/LineChart.vue b/src/components/charts/LineChart.vue index 87d19b0..00eeb27 100644 --- a/src/components/charts/LineChart.vue +++ b/src/components/charts/LineChart.vue @@ -124,7 +124,7 @@ export default { xAxis: { data: Array(24) .fill(1) - .map((_, index) => index + 1), + .map((_, index) => index + 1 + ':00'), axisLine: { lineStyle: { color: "#5982b2a0", @@ -138,6 +138,7 @@ export default { fontSize: adjust(6), lineHeight: adjust(1), margin: adjust(8), + rotate: 30 }, }, yAxis: { diff --git a/src/components/common/DigitalBox.vue b/src/components/common/DigitalBox.vue index bea7b38..55a78fb 100644 --- a/src/components/common/DigitalBox.vue +++ b/src/components/common/DigitalBox.vue @@ -46,7 +46,7 @@ export default { } .digit { - font-family: "站酷庆科黄油体", sans-serif; + font-family: "zcoolqingkehuangyouti-Regular", sans-serif; font-size: adjust(32px); line-height: adjust(39px); } diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index 8c48214..ac71331 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -4,7 +4,7 @@ -

凯盛晶华玻璃院公司800t/d特种玻璃生产线大数据指挥中心

+

凯盛晶华玻璃有限公司800t/d特种玻璃生产线大数据指挥中心

@@ -23,7 +23,7 @@ export default { header { background: url(../../assets/header.png) center/contain no-repeat; - background-size: 105%; + background-size: 100%; height: adjust(h(280px)); width: adjust($actual_width); display: grid; @@ -32,10 +32,10 @@ header { > div { display: flex; align-items: center; - margin-bottom: adjust(20px); + margin-bottom: adjust(10px); .header--logo { - width: adjust(56px); + width: adjust(102px); height: adjust(56px); background: url(../../assets/logo.png) center/contain no-repeat; } @@ -62,14 +62,16 @@ header { } .company { - margin-left: adjust(w(1420px)); - width: adjust(w(1460px)); + margin-left: adjust(w(1460px)); + width: adjust(w(1320px)); + height: adjust(h(48px)); background: url("../../assets/company.png") center/cover no-repeat; } .datetime { - margin-left: adjust(w(6050px)); - width: adjust(w(1407px)); + margin-left: adjust(w(6150px)); + width: adjust(w(1320px)); + height: adjust(h(48px)); background: url("../../assets/date.png") center/cover no-repeat; } diff --git a/src/components/layout/Main.vue b/src/components/layout/Main.vue index e1fb8bb..bd2c1e3 100644 --- a/src/components/layout/Main.vue +++ b/src/components/layout/Main.vue @@ -1,5 +1,7 @@