diff --git a/src/assets/images/center-bgc-box.png b/src/assets/images/center-bgc-box.png new file mode 100644 index 0000000000000000000000000000000000000000..794d7caf42019d4f8b1c8644d4b0c11b5b2fc7f5 Binary files /dev/null and b/src/assets/images/center-bgc-box.png differ diff --git a/src/assets/images/center-bottom-box-bgc.png b/src/assets/images/center-bottom-box-bgc.png new file mode 100644 index 0000000000000000000000000000000000000000..4a200eb0835cf4d826657ae85751b48b4a3b1bde Binary files /dev/null and b/src/assets/images/center-bottom-box-bgc.png differ diff --git a/src/assets/images/center-center-box-bgc.png b/src/assets/images/center-center-box-bgc.png new file mode 100644 index 0000000000000000000000000000000000000000..be9f5550ed840c43c10f2770623f272bb3279003 Binary files /dev/null and b/src/assets/images/center-center-box-bgc.png differ diff --git a/src/assets/images/center-top-box-bgc.png b/src/assets/images/center-top-box-bgc.png new file mode 100644 index 0000000000000000000000000000000000000000..0e1fd57fb85212ca3a6111aae7387aa227083ac3 Binary files /dev/null and b/src/assets/images/center-top-box-bgc.png differ diff --git a/src/utils/config.js b/src/utils/config.js index 1b55f6602927669be942e12e6e2ea8be2e149db7..2b8f96f10655834a3cd9c447c02cd96d87b131d5 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,6 +1,6 @@ module.exports = { - baseUrl: 'localhost:2011' + // baseUrl: 'localhost:2011' // baseUrl: '49.234.81.196:2011' - // baseUrl: '192.168.0.100:2011' + baseUrl: '192.168.0.101:2011' // baseUrl: '120.25.106.20:2011' } diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue index 62afbcdfa785c64a01adab68d8648fd456514b8b..ac3ebe3f647c390e36cf539f71e63f79d7e6e02c 100644 --- a/src/views/NewMainPage.vue +++ b/src/views/NewMainPage.vue @@ -4,16 +4,16 @@
-
+
安检门
-
- x射线机 +
+ 人脸ESD
-
- 炸探/液探 +
+ 手探
@@ -25,18 +25,13 @@
- -
- 系统设置 -
-
- +
+ 炸探/液探 +
- -
- 设备管理 -
-
+
+ X光机 +
@@ -52,8 +47,8 @@
-
- 系统总体拓扑结构 +
+ 设备状态总览
1 @@ -92,12 +87,39 @@ export default { components: { LeftTop, RightBottom, RightTop, LowerLeft, LeftCenter, RightMiddle }, data() { return { - + leftBtnColor: ['#ffde00', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)'] } }, async mounted() { this.$Socket.connect() this.getWebSocket() + // 自适应宽度处理 + + /** + * + * 自适应宽度处理 + * 通过当前网页具体宽高 / 设计稿画板实际宽高 得到比例最终缩放页面 + * + * 如果是同比例,比如12:9的尺寸比例,不管分辨率多大,都是能完全适应且不会被拉伸 + * 如果不是在同一比例,简单来就像图片改变了比例就会被拉升 + * + * 具体大小可自行设置,下面这句话也可以不要,修改style.css样式也可以,方法很多 + * + */ + document.getElementsByClassName('container-box')[0].style.transform = ` + scaleX(${1}) + scaleY(${1})` + + /** + * + * 窗口发生改变自动刷新页面 + * 这样做不太友好,一般做法当前页面大小发生改变去重新加载echarts对象 + * 最好自行修改一下,当然。不要也可以,不会影响功能使用 + * + */ + window.onresize = () => location.reload() + this.getWebSocket() + this.changeLeftBtnStyle() }, beforeDestroy() { this.$Socket.close() @@ -105,6 +127,10 @@ export default { methods: { getWebSocket() { getWebSocket().then() + }, + changeLeftBtnStyle(a) { + this.leftBtnColor = ['rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)'] + this.leftBtnColor[a] = '#ffde00' } } @@ -188,17 +214,29 @@ export default { width: 46%; height: 98%; .center-top { - margin: 0 50px; - height: 40%; - //border: 1px solid #000000; - background-image: url("../assets/images/center-box-bg.png"); + //margin: 0 50px; + margin-right: 20px; + height: 16%; + margin-bottom: 20px; + background-image: url("../assets/images/center-top-box-bgc.png"); + background-repeat: no-repeat; + background-size: 100% 100%; + } + .center-center { + height: 16%; + margin-bottom: 20px; + margin-right: 20px; + background-image: url("../assets/images/center-center-box-bgc.png"); background-repeat: no-repeat; background-size: 100% 100%; } - .center-center, .center-bottom { - height: 25%; - //border: 1px solid #000000; + height: 16%; + margin-bottom: 20px; + margin-right: 20px; + background-image: url("../assets/images/center-bottom-box-bgc.png"); + background-repeat: no-repeat; + background-size: 100% 100%; } } diff --git a/src/views/NewMainPageComponents/RightTop.vue b/src/views/NewMainPageComponents/RightTop.vue index 0d6c9d38b59944d6c1e0e14956d6772eb637db4b..b6d86a5ddd27272886eca2b73751984964f637a2 100644 --- a/src/views/NewMainPageComponents/RightTop.vue +++ b/src/views/NewMainPageComponents/RightTop.vue @@ -1,16 +1,16 @@