diff --git a/src/views/3DOverview/components/FadianChart.vue b/src/views/3DOverview/components/FadianChart.vue new file mode 100644 index 0000000..70fb316 --- /dev/null +++ b/src/views/3DOverview/components/FadianChart.vue @@ -0,0 +1,161 @@ + + + + diff --git a/src/views/3DOverview/components/LeftContentEquipmentCheck.vue b/src/views/3DOverview/components/LeftContentEquipmentCheck.vue index 3cb3797..a1e66fc 100644 --- a/src/views/3DOverview/components/LeftContentEquipmentCheck.vue +++ b/src/views/3DOverview/components/LeftContentEquipmentCheck.vue @@ -43,6 +43,11 @@ const tableProps = [ { prop: 'checkContent', label: '提示等级', width: 120, resizable: false } ] const tableData = [ + { eqName: 'A下片机', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' }, + { eqName: 'A下片机', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' }, + { eqName: 'A下片机', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' }, + { eqName: 'A下片机', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' }, + { eqName: 'A下片机', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' }, { eqName: 'A下片机', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' }, { eqName: '设备B', pl: '产线1', warningLevel: 1, checkContent: '巡检内容' } // { eqName: '下片机', pl: '产线3', warningLevel: 3, checkContent: '巡检内容' }, @@ -69,8 +74,10 @@ export default { diff --git a/src/views/3DOverview/components/LeftContentPublicConsume.vue b/src/views/3DOverview/components/LeftContentPublicConsume.vue index 3863fab..ff0e6b5 100644 --- a/src/views/3DOverview/components/LeftContentPublicConsume.vue +++ b/src/views/3DOverview/components/LeftContentPublicConsume.vue @@ -1,6 +1,6 @@ @@ -30,10 +119,12 @@ diff --git a/src/views/3DOverview/components/TechyHeader.vue b/src/views/3DOverview/components/TechyHeader.vue index 44308e4..be910e3 100644 --- a/src/views/3DOverview/components/TechyHeader.vue +++ b/src/views/3DOverview/components/TechyHeader.vue @@ -78,6 +78,16 @@ export default { diff --git a/src/views/3DOverview/components/assets/consume/d.png b/src/views/3DOverview/components/assets/consume/d.png new file mode 100644 index 0000000..83a0afe Binary files /dev/null and b/src/views/3DOverview/components/assets/consume/d.png differ diff --git a/src/views/3DOverview/components/assets/consume/fad.png b/src/views/3DOverview/components/assets/consume/fad.png new file mode 100644 index 0000000..6f3c57f Binary files /dev/null and b/src/views/3DOverview/components/assets/consume/fad.png differ diff --git a/src/views/3DOverview/components/assets/consume/gas.png b/src/views/3DOverview/components/assets/consume/gas.png new file mode 100644 index 0000000..210f23c Binary files /dev/null and b/src/views/3DOverview/components/assets/consume/gas.png differ diff --git a/src/views/3DOverview/components/assets/consume/s.png b/src/views/3DOverview/components/assets/consume/s.png new file mode 100644 index 0000000..bc91665 Binary files /dev/null and b/src/views/3DOverview/components/assets/consume/s.png differ diff --git a/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.ttf b/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.ttf new file mode 100644 index 0000000..04aeb2e Binary files /dev/null and b/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.ttf differ diff --git a/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.woff b/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.woff new file mode 100644 index 0000000..f663ad1 Binary files /dev/null and b/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.woff differ diff --git a/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.woff2 b/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.woff2 new file mode 100644 index 0000000..4a254e9 Binary files /dev/null and b/src/views/3DOverview/components/assets/fonts/zcoolqingkehuangyouti-Regular.woff2 differ diff --git a/src/views/3DOverview/components/newBar.vue b/src/views/3DOverview/components/newBar.vue new file mode 100644 index 0000000..afe2317 --- /dev/null +++ b/src/views/3DOverview/components/newBar.vue @@ -0,0 +1,363 @@ + + + + diff --git a/src/views/3DOverview/index.vue b/src/views/3DOverview/index.vue index a2fce66..344ba29 100644 --- a/src/views/3DOverview/index.vue +++ b/src/views/3DOverview/index.vue @@ -41,15 +41,15 @@
- + -
- - - -
- + + + + + +
@@ -57,23 +57,23 @@
-
- +
+
-
+
-
+
- +
@@ -189,6 +189,7 @@ export default { } .bottom-part { + height: 22vh; padding: 0 calc(100vmin / 1920 * 36) calc(100vmin / 1920 * 36); display: flex; /* gap: 16px; */