diff --git a/src/assets/css/iconfont/iconfont.css b/src/assets/css/iconfont/iconfont.css new file mode 100644 index 0000000..3e31ff9 --- /dev/null +++ b/src/assets/css/iconfont/iconfont.css @@ -0,0 +1,19 @@ +@font-face { + font-family: "iconfont"; /* Project id 4404806 */ + src: url('iconfont.woff2?t=1704785829971') format('woff2'), + url('iconfont.woff?t=1704785829971') format('woff'), + url('iconfont.ttf?t=1704785829971') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-tvoc:before { + content: "\e753"; +} + diff --git a/src/assets/css/iconfont/iconfont.ttf b/src/assets/css/iconfont/iconfont.ttf new file mode 100644 index 0000000..4c7790c Binary files /dev/null and b/src/assets/css/iconfont/iconfont.ttf differ diff --git a/src/assets/css/iconfont/iconfont.woff b/src/assets/css/iconfont/iconfont.woff new file mode 100644 index 0000000..5edbdff Binary files /dev/null and b/src/assets/css/iconfont/iconfont.woff differ diff --git a/src/assets/css/iconfont/iconfont.woff2 b/src/assets/css/iconfont/iconfont.woff2 new file mode 100644 index 0000000..afa9060 Binary files /dev/null and b/src/assets/css/iconfont/iconfont.woff2 differ diff --git a/src/views/Mechanics/child/station/components/float.vue b/src/views/Mechanics/child/station/components/float.vue index 67b3f6e..851dac4 100644 --- a/src/views/Mechanics/child/station/components/float.vue +++ b/src/views/Mechanics/child/station/components/float.vue @@ -11,62 +11,68 @@
- {{ allData.data1 }}% + {{ props.allData.data1 }}%
-

{{ allData.title1 }}

+

{{ props.allData.title1 }}

- {{ - allData.data2 === "N1" - ? "工作" - : allData.data2 === "N2" - ? "待机" - : allData.data2 === "N3" + {{ + props.allData.data2 === "N1" + ? "工作" + : props.allData.data2 === "N2" + ? "待机" + : props.allData.data2 === "N3" ? "停机" : "未知状态" - }} + }}
-

{{ allData.title2 }}

+

{{ props.allData.title2 }}

- {{ allData.data3 }}转 + {{ props.allData.data3 }}转
-

{{ allData.title3 }}

+

{{ props.allData.title3 }}

- {{ allData.data4 }} + {{ props.allData.data4 }}
-

{{ allData.title4 }}

+

{{ props.allData.title4 }}

@@ -128,6 +151,7 @@ img { } .qiu2 { background: url(./../img/cicle03.png) no-repeat center; + } .data3 { @@ -174,7 +198,10 @@ p { background-size: 100%; top: 20%; margin: auto; - display: table; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; } #qiu::before { content: ""; diff --git a/src/views/Mechanics/child/station/index.vue b/src/views/Mechanics/child/station/index.vue index 65d8b38..22bafa6 100644 --- a/src/views/Mechanics/child/station/index.vue +++ b/src/views/Mechanics/child/station/index.vue @@ -15,8 +15,8 @@

{{ timeHtml }}

- - + + @@ -31,6 +31,31 @@ let { timeHtml } = useNowTime(); let allData = reactive({ header: "炮塔铣床", }); + +let topData = reactive({ + data1: "95", + data2: "N1", + data3: "100", + data4: "下降", + title1: "稼动率", + title2: "设备状态", + title3: "钻头转速", + title4: "钻头状态", +}); +let sumData = reactive({ + data1: "高速", + data2: "50cm", + data2s: "2cm/s", + data3: "正转", + data4: "50cm", + data5: "50cm", + title1: "设备状态", + title2: "平台X轴距原点位置和速度", + title3: "设备状态", + title4: "平台y轴距原点位置", + title5: "平台z轴距原点位置", + image: "./../img/device.png", +}); +} diff --git a/src/views/MicEnvironment/components/verticalNum.vue b/src/views/MicEnvironment/components/verticalNum.vue index 4038324..f18b3da 100644 --- a/src/views/MicEnvironment/components/verticalNum.vue +++ b/src/views/MicEnvironment/components/verticalNum.vue @@ -77,6 +77,7 @@ onUnmounted(() => {