diff --git a/xiuosiot-frontend/src/assets/images/HM100_product.png b/xiuosiot-frontend/src/assets/images/HM100_product.png index 9b1ea5e..c8bce7f 100644 Binary files a/xiuosiot-frontend/src/assets/images/HM100_product.png and b/xiuosiot-frontend/src/assets/images/HM100_product.png differ diff --git a/xiuosiot-frontend/src/assets/images/M168.png b/xiuosiot-frontend/src/assets/images/M168.png index 7538102..6cafb6d 100644 Binary files a/xiuosiot-frontend/src/assets/images/M168.png and b/xiuosiot-frontend/src/assets/images/M168.png differ diff --git a/xiuosiot-frontend/src/assets/images/RV400.png b/xiuosiot-frontend/src/assets/images/RV400.png index ba6fc71..e86ff9e 100644 Binary files a/xiuosiot-frontend/src/assets/images/RV400.png and b/xiuosiot-frontend/src/assets/images/RV400.png differ diff --git a/xiuosiot-frontend/src/assets/images/ai_elec.png b/xiuosiot-frontend/src/assets/images/ai_elec.png index 25b2290..d7435f5 100644 Binary files a/xiuosiot-frontend/src/assets/images/ai_elec.png and b/xiuosiot-frontend/src/assets/images/ai_elec.png differ diff --git a/xiuosiot-frontend/src/assets/images/ai_factory.png b/xiuosiot-frontend/src/assets/images/ai_factory.png index c56a038..8a594c1 100644 Binary files a/xiuosiot-frontend/src/assets/images/ai_factory.png and b/xiuosiot-frontend/src/assets/images/ai_factory.png differ diff --git a/xiuosiot-frontend/src/assets/images/ai_traffic.png b/xiuosiot-frontend/src/assets/images/ai_traffic.png index cb2602e..3b56f31 100644 Binary files a/xiuosiot-frontend/src/assets/images/ai_traffic.png and b/xiuosiot-frontend/src/assets/images/ai_traffic.png differ diff --git a/xiuosiot-frontend/src/assets/images/ammeter_workshop.png b/xiuosiot-frontend/src/assets/images/ammeter_workshop.png index 901a52c..b168b0c 100644 Binary files a/xiuosiot-frontend/src/assets/images/ammeter_workshop.png and b/xiuosiot-frontend/src/assets/images/ammeter_workshop.png differ diff --git a/xiuosiot-frontend/src/assets/images/background.jpg b/xiuosiot-frontend/src/assets/images/background.jpg index 2288349..0c96dfd 100644 Binary files a/xiuosiot-frontend/src/assets/images/background.jpg and b/xiuosiot-frontend/src/assets/images/background.jpg differ diff --git a/xiuosiot-frontend/src/assets/images/bg.jpg b/xiuosiot-frontend/src/assets/images/bg.jpg index 5e99e95..a4e0dd2 100644 Binary files a/xiuosiot-frontend/src/assets/images/bg.jpg and b/xiuosiot-frontend/src/assets/images/bg.jpg differ diff --git a/xiuosiot-frontend/src/assets/images/dashengda-slide1.png b/xiuosiot-frontend/src/assets/images/dashengda-slide1.png index abb18d3..5e35a20 100644 Binary files a/xiuosiot-frontend/src/assets/images/dashengda-slide1.png and b/xiuosiot-frontend/src/assets/images/dashengda-slide1.png differ diff --git a/xiuosiot-frontend/src/assets/images/dashengda-slide2.png b/xiuosiot-frontend/src/assets/images/dashengda-slide2.png index 26c8a4b..95869d2 100644 Binary files a/xiuosiot-frontend/src/assets/images/dashengda-slide2.png and b/xiuosiot-frontend/src/assets/images/dashengda-slide2.png differ diff --git a/xiuosiot-frontend/src/assets/images/dashengda_arch.png b/xiuosiot-frontend/src/assets/images/dashengda_arch.png index 681ea59..4896a3c 100644 Binary files a/xiuosiot-frontend/src/assets/images/dashengda_arch.png and b/xiuosiot-frontend/src/assets/images/dashengda_arch.png differ diff --git a/xiuosiot-frontend/src/assets/images/dashengda_system.png b/xiuosiot-frontend/src/assets/images/dashengda_system.png index 39119ee..7d3f372 100644 Binary files a/xiuosiot-frontend/src/assets/images/dashengda_system.png and b/xiuosiot-frontend/src/assets/images/dashengda_system.png differ diff --git a/xiuosiot-frontend/src/assets/images/dataAnalysisBg2.jpeg b/xiuosiot-frontend/src/assets/images/dataAnalysisBg2.jpeg index e4b9782..d43d46f 100644 Binary files a/xiuosiot-frontend/src/assets/images/dataAnalysisBg2.jpeg and b/xiuosiot-frontend/src/assets/images/dataAnalysisBg2.jpeg differ diff --git a/xiuosiot-frontend/src/assets/images/dataCollection.png b/xiuosiot-frontend/src/assets/images/dataCollection.png index 876d7c5..7392b1c 100644 Binary files a/xiuosiot-frontend/src/assets/images/dataCollection.png and b/xiuosiot-frontend/src/assets/images/dataCollection.png differ diff --git a/xiuosiot-frontend/src/assets/images/elec.png b/xiuosiot-frontend/src/assets/images/elec.png index a8e59ed..91d3cc8 100644 Binary files a/xiuosiot-frontend/src/assets/images/elec.png and b/xiuosiot-frontend/src/assets/images/elec.png differ diff --git a/xiuosiot-frontend/src/assets/images/electricity-monitor.png b/xiuosiot-frontend/src/assets/images/electricity-monitor.png index e89c7a7..e46b5d0 100644 Binary files a/xiuosiot-frontend/src/assets/images/electricity-monitor.png and b/xiuosiot-frontend/src/assets/images/electricity-monitor.png differ diff --git a/xiuosiot-frontend/src/assets/images/environment-mentor.png b/xiuosiot-frontend/src/assets/images/environment-mentor.png index 1be3051..55a4f96 100644 Binary files a/xiuosiot-frontend/src/assets/images/environment-mentor.png and b/xiuosiot-frontend/src/assets/images/environment-mentor.png differ diff --git a/xiuosiot-frontend/src/assets/images/gateway.png b/xiuosiot-frontend/src/assets/images/gateway.png index e96cd08..0dbf83b 100644 Binary files a/xiuosiot-frontend/src/assets/images/gateway.png and b/xiuosiot-frontend/src/assets/images/gateway.png differ diff --git a/xiuosiot-frontend/src/assets/images/hangxiao-slide1.png b/xiuosiot-frontend/src/assets/images/hangxiao-slide1.png index d1fe9a7..8f4efbd 100644 Binary files a/xiuosiot-frontend/src/assets/images/hangxiao-slide1.png and b/xiuosiot-frontend/src/assets/images/hangxiao-slide1.png differ diff --git a/xiuosiot-frontend/src/assets/images/hangxiao-slide2.png b/xiuosiot-frontend/src/assets/images/hangxiao-slide2.png index 90176af..622cf62 100644 Binary files a/xiuosiot-frontend/src/assets/images/hangxiao-slide2.png and b/xiuosiot-frontend/src/assets/images/hangxiao-slide2.png differ diff --git a/xiuosiot-frontend/src/assets/images/home.png b/xiuosiot-frontend/src/assets/images/home.png index 1fabdbc..808f923 100644 Binary files a/xiuosiot-frontend/src/assets/images/home.png and b/xiuosiot-frontend/src/assets/images/home.png differ diff --git a/xiuosiot-frontend/src/assets/images/home_bg.png b/xiuosiot-frontend/src/assets/images/home_bg.png index 14b00f6..fd467ae 100644 Binary files a/xiuosiot-frontend/src/assets/images/home_bg.png and b/xiuosiot-frontend/src/assets/images/home_bg.png differ diff --git a/xiuosiot-frontend/src/assets/images/img_flow.png b/xiuosiot-frontend/src/assets/images/img_flow.png index b61ec08..8944a16 100644 Binary files a/xiuosiot-frontend/src/assets/images/img_flow.png and b/xiuosiot-frontend/src/assets/images/img_flow.png differ diff --git a/xiuosiot-frontend/src/assets/images/maduoche1.png b/xiuosiot-frontend/src/assets/images/maduoche1.png index bbe41c7..fcccbab 100644 Binary files a/xiuosiot-frontend/src/assets/images/maduoche1.png and b/xiuosiot-frontend/src/assets/images/maduoche1.png differ diff --git a/xiuosiot-frontend/src/assets/images/maduoche2.png b/xiuosiot-frontend/src/assets/images/maduoche2.png index eee4b68..4a16087 100644 Binary files a/xiuosiot-frontend/src/assets/images/maduoche2.png and b/xiuosiot-frontend/src/assets/images/maduoche2.png differ diff --git a/xiuosiot-frontend/src/assets/images/maduoche3.png b/xiuosiot-frontend/src/assets/images/maduoche3.png index e2d2c18..235a928 100644 Binary files a/xiuosiot-frontend/src/assets/images/maduoche3.png and b/xiuosiot-frontend/src/assets/images/maduoche3.png differ diff --git a/xiuosiot-frontend/src/assets/images/maduoche4.png b/xiuosiot-frontend/src/assets/images/maduoche4.png index 5abef03..aff617f 100644 Binary files a/xiuosiot-frontend/src/assets/images/maduoche4.png and b/xiuosiot-frontend/src/assets/images/maduoche4.png differ diff --git a/xiuosiot-frontend/src/assets/images/monthlyAverage.png b/xiuosiot-frontend/src/assets/images/monthlyAverage.png index 472abda..72aa2fb 100644 Binary files a/xiuosiot-frontend/src/assets/images/monthlyAverage.png and b/xiuosiot-frontend/src/assets/images/monthlyAverage.png differ diff --git a/xiuosiot-frontend/src/assets/images/plc_monitor_bg.png b/xiuosiot-frontend/src/assets/images/plc_monitor_bg.png index 6753ab4..f64722b 100644 Binary files a/xiuosiot-frontend/src/assets/images/plc_monitor_bg.png and b/xiuosiot-frontend/src/assets/images/plc_monitor_bg.png differ diff --git a/xiuosiot-frontend/src/assets/images/qianjiang_arch.png b/xiuosiot-frontend/src/assets/images/qianjiang_arch.png index 966de62..6606aa4 100644 Binary files a/xiuosiot-frontend/src/assets/images/qianjiang_arch.png and b/xiuosiot-frontend/src/assets/images/qianjiang_arch.png differ diff --git a/xiuosiot-frontend/src/assets/images/qianjiang_dashboard.png b/xiuosiot-frontend/src/assets/images/qianjiang_dashboard.png index c4221df..623645c 100644 Binary files a/xiuosiot-frontend/src/assets/images/qianjiang_dashboard.png and b/xiuosiot-frontend/src/assets/images/qianjiang_dashboard.png differ diff --git a/xiuosiot-frontend/src/assets/images/qianjiang_elec.png b/xiuosiot-frontend/src/assets/images/qianjiang_elec.png index 46e8b8a..6b3a7f5 100644 Binary files a/xiuosiot-frontend/src/assets/images/qianjiang_elec.png and b/xiuosiot-frontend/src/assets/images/qianjiang_elec.png differ diff --git a/xiuosiot-frontend/src/assets/images/qianjiang_system.png b/xiuosiot-frontend/src/assets/images/qianjiang_system.png index 72b6dd1..5b36955 100644 Binary files a/xiuosiot-frontend/src/assets/images/qianjiang_system.png and b/xiuosiot-frontend/src/assets/images/qianjiang_system.png differ diff --git a/xiuosiot-frontend/src/assets/images/realTime.png b/xiuosiot-frontend/src/assets/images/realTime.png index b15b65d..415fd2e 100644 Binary files a/xiuosiot-frontend/src/assets/images/realTime.png and b/xiuosiot-frontend/src/assets/images/realTime.png differ diff --git a/xiuosiot-frontend/src/assets/images/security.png b/xiuosiot-frontend/src/assets/images/security.png index 902878a..f743bf5 100644 Binary files a/xiuosiot-frontend/src/assets/images/security.png and b/xiuosiot-frontend/src/assets/images/security.png differ diff --git a/xiuosiot-frontend/src/assets/images/slide3.png b/xiuosiot-frontend/src/assets/images/slide3.png index 5fd507d..3f31651 100644 Binary files a/xiuosiot-frontend/src/assets/images/slide3.png and b/xiuosiot-frontend/src/assets/images/slide3.png differ diff --git a/xiuosiot-frontend/src/assets/images/workplace.png b/xiuosiot-frontend/src/assets/images/workplace.png index c747513..7834a8d 100644 Binary files a/xiuosiot-frontend/src/assets/images/workplace.png and b/xiuosiot-frontend/src/assets/images/workplace.png differ diff --git a/xiuosiot-frontend/src/layout/index.vue b/xiuosiot-frontend/src/layout/index.vue index 4adc4a9..6312a14 100644 --- a/xiuosiot-frontend/src/layout/index.vue +++ b/xiuosiot-frontend/src/layout/index.vue @@ -69,7 +69,8 @@ export default { position: relative; height: 100%; width: 100%; - min-width: 1340px; + // min-width: 1340px; + min-width: 1500px; &.mobile.openSidebar { position: fixed; top: 0; diff --git a/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue b/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue index ce07df4..c1f9c2d 100644 --- a/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue +++ b/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue @@ -558,8 +558,6 @@ export default { padding: 120px 0 30px 30px; display: flex; height: 100%; - min-width: 1300px; - overflow: auto; .title { font-size: 20px; font-family: TRENDS; @@ -662,7 +660,7 @@ export default { .part2 { flex: 1; width: 30%; - min-width: 350px; + min-width: 400px; margin-left: 36px; margin-right: 30px; .content { @@ -673,7 +671,7 @@ export default { font-weight: bold; p { line-height: 30px; - padding-left: 18%; + padding-left: 10%; width: 65%; padding-right: 20px; margin: 5px auto;