From dc705861a89f6e92a6fb9208205166897ca5c3e0 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 09 十月 2024 09:50:32 +0800
Subject: [PATCH] 1、调整车间看板设备图片以及数据驱动 2、调整全局加载等待文字以及项目logo
---
src/assets/page/subControlWorkshopSignage/5045-7125.png | 0
vue.config.js | 41 +-
src/assets/page/subControlWorkshopSignage/5045-7028.png | 0
src/assets/page/subControlWorkshopSignage/5045-7108.png | 0
src/assets/page/subControlWorkshopSignage/5068-7005.png | 0
src/assets/page/subControlWorkshopSignage/5045-7027.png | 0
src/assets/page/subControlWorkshopSignage/yellow.png | 0
src/assets/page/subControlWorkshopSignage/5045-7116.png | 0
src/assets/page/subControlWorkshopSignage/5016-7438.png | 0
src/assets/page/subControlWorkshopSignage/5045-7124.png | 0
src/assets/page/subControlWorkshopSignage/5045-7018.png | 0
src/views/mdc/base/MasterControlWorkshopSignage.vue | 406 ++++++++++++------------------------
src/assets/page/subControlWorkshopSignage/5045-7026.png | 0
src/assets/page/subControlWorkshopSignage/5045-7115.png | 0
src/assets/page/subControlWorkshopSignage/5045-7114.png | 0
src/assets/page/subControlWorkshopSignage/5045-7157.png | 0
src/assets/page/subControlWorkshopSignage/5045-7101.png | 0
src/assets/page/subControlWorkshopSignage/5045-7029.png | 0
src/assets/page/subControlWorkshopSignage/5045-7113.png | 0
src/views/mdc/base/SubControlWorkshopSignage.vue | 174 ++++++++++-----
src/assets/page/subControlWorkshopSignage/5045-7016.png | 0
src/assets/page/subControlWorkshopSignage/5045-7109.png | 0
src/assets/page/subControlWorkshopSignage/5029-7010.png | 0
src/assets/page/subControlWorkshopSignage/5045-7076.png | 0
src/assets/page/subControlWorkshopSignage/5045-7120.png | 0
src/assets/page/subControlWorkshopSignage/5016-7435.png | 0
src/assets/page/subControlWorkshopSignage/5045-7112.png | 0
public/logo.png | 0
src/assets/page/subControlWorkshopSignage/grey.png | 0
src/assets/page/subControlWorkshopSignage/5045-7030.png | 0
src/assets/page/subControlWorkshopSignage/green.png | 0
src/assets/page/subControlWorkshopSignage/5016-7433.png | 0
src/api/mdc.js | 22 +
src/assets/page/subControlWorkshopSignage/5016-7434.png | 0
src/config/router.config.js | 14
src/assets/page/subControlWorkshopSignage/5045-7111.png | 0
src/assets/page/subControlWorkshopSignage/5045-7102.png | 0
src/assets/page/subControlWorkshopSignage/5045-7119.png | 0
src/assets/page/subControlWorkshopSignage/5045-7072.png | 0
src/assets/yt_background.png | 0
src/assets/page/subControlWorkshopSignage/5016-7437.png | 0
public/index.html | 2
src/assets/page/subControlWorkshopSignage/5045-7122.png | 0
src/assets/page/subControlWorkshopSignage/5045-7123.png | 0
src/assets/page/subControlWorkshopSignage/5045-7105.png | 0
src/assets/page/subControlWorkshopSignage/5045-7110.png | 0
src/assets/page/subControlWorkshopSignage/5045-7071.png | 0
src/assets/page/subControlWorkshopSignage/5045-7025.png | 0
src/assets/page/subControlWorkshopSignage/5045-7118.png | 0
src/assets/page/subControlWorkshopSignage/5045-7815.png | 0
src/assets/page/subControlWorkshopSignage/5016-7436.png | 0
src/assets/page/subControlWorkshopSignage/5045-7121.png | 0
src/assets/page/subControlWorkshopSignage/5045-7104.png | 0
src/assets/page/subControlWorkshopSignage/5045-7117.png | 0
src/assets/page/subControlWorkshopSignage/red.png | 0
55 files changed, 308 insertions(+), 351 deletions(-)
diff --git a/public/index.html b/public/index.html
index 64e7658..a23ab4e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -249,7 +249,7 @@
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
- <div class="load_title">姝ｅ湪鍔犺浇 JeecgBoot 浣庝唬鐮佸钩鍙�,璇疯�愬績绛夊緟
+ <div class="load_title">姝ｅ湪鍔犺浇涓浗涓�鎷栫鐞嗙郴缁�,璇疯�愬績绛夊緟
</div>
</div>
diff --git a/public/logo.png b/public/logo.png
index 1c356e3..c51fe2a 100644
--- a/public/logo.png
+++ b/public/logo.png
Binary files differ
diff --git a/src/api/mdc.js b/src/api/mdc.js
index 002c46f..cb411d1 100644
--- a/src/api/mdc.js
+++ b/src/api/mdc.js
@@ -16,5 +16,25 @@
// 鍒犻櫎璁惧鍙傛暟闃堝��
deleteParamThresholdApi: id => deleteAction('/mdc/mdcEquipmentThreshold/delete', { id }),
// 鍒犻櫎璁惧鍙傛暟闃堝��
- deleteBatchParamThresholdApi: ids => deleteAction('/mdc/mdcEquipmentThreshold/deleteBatch', { ids })
+ deleteBatchParamThresholdApi: ids => deleteAction('/mdc/mdcEquipmentThreshold/deleteBatch', { ids }),
+ // -------------------------------------鎬绘帶杞﹂棿鐪嬫澘椤甸潰--------------------------------------------
+ // 鑾峰彇鏄ㄦ棩姒傚喌
+ getYesterdayOverviewApi: () => getAction('/mdc/largeScreen/yesterdayOverview'),
+ // 鑾峰彇浠婃棩鐢熶骇杩涘害
+ getTodayProductionProgressApi: () => getAction('/mdc/largeScreen/todayProductionSchedule'),
+ // 鑾峰彇浠婃棩浜у搧鍚堟牸鐜�
+ getTodayProductPassRateApi: () => getAction('/mdc/largeScreen/todayProductionPassRate'),
+ // 鑾峰彇浠婃棩鐝粍瀹屾垚閲�
+ getTeamCompletionCountApi: () => getAction('/mdc/largeScreen/todayClazzCompletionCount'),
+ // 鑾峰彇浠婃棩璁惧宸ヤ綔鏁堢巼
+ getTodayEquipmentWorkEfficiencyApi: () => getAction('/mdc/largeScreen/todayEquipmentRate'),
+ // 鑾峰彇鏈堣澶囧埄鐢ㄧ巼
+ getMonthEquipmentUtilizationRateApi: () => getAction('/mdc/largeScreen/monthEquipmentUtilizationRate'),
+ // 鑾峰彇浜х嚎鍒楄〃
+ getProductionLineListApi: () => getAction('/mdc/largeScreen/productionList'),
+ // -------------------------------------鍒嗘帶杞﹂棿鐪嬫澘椤甸潰--------------------------------------------
+ // 鑾峰彇璁惧鐘舵��
+ getEquipmentStatusApi: productionId => getAction('/mdc/subLargeScreen/equipmentStatus', { productionId }),
+ // 鑾峰彇褰撴棩鐢熶骇杩涘害
+ getTodayProductionPlanApi: productionId => getAction('/mdc/subLargeScreen/todayProductionProgress', { productionId })
}
\ No newline at end of file
diff --git a/src/assets/page/subControlWorkshopSignage/5016-7433.png b/src/assets/page/subControlWorkshopSignage/5016-7433.png
new file mode 100644
index 0000000..a4fcb14
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5016-7433.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5016-7434.png b/src/assets/page/subControlWorkshopSignage/5016-7434.png
new file mode 100644
index 0000000..a4fcb14
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5016-7434.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5016-7435.png b/src/assets/page/subControlWorkshopSignage/5016-7435.png
new file mode 100644
index 0000000..a4fcb14
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5016-7435.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5016-7436.png b/src/assets/page/subControlWorkshopSignage/5016-7436.png
new file mode 100644
index 0000000..07f498e
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5016-7436.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5016-7437.png b/src/assets/page/subControlWorkshopSignage/5016-7437.png
new file mode 100644
index 0000000..07f498e
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5016-7437.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5016-7438.png b/src/assets/page/subControlWorkshopSignage/5016-7438.png
new file mode 100644
index 0000000..07f498e
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5016-7438.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5029-7010.png b/src/assets/page/subControlWorkshopSignage/5029-7010.png
new file mode 100644
index 0000000..9de09ca
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5029-7010.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7016.png b/src/assets/page/subControlWorkshopSignage/5045-7016.png
new file mode 100644
index 0000000..c1be529
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7016.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7018.png b/src/assets/page/subControlWorkshopSignage/5045-7018.png
new file mode 100644
index 0000000..c6fcbb4
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7018.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7025.png b/src/assets/page/subControlWorkshopSignage/5045-7025.png
new file mode 100644
index 0000000..a72c80b
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7025.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7026.png b/src/assets/page/subControlWorkshopSignage/5045-7026.png
new file mode 100644
index 0000000..a72c80b
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7026.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7027.png b/src/assets/page/subControlWorkshopSignage/5045-7027.png
new file mode 100644
index 0000000..7016059
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7027.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7028.png b/src/assets/page/subControlWorkshopSignage/5045-7028.png
new file mode 100644
index 0000000..2730ad0
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7028.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7029.png b/src/assets/page/subControlWorkshopSignage/5045-7029.png
new file mode 100644
index 0000000..7016059
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7029.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7030.png b/src/assets/page/subControlWorkshopSignage/5045-7030.png
new file mode 100644
index 0000000..9c04eb9
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7030.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7071.png b/src/assets/page/subControlWorkshopSignage/5045-7071.png
new file mode 100644
index 0000000..7016059
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7071.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7072.png b/src/assets/page/subControlWorkshopSignage/5045-7072.png
new file mode 100644
index 0000000..7016059
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7072.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7076.png b/src/assets/page/subControlWorkshopSignage/5045-7076.png
new file mode 100644
index 0000000..a3b0922
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7076.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7101.png b/src/assets/page/subControlWorkshopSignage/5045-7101.png
new file mode 100644
index 0000000..7cc3854
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7101.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7102.png b/src/assets/page/subControlWorkshopSignage/5045-7102.png
new file mode 100644
index 0000000..7cc3854
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7102.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7104.png b/src/assets/page/subControlWorkshopSignage/5045-7104.png
new file mode 100644
index 0000000..07f498e
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7104.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7105.png b/src/assets/page/subControlWorkshopSignage/5045-7105.png
new file mode 100644
index 0000000..07f498e
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7105.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7108.png b/src/assets/page/subControlWorkshopSignage/5045-7108.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7108.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7109.png b/src/assets/page/subControlWorkshopSignage/5045-7109.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7109.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7110.png b/src/assets/page/subControlWorkshopSignage/5045-7110.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7110.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7111.png b/src/assets/page/subControlWorkshopSignage/5045-7111.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7111.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7112.png b/src/assets/page/subControlWorkshopSignage/5045-7112.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7112.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7113.png b/src/assets/page/subControlWorkshopSignage/5045-7113.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7113.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7114.png b/src/assets/page/subControlWorkshopSignage/5045-7114.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7114.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7115.png b/src/assets/page/subControlWorkshopSignage/5045-7115.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7115.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7116.png b/src/assets/page/subControlWorkshopSignage/5045-7116.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7116.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7117.png b/src/assets/page/subControlWorkshopSignage/5045-7117.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7117.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7118.png b/src/assets/page/subControlWorkshopSignage/5045-7118.png
new file mode 100644
index 0000000..441ea5d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7118.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7119.png b/src/assets/page/subControlWorkshopSignage/5045-7119.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7119.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7120.png b/src/assets/page/subControlWorkshopSignage/5045-7120.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7120.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7121.png b/src/assets/page/subControlWorkshopSignage/5045-7121.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7121.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7122.png b/src/assets/page/subControlWorkshopSignage/5045-7122.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7122.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7123.png b/src/assets/page/subControlWorkshopSignage/5045-7123.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7123.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7124.png b/src/assets/page/subControlWorkshopSignage/5045-7124.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7124.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7125.png b/src/assets/page/subControlWorkshopSignage/5045-7125.png
new file mode 100644
index 0000000..b9ad2e3
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7125.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7157.png b/src/assets/page/subControlWorkshopSignage/5045-7157.png
new file mode 100644
index 0000000..70bd975
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7157.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5045-7815.png b/src/assets/page/subControlWorkshopSignage/5045-7815.png
new file mode 100644
index 0000000..b6905cb
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5045-7815.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/5068-7005.png b/src/assets/page/subControlWorkshopSignage/5068-7005.png
new file mode 100644
index 0000000..fd44378
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/5068-7005.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/green.png b/src/assets/page/subControlWorkshopSignage/green.png
new file mode 100644
index 0000000..015216d
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/green.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/grey.png b/src/assets/page/subControlWorkshopSignage/grey.png
new file mode 100644
index 0000000..4bc2238
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/grey.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/red.png b/src/assets/page/subControlWorkshopSignage/red.png
new file mode 100644
index 0000000..c2e676b
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/red.png
Binary files differ
diff --git a/src/assets/page/subControlWorkshopSignage/yellow.png b/src/assets/page/subControlWorkshopSignage/yellow.png
new file mode 100644
index 0000000..418be53
--- /dev/null
+++ b/src/assets/page/subControlWorkshopSignage/yellow.png
Binary files differ
diff --git a/src/assets/yt_background.png b/src/assets/yt_background.png
new file mode 100644
index 0000000..c0fa99f
--- /dev/null
+++ b/src/assets/yt_background.png
Binary files differ
diff --git a/src/config/router.config.js b/src/config/router.config.js
index cafae25..a45e4ff 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -49,7 +49,7 @@
path: 'alteration',
name: 'alteration',
component: () => import(/* webpackChunkName: "user" */ '@/views/user/alteration/Alteration')
- },
+ }
]
},
{
@@ -63,7 +63,7 @@
path: 'login',
name: 'oauth2-app-login',
component: () => import(/* webpackChunkName: "oauth2-app.login" */ '@/views/user/oauth2/OAuth2Login')
- },
+ }
]
},
@@ -80,16 +80,16 @@
]
},
{
- path:'/MasterControlWorkshopSignage',
- component:()=>import('@/views/mdc/base/MasterControlWorkshopSignage.vue')
+ path: '/MasterControlWorkshopSignage',
+ component: () => import('@/views/mdc/base/MasterControlWorkshopSignage.vue')
},
{
- path:'/SubControlWorkshopSignage/:id',
- component:()=>import('@/views/mdc/base/SubControlWorkshopSignage.vue')
+ path: '/SubControlWorkshopSignage',
+ component: () => import('@/views/mdc/base/SubControlWorkshopSignage.vue')
},
{
path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
- },
+ }
]
diff --git a/src/views/mdc/base/MasterControlWorkshopSignage.vue b/src/views/mdc/base/MasterControlWorkshopSignage.vue
index 30196c6..8ee1d78 100644
--- a/src/views/mdc/base/MasterControlWorkshopSignage.vue
+++ b/src/views/mdc/base/MasterControlWorkshopSignage.vue
@@ -29,22 +29,32 @@
<div>鏁板瓧鍖栬溅闂存櫤鑳界鐞嗙郴缁�</div>
</div>
<div class="workshop-bg">
- <div class="navigate-container" style="left: 5%;">
- <div @click="navigateTo(item)" v-for="(item,index) in navigateList" :key="index" class="navigate-item">
- <template v-if="index<5">
- <div :style="{backgroundColor:item.backgroundColor}" class="navigate-item-index">{{index+1}}</div>
- <div :style="{backgroundColor:item.backgroundColor}" class="navigate-item-label">
- {{item.label}}
+ <div class="navigate-container" style="top:0;left: 5%;">
+ <div @click="navigateTo(item)" v-for="item in productionLineList" :key="item.id"
+ class="navigate-item">
+ <template v-if="item.productionOrder<5">
+ <div :style="{backgroundColor:productionLineBackgroundColorList[item.productionOrder%4]}"
+ class="navigate-item-index">
+ {{item.productionOrder+1}}
+ </div>
+ <div :style="{backgroundColor:productionLineBackgroundColorList[item.productionOrder%4]}"
+ class="navigate-item-label">
+ {{item.productionName}}
</div>
</template>
</div>
</div>
- <div class="navigate-container" style="bottom:5%;right: 5%;">
- <div @click="navigateTo(item)" v-for="(item,index) in navigateList" :key="index" class="navigate-item">
- <template v-if="index>=5">
- <div :style="{backgroundColor:item.backgroundColor}" class="navigate-item-index">{{index+1}}</div>
- <div :style="{backgroundColor:item.backgroundColor}" class="navigate-item-label">
- {{item.label}}
+ <div class="navigate-container" style="bottom:0;right: 5%;">
+ <div @click="navigateTo(item)" v-for="item in productionLineList" :key="item.id"
+ class="navigate-item">
+ <template v-if="item.productionOrder>=5">
+ <div :style="{backgroundColor:productionLineBackgroundColorList[item.productionOrder%4]}"
+ class="navigate-item-index">
+ {{item.productionOrder+1}}
+ </div>
+ <div :style="{backgroundColor:productionLineBackgroundColorList[item.productionOrder%4]}"
+ class="navigate-item-label">
+ {{item.productionName}}
</div>
</template>
</div>
@@ -80,6 +90,7 @@
<script>
import * as echarts from 'echarts'
+ import api from '@/api/mdc'
export default {
name: 'MasterControlWorkshopSignage',
@@ -90,56 +101,15 @@
firstEnterDevicePixelRatio: null,
currentDevicePixelRatio: null,
leftColChart1: '',
+ leftColChart1Data: '',
leftColChart2: '',
+ leftColChart2Data: '',
leftColChart3: '',
+ leftColChart3Data: '',
leftColChart4: '',
- navigateList: [
- {
- label: '1024鍚庣鍔犲伐绾�',
- id: '1',
- backgroundColor: '#0000FF'
- },
- {
- label: '1024鍓嶇鍔犲伐绾�',
- id: '2',
- backgroundColor: '#FF8E00'
- },
- {
- label: '鍓嶆墭鏋跺姞宸ョ嚎',
- id: '3',
- backgroundColor: '#DE1439'
- },
- {
- label: '80浼犲姩澹充綋鍔犲伐绾�',
- id: '4',
- backgroundColor: '#006500'
- },
- {
- label: '80鍑忛�熷櫒澹充綋鍔犲伐绾�',
- id: '5',
- backgroundColor: '#0000FF'
- },
- {
- label: '绠变綋鍔犲伐绾�',
- id: '6',
- backgroundColor: '#FF8E00'
- },
- {
- label: '宸�熷櫒杞存壙搴у姞宸ョ嚎',
- id: '7',
- backgroundColor: '#DE1439'
- },
- {
- label: '鍒跺姩鍣ㄦ椿濉炲姞宸ョ嚎',
- id: '8',
- backgroundColor: '#006500'
- },
- {
- label: '涓皬浠跺姞宸ョ嚎',
- id: '9',
- backgroundColor: '#0000FF'
- }
- ],
+ leftColChart4Data: '',
+ productionLineList: [],
+ productionLineBackgroundColorList: ['#0000FF', '#FF8E00', '#DE1439', '#006500'],
switchList: [
{
label: 'MES',
@@ -165,13 +135,16 @@
rightColChart1: '',
rightColChart2: '',
rightColChart3: '',
+ rightColChart2And3Data: '',
rightColChart4: '',
+ rightColChart4Data: '',
rightColChart4CarouselTime: null
}
},
mounted() {
this.firstEnterDevicePixelRatio = window.devicePixelRatio
window.addEventListener('resize', this.handleWindowResize)
+ this.getProductionListByApi()
this.getChartDataByApi()
},
beforeDestroy() {
@@ -179,35 +152,82 @@
if (this.rightColChart4CarouselTime) clearInterval(this.rightColChart4CarouselTime)
},
methods: {
+ getProductionListByApi() {
+ api.getProductionLineListApi()
+ .then(res => {
+ if (res.success) this.productionLineList = res.result
+ })
+ },
+
getChartDataByApi() {
this.getLeftColChart1DataByApi()
this.getLeftColChart2DataByApi()
this.getLeftColChart3DataByApi()
this.getLeftColChart4DataByApi()
// this.getRightColChart1DataByApi()
- this.getRightColChart2DataByApi()
- this.getRightColChart3DataByApi()
+ this.getRightColChart2And3DataByApi()
this.getRightColChart4DataByApi()
},
getLeftColChart1DataByApi() {
this.leftColChart1 = this.$echarts.init(document.getElementById('left-col-chart1'))
- this.drawLeftColChart1()
+ api.getYesterdayOverviewApi()
+ .then(res => {
+ // console.log('res', res)
+ if (res.success) {
+ this.leftColChart1Data = [
+ {
+ 'name': '浜у搧鍚堟牸鐜�',
+ 'count': res.result.passRate ? res.result.passRate : 0
+ },
+ {
+ 'name': '璁惧鍒╃敤鐜�',
+ 'count': res.result.utilizationRate ? res.result.utilizationRate : 0
+ },
+ {
+ 'name': '璁″垝瀹屾垚鐜�',
+ 'count': res.result.planCompleteRate ? res.result.planCompleteRate : 0
+ }
+ ]
+ this.drawLeftColChart1()
+ }
+ })
},
getLeftColChart2DataByApi() {
this.leftColChart2 = this.$echarts.init(document.getElementById('left-col-chart2'))
- this.drawLeftColChart2()
+ api.getTodayProductionProgressApi()
+ .then(res => {
+ // console.log('res', res)
+ if (res.success) {
+ this.leftColChart2Data = res.result
+ this.drawLeftColChart2()
+ }
+ })
},
getLeftColChart3DataByApi() {
this.leftColChart3 = this.$echarts.init(document.getElementById('left-col-chart3'))
- this.drawLeftColChart3()
+ api.getTodayProductPassRateApi()
+ .then(res => {
+ // console.log('res', res)
+ if (res.success) {
+ this.leftColChart3Data = res.result
+ this.drawLeftColChart3()
+ }
+ })
},
getLeftColChart4DataByApi() {
this.leftColChart4 = this.$echarts.init(document.getElementById('left-col-chart4'))
- this.drawLeftColChart4()
+ api.getTeamCompletionCountApi()
+ .then(res => {
+ // console.log('res', res)
+ if (res.success) {
+ this.leftColChart4Data = res.result
+ this.drawLeftColChart4()
+ }
+ })
},
getRightColChart1DataByApi() {
@@ -215,46 +235,34 @@
this.drawRightColChart1()
},
- getRightColChart2DataByApi() {
+ getRightColChart2And3DataByApi() {
this.rightColChart2 = this.$echarts.init(document.getElementById('right-col-chart2'))
- this.drawRightColChart2()
- },
-
- getRightColChart3DataByApi() {
this.rightColChart3 = this.$echarts.init(document.getElementById('right-col-chart3'))
- this.drawRightColChart3()
+ api.getTodayEquipmentWorkEfficiencyApi()
+ .then(res => {
+ // console.log('res', res)
+ if (res.success) {
+ this.rightColChart2And3Data = res.result
+ this.drawRightColChart2()
+ this.drawRightColChart3()
+ }
+ })
},
getRightColChart4DataByApi() {
this.rightColChart4 = this.$echarts.init(document.getElementById('right-col-chart4'))
- this.drawRightColChart4()
+ api.getMonthEquipmentUtilizationRateApi()
+ .then(res => {
+ // console.log('res', res)
+ if (res.success) {
+ this.rightColChart4Data = res.result
+ this.drawRightColChart4()
+ }
+ })
},
/* 缁樺埗宸︿晶绗竴涓浘琛� */
drawLeftColChart1() {
- const data = [
- {
- 'number': null,
- 'name': '浜у搧鍚堟牸鐜�',
- 'count': 1,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': null,
- 'name': '璁惧鍒╃敤鐜�',
- 'count': 0.89,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': null,
- 'name': '璁″垝瀹屾垚鐜�',
- 'count': 0.95,
- 'planCount': null,
- 'rateCount': null
- }
- ]
const yAxisData = []
const option = {
radar: [
@@ -373,7 +381,7 @@
]
}
- data.forEach((item, index) => {
+ this.leftColChart1Data.forEach((item, index) => {
yAxisData.push(parseFloat(item.count * 100 > 100 ? 100 : item.count * 100))
option.radar[1].indicator[index].num = item.count * 100 > 100 ? 100 : item.count * 100
})
@@ -383,101 +391,22 @@
/* 缁樺埗宸︿晶绗簩涓浘琛� */
drawLeftColChart2() {
- const data1 = [
- {
- 'number': 'A_1',
- 'name': '鍓嶇鍓�',
- 'count': 190
- },
- {
- 'number': 'A_2',
- 'name': '1024鍚庣',
- 'count': 180
- },
- {
- 'number': 'A_3',
- 'name': '宸�熷櫒',
- 'count': 200
- },
- {
- 'number': 'A_4',
- 'name': '杞存壙搴�',
- 'count': 100
- },
- {
- 'number': 'A_5',
- 'name': '80鍑�',
- 'count': 200
- },
- {
- 'number': 'A_6',
- 'name': '80浼�',
- 'count': 90
- },
- {
- 'number': 'A_7',
- 'name': '1024鍓�',
- 'count': 200
- }
- ]
- const data2 = [
- {
- 'number': 'A_1',
- 'name': '鍓嶇鍓�',
- 'count': 165
- },
- {
- 'number': 'A_2',
- 'name': '1024鍚庣',
- 'count': 166
- },
- {
- 'number': 'A_3',
- 'name': '宸�熷櫒',
- 'count': 167
- },
- {
- 'number': 'A_4',
- 'name': '杞存壙搴�',
- 'count': 90
- },
- {
- 'number': 'A_5',
- 'name': '80鍑�',
- 'count': 100
- },
- {
- 'number': 'A_6',
- 'name': '80浼�',
- 'count': 55
- },
- {
- 'number': 'A_7',
- 'name': '1024鍓�',
- 'count': 171
- }
- ]
const xAxisData = []
const seriesData1 = []
const seriesData2 = []
- data1.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
- seriesData1.push({
- value: item.count == null ? '' : item.count,
- hostType: (item.number == null ? '' : item.number)
- })
- })
- data2.forEach(item => {
- seriesData2.push({
- value: item.count == null ? '' : item.count,
- hostType: (item.number == null ? '' : item.number)
- })
+ this.leftColChart2Data.forEach(item => {
+ xAxisData.push(item.productName == null ? '' : item.productName)
+ seriesData1.push({ value: item.planCount == null ? '' : item.planCount })
+ seriesData2.push({ value: item.completionCount == null ? '' : item.completionCount })
})
const option = {
tooltip: {
show: true,
- trigger: 'item',
- formatter: params => `${params.name}锛�${params.value}浠禶
+ trigger: 'axis',
+ formatter: params => {
+ // console.log('params', params)
+ return params[0].name + '<br>' + `${params[0].seriesName}锛�${params[0].value}浠禶 + '<br>' + `${params[1].seriesName}锛�${params[1].value}浠禶
+ }
},
legend: {
show: false,
@@ -544,7 +473,7 @@
},
series: [
{
- name: '鍒╃敤鐜�',
+ name: '璁″垝閲�',
type: 'bar',
barWidth: '35%',//鏌卞浘瀹藉害
data: [],
@@ -579,7 +508,7 @@
}
},
{
- name: '鍒╃敤鐜�',
+ name: '瀹屾垚閲�',
type: 'bar',
barWidth: '35%',//鏌卞浘瀹藉害
data: [],
@@ -675,11 +604,10 @@
]
const xAxisData = []
const seriesData = []
- data.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
+ this.leftColChart3Data.forEach(item => {
+ xAxisData.push(item.productionName == null ? '' : item.productionName)
seriesData.push({
- value: this.toDecimal2NoZero(((item.count == null ? '' : item.count) * 100) > 100 ? 100 : (((item.count == null ? '' : item.count) * 100))),
- hostType: (item.number == null ? '' : item.number)
+ value: this.toDecimal2NoZero(((item.passRate == null ? '' : item.passRate) * 100) > 100 ? 100 : (((item.passRate == null ? '' : item.passRate) * 100)))
})
})
const option = {
@@ -884,65 +812,11 @@
/* 缁樺埗宸︿晶绗洓涓浘琛� */
drawLeftColChart4() {
- const data = [
- {
- 'number': 'A_1',
- 'name': '鍓嶇鐝�',
- 'count': 54,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_2',
- 'name': '鍚庣鐝�',
- 'count': 55,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_3',
- 'name': '80浼犵彮',
- 'count': 56,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_4',
- 'name': '80鍑忕彮',
- 'count': 57,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_5',
- 'name': '鎵樻灦鐝�',
- 'count': 58,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_6',
- 'name': '杞存壙搴曞骇鐝�',
- 'count': 59,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_7',
- 'name': '宸�熷櫒鐝�',
- 'count': 90,
- 'planCount': null,
- 'rateCount': null
- }
- ]
const xAxisData = []
const seriesData = []
- data.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
- seriesData.push({
- value: item.count == null ? '' : item.count,
- hostType: (item.number == null ? '' : item.number)
- })
+ this.leftColChart4Data.forEach(item => {
+ xAxisData.push(item.clazz == null ? '' : item.clazz)
+ seriesData.push({ value: item.completionCount == null ? '' : item.completionCount })
})
const option = {
tooltip: {
@@ -1376,12 +1250,9 @@
]
const xAxisData = []
const seriesData = []
- data.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
- seriesData.push({
- value: this.toDecimal2NoZero(((item.count == null ? '' : item.count) * 100) > 100 ? 100 : (((item.count == null ? '' : item.count) * 100))),
- hostType: (item.number == null ? '' : item.number)
- })
+ this.rightColChart2And3Data.forEach(item => {
+ xAxisData.push(item.equipmentName == null ? '' : item.equipmentName)
+ seriesData.push({ value: item.openRate })
})
const option = {
tooltip: {
@@ -1659,12 +1530,9 @@
]
const xAxisData = []
const seriesData = []
- data.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
- seriesData.push({
- value: this.toDecimal2NoZero(((item.count == null ? '' : item.count) * 100) > 100 ? 100 : (((item.count == null ? '' : item.count) * 100))),
- hostType: (item.number == null ? '' : item.number)
- })
+ this.rightColChart2And3Data.forEach(item => {
+ xAxisData.push(item.equipmentName == null ? '' : item.equipmentName)
+ seriesData.push({ value: item.utilizationRate })
})
const option = {
tooltip: {
@@ -2111,12 +1979,9 @@
]
)
]
- data.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
- seriesData.push({
- value: this.toDecimal2NoZero(((item.count == null ? '' : item.count) * 100) > 100 ? 100 : (((item.count == null ? '' : item.count) * 100))),
- hostType: (item.number == null ? '' : item.number)
- })
+ this.rightColChart4Data.forEach(item => {
+ xAxisData.push(item.date == null ? '' : item.date)
+ seriesData.push({ value: item.utilizationRate })
})
const option = {
tooltip: {
@@ -2246,7 +2111,14 @@
},
navigateTo(record) {
- const url = this.$router.resolve(`/SubControlWorkshopSignage/${record.id}`).href
+ const url = this.$router.resolve({
+ path: '/SubControlWorkshopSignage',
+ query: {
+ productionId: record.id,
+ productionName: record.productionName,
+ productionOrder: record.productionOrder + 1
+ }
+ }).href
window.open(url, '_blank')
},
@@ -2321,7 +2193,7 @@
.workshop-bg {
position: relative;
height: 60%;
- background-image: url("../../../assets/yt_background.jpg");
+ background-image: url("../../../assets/yt_background.png");
background-size: 100% 100%;
background-repeat: no-repeat;
diff --git a/src/views/mdc/base/SubControlWorkshopSignage.vue b/src/views/mdc/base/SubControlWorkshopSignage.vue
index 45ad472..da2778c 100644
--- a/src/views/mdc/base/SubControlWorkshopSignage.vue
+++ b/src/views/mdc/base/SubControlWorkshopSignage.vue
@@ -2,8 +2,8 @@
<div class="full-screen">
<div class="page-title">
- <div style="margin-right: 10vw">{{$route.params.id}}#</div>
- <div>{{getSubControlSignageName}}</div>
+ <div style="margin-right: 10vw">{{currentProductionInfo.productionOrder}}#</div>
+ <div>{{currentProductionInfo.productionName}}</div>
</div>
<table class="plan-table">
@@ -36,30 +36,45 @@
<tbody>
<tr v-for="(item,index) in todayProductionPlanList" :key="index">
- <td colspan="2">{{item.machineId}}</td>
- <td colspan="2">{{item.productionName}}</td>
+ <td colspan="2">{{item.equipmentId}}</td>
+ <td colspan="2">{{item.equipmentName}}</td>
<a-tooltip :destroyTooltipOnHide="true" placement="topRight" @mouseenter="mouseEnterItem">
<template slot="title">
- <span style="font-size: 1vw">{{item.partCode}}</span>
+ <span style="font-size: 1vw">{{item.productNo}}</span>
</template>
- <td colspan="2">{{item.partCode}}</td>
+ <td colspan="2">{{item.productNo}}</td>
</a-tooltip>
- <td colspan="2">{{item.partName}}</td>
- <td>{{item.planQuantity}}</td>
- <td>{{item.finishedQuantity}}</td>
- <td>{{item.qualifiedQuantity}}</td>
- <td>{{item.finishedQuantity?(item.qualifiedQuantity/item.finishedQuantity)*100+'%':''}}</td>
- <td colspan="2">{{item.processNum}}</td>
- <td colspan="2">{{item.orderNum}}</td>
- <td>{{item.groupName}}</td>
+ <td colspan="2">{{item.productName}}</td>
+ <td>{{item.planCount}}</td>
+ <td>{{item.completionCount}}</td>
+ <td>{{item.qualifiedCount}}</td>
+ <td>{{item.passRate+'%'}}</td>
+ <td colspan="2">{{item.processRoute}}</td>
+ <td colspan="2">{{item.orderId}}</td>
+ <td>{{item.clazz}}</td>
</tr>
</tbody>
</table>
- <div class="line-bg"></div>
+ <div class="device-container">
+ <div class="single-device-container" v-for="item in equipmentStatusList" :key="item.id"
+ :style="{marginRight:isDeviceContinuous(currentProductionInfo.productionOrder)?'':'5%'}">
+ <div class="status-image-container">
+ <img src="@/assets/page/subControlWorkshopSignage/grey.png" v-if="item.oporation===0">
+ <img src="@/assets/page/subControlWorkshopSignage/green.png" v-if="item.oporation===3">
+ <img src="@/assets/page/subControlWorkshopSignage/yellow.png" v-if="item.oporation===2">
+ <img src="@/assets/page/subControlWorkshopSignage/red.png" v-if="item.oporation===22">
+ </div>
+ <div class="device-image-container">
+ <img :src="require('@/assets/page/subControlWorkshopSignage/'+item.equipmentId+'.png')">
+ </div>1
+ <div class="device-name">
+ {{item.equipmentName}}
+ </div>
+ </div>
+ </div>
<div class="bottom-container">
-
<div class="alarm-container">
<div class="alarm-title">鎶ヨ淇℃伅</div>
<div class="alarm-content"></div>
@@ -97,12 +112,18 @@
<script>
import moment from 'moment'
+ import api from '@/api/mdc'
export default {
name: 'SubControlWorkshopSignage',
components: {},
data() {
return {
+ currentProductionInfo: {
+ productionId: '',
+ productionName: '',
+ productionOrder: ''
+ },
todayProductionPlanList: [
{
machineId: '5899-8060',
@@ -139,6 +160,24 @@
processNum: '35',
orderNum: '2407103501002',
groupName: '80绠变綋鐝�'
+ }
+ ],
+ equipmentStatusList: [
+ {
+ oporation: 0,
+ equipmentId: '5045-7076'
+ },
+ {
+ oporation: 3,
+ equipmentId: '5068-7005'
+ },
+ {
+ oporation: 22,
+ equipmentId: '5045-7157'
+ },
+ {
+ oporation: 2,
+ equipmentId: '5045-7815'
}
],
toolLife: {
@@ -296,40 +335,13 @@
}
}
},
+ created() {
+ this.currentProductionInfo = Object.assign({}, this.$route.query)
+ console.log('this.currentProductionInfo', this.currentProductionInfo)
+ this.getTodayProductionPlanByApi()
+ this.getEquipmentStatusByApi()
+ },
computed: {
- getSubControlSignageName() {
- let subControlSignageName = ''
- switch (+this.$route.params.id) {
- case 1:
- subControlSignageName = '1024鍚庣鍔犲伐绾�'
- break
- case 2:
- subControlSignageName = '1024鍓嶇鍔犲伐绾�'
- break
- case 3:
- subControlSignageName = '鍓嶆墭鏋跺姞宸ョ嚎'
- break
- case 4:
- subControlSignageName = '80浼犲姩澹冲姞宸ョ嚎'
- break
- case 5:
- subControlSignageName = '80鍑忛�熷櫒澹充綋鍔犲伐绾�'
- break
- case 6:
- subControlSignageName = '绠变綋鍔犲伐绾�'
- break
- case 7:
- subControlSignageName = '宸�熷櫒杞存壙搴у姞宸ョ嚎'
- break
- case 8:
- subControlSignageName = '鍒跺姩鍣ㄦ椿濉炲姞宸ョ嚎'
- break
- case 9:
- subControlSignageName = '涓皬浠跺姞宸ョ嚎'
- break
- }
- return subControlSignageName
- },
getCurrentYear() {
return moment().format('YYYY')
},
@@ -340,10 +352,23 @@
return moment().format('DD')
},
getTotalPlanQuantity() {
- return this.todayProductionPlanList.reduce((sum, item) => sum + item.planQuantity, 0)
+ if (this.todayProductionPlanList.length > 0) return this.todayProductionPlanList.reduce((sum, item) => sum + item.planCount, 0)
+ else return 0
}
},
methods: {
+ getTodayProductionPlanByApi() {
+ api.getTodayProductionPlanApi(this.currentProductionInfo.productionId)
+ .then(res => {
+ if (res.success) this.todayProductionPlanList = res.result
+ })
+ },
+ getEquipmentStatusByApi() {
+ api.getEquipmentStatusApi(this.currentProductionInfo.productionId)
+ .then(res => {
+ if (res.success) this.equipmentStatusList = res.result
+ })
+ },
getToolCurrentLifeDataBgColor(record) {
if (record.currentLife / record.ratedLife > 0.8) {
return '#FF9A10'
@@ -355,6 +380,17 @@
mouseEnterItem(e) {
if (e.target.clientWidth >= e.target.scrollWidth) {
e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢 pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
+ }
+ },
+
+ isDeviceContinuous(productionOrder) {
+ switch (+productionOrder) {
+ case 4:
+ return true
+ case 5:
+ return true
+ default:
+ return false
}
}
}
@@ -406,11 +442,39 @@
}
}
- .line-bg {
- height: 30%;
- background-image: url("../../../assets/1 Line.jpg");
- background-repeat: no-repeat;
- background-size: 100% 100%;
+ .device-container {
+ height: 40%;
+ /*background-image: url("../../../assets/1 Line.jpg");*/
+ /*background-repeat: no-repeat;*/
+ /*background-size: 100% 100%;*/
+ display: flex;
+ justify-content: center;
+
+ .single-device-container {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding-top: 2%;
+
+ .status-image-container {
+ height: 20%;
+ }
+
+ .device-image-container {
+ height: 50%;
+ margin-bottom: 5%;
+ }
+
+ .device-name {
+ height: 10%;
+ font-size: 1vw;
+ }
+ }
+
+ img {
+ height: 100%;
+ }
}
.bottom-container {
diff --git a/vue.config.js b/vue.config.js
index dd1ecae..cf1ad29 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,5 @@
const path = require('path')
-const CompressionPlugin = require("compression-webpack-plugin")
+const CompressionPlugin = require('compression-webpack-plugin')
function resolve(dir) {
return path.join(__dirname, dir)
@@ -42,11 +42,11 @@
//鐢熶骇鐜锛屽紑鍚痡s\css鍘嬬缉
if (process.env.NODE_ENV === 'production') {
- config.plugin('compressionPlugin').use(new CompressionPlugin({
- test: /\.(js|css|less)$/, // 鍖归厤鏂囦欢鍚�
- threshold: 10240, // 瀵硅秴杩�10k鐨勬暟鎹帇缂�
- deleteOriginalAssets: false // 涓嶅垹闄ゆ簮鏂囦欢
- }))
+ config.plugin('compressionPlugin').use(new CompressionPlugin({
+ test: /\.(js|css|less)$/, // 鍖归厤鏂囦欢鍚�
+ threshold: 10240, // 瀵硅秴杩�10k鐨勬暟鎹帇缂�
+ deleteOriginalAssets: false // 涓嶅垹闄ゆ簮鏂囦欢
+ }))
}
// 閰嶇疆 webpack 璇嗗埆 markdown 涓烘櫘閫氱殑鏂囦欢
@@ -62,9 +62,9 @@
.rule('vxe')
.test(/\.js$/)
.include
- .add(resolve('node_modules/vxe-table'))
- .add(resolve('node_modules/vxe-table-plugin-antd'))
- .end()
+ .add(resolve('node_modules/vxe-table'))
+ .add(resolve('node_modules/vxe-table-plugin-antd'))
+ .end()
.use()
.loader('babel-loader')
.end()
@@ -78,15 +78,16 @@
/* less 鍙橀噺瑕嗙洊锛岀敤浜庤嚜瀹氫箟 ant design 涓婚 */
'primary-color': '#1890FF',
'link-color': '#1890FF',
- 'border-radius-base': '4px',
+ 'border-radius-base': '4px'
},
- javascriptEnabled: true,
+ javascriptEnabled: true
}
}
},
devServer: {
port: 3000,
+ open: true,
// hot: true,
// disableHostCheck: true,
// overlay: {
@@ -97,21 +98,21 @@
// 'Access-Control-Allow-Origin': '*',
// },
proxy: {
- /* '/api': {
- target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API鎺ュ彛绯荤粺
- ws: false,
- changeOrigin: true,
- pathRewrite: {
- '/jeecg-boot': '' //榛樿鎵�鏈夎姹傞兘鍔犱簡jeecg-boot鍓嶇紑锛岄渶瑕佸幓鎺�
- }
- },*/
+ /* '/api': {
+ target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API鎺ュ彛绯荤粺
+ ws: false,
+ changeOrigin: true,
+ pathRewrite: {
+ '/jeecg-boot': '' //榛樿鎵�鏈夎姹傞兘鍔犱簡jeecg-boot鍓嶇紑锛岄渶瑕佸幓鎺�
+ }
+ },*/
/* 娉ㄦ剰锛歫eecgboot鍓嶇鍋氫簡鏀归�狅紝姝ゅ涓嶉渶瑕侀厤缃法鍩熷拰鍚庡彴鎺ュ彛锛堝彧闇�瑕佹敼.env鐩稿叧閰嶇疆鏂囦欢鍗冲彲锛�
issues/3462 寰堝浜烘澶勫仛浜嗛厤缃紝瀵艰嚧鍒锋柊鍓嶇404闂锛岃涓�瀹氭敞鎰�*/
'/jeecg-boot': {
target: 'http://localhost:8080',
ws: false,
changeOrigin: true
- },
+ }
}
},
--
Gitblit v1.9.3