diff --git a/.env.prod b/.env.prod
index 1c1f7a14..94c37a72 100644
--- a/.env.prod
+++ b/.env.prod
@@ -21,7 +21,7 @@ VUE_APP_BASE_API = ''
PUBLIC_PATH = ''
# ws地址
-WSURL = '100.64.0.45:48080'
+VUE_APP_WS_API = 'ws://100.64.0.45:48080'
# 二级部署路径
VUE_APP_APP_NAME ='yudao-admin'
diff --git a/src/views/dashboard/coldDashboard/components/dataBox.vue b/src/views/dashboard/coldDashboard/components/dataBox.vue
index 5dfdf9e7..d582de3f 100644
--- a/src/views/dashboard/coldDashboard/components/dataBox.vue
+++ b/src/views/dashboard/coldDashboard/components/dataBox.vue
@@ -16,36 +16,36 @@
- 213,452片
+ {{msgData?.cut || '-'}}片
- 预计切割片数 -
- 95.32%
+ {{msgData?.allRatio ? msgData?.allRatio*100:'-'}}%
- 综合面积良品率 -
掰边后片数:
- 23,452片
+ {{msgData?.bai || '-'}}片
掰边后良品率:
- 98%
+ {{msgData?.baiRatio ? msgData?.baiRatio*100 : '-'}}%
顶板后片数:
- 23,452片
+ {{msgData?.ding || '-'}}片
顶板后良品率:
- 98%
+ {{msgData?.dingRatio ? msgData?.dingRatio*100 : '-'}}%
下片片数:
- 23,452片
+ {{msgData?.xia || '-'}}片
下片良品率:
- 98%
+ {{msgData?.xiaRatio ? msgData?.xiaRatio*100 : '-'}}%
@@ -61,6 +61,10 @@ export default {
position:{
type: String,
default: ''
+ },
+ msgData: {
+ type: Object,
+ default: () => {}
}
},
data() {
diff --git a/src/views/dashboard/coldDashboard/index.vue b/src/views/dashboard/coldDashboard/index.vue
index 814f9299..2a8cd01a 100644
--- a/src/views/dashboard/coldDashboard/index.vue
+++ b/src/views/dashboard/coldDashboard/index.vue
@@ -5,10 +5,10 @@
:isFullScreen="isFullScreen"
@screenfullChange="screenfullChange"
topTitle="自贡冷端数据看板" />
-