diff --git a/src/components/header.vue b/src/components/header.vue index 26a5874..85309ac 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -93,11 +93,12 @@ header // font-family "PangMenZhengDao" font-family "YouSheBiaoTiHei" font-size 50px - line-height 100px + line-height 88px color #fff font-weight lighter text-align center letter-spacing 5px + padding-left 5px text-shadow 0 8px 8px rgba(0,0,0,0.30) .data_box position absolute @@ -113,12 +114,12 @@ header color #fff .tiem_item float left - font-size 32px + font-size 20px line-height 37px color #fff .colon float left - font-size 32px + font-size 20px line-height 37px color #fff diff --git a/src/config/getData2.js b/src/config/getData2.js index a60290c..e74984b 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -9,3 +9,5 @@ export const kilnDetail = () => post('api/cockpit/kilnDetail', {}) export const screenTableData = () => post('api/cockpit/screenTableData', {}) // 窑看板 export const klineInfo = () => post('api/cockpit/klineInfo', {}) +// 料仓监控 +export const queryliaocang = () => post('api/hand/queryliaocang', {}) diff --git a/src/config/mork2.js b/src/config/mork2.js index d9aa75b..90e3c9e 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -2533,3 +2533,7 @@ export const klineInfo = () => { } return res } +export const queryliaocang = () => { + let res = [{point_name: 'LC16'}] + return res +} diff --git a/src/images/screen1/item_10.png b/src/images/screen1/item_10.png new file mode 100644 index 0000000..73e66e4 Binary files /dev/null and b/src/images/screen1/item_10.png differ diff --git a/src/images/screen1/item_11.png b/src/images/screen1/item_11.png new file mode 100644 index 0000000..b438a92 Binary files /dev/null and b/src/images/screen1/item_11.png differ diff --git a/src/images/screen1/item_12.png b/src/images/screen1/item_12.png new file mode 100644 index 0000000..84c2a92 Binary files /dev/null and b/src/images/screen1/item_12.png differ diff --git a/src/images/screen1/item_8.png b/src/images/screen1/item_8.png new file mode 100644 index 0000000..ea3fb57 Binary files /dev/null and b/src/images/screen1/item_8.png differ diff --git a/src/images/screen1/item_9.png b/src/images/screen1/item_9.png new file mode 100644 index 0000000..fce7929 Binary files /dev/null and b/src/images/screen1/item_9.png differ diff --git a/src/pages/modules/board/StockBin.vue b/src/pages/modules/board/StockBin.vue index dfc7545..4c90015 100644 --- a/src/pages/modules/board/StockBin.vue +++ b/src/pages/modules/board/StockBin.vue @@ -1,52 +1,68 @@