From 36756fb82257b55798eb16a9c12c96edbbc9b170 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 15 Jul 2024 13:52:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/reset.css | 4 + src/assets/images/screen1/item_8.png | Bin 0 -> 7442 bytes src/assets/js/mork2.js | 3 +- src/pages/shunhe/LogisticsProcess/index.vue | 131 +++++++++++++++----- src/pages/shunhe/ProdCount.vue | 4 +- src/pages/shunhe/StorageMonitor.vue | 2 +- 6 files changed, 107 insertions(+), 37 deletions(-) create mode 100644 src/assets/images/screen1/item_8.png diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index 5ba0457..1f56299 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -132,3 +132,7 @@ div, p { width: 100%; height: 100%; } +.jcse { + justify-content: space-evenly !important; + -webkit-box-pack: space-evenly !important; +} \ No newline at end of file diff --git a/src/assets/images/screen1/item_8.png b/src/assets/images/screen1/item_8.png new file mode 100644 index 0000000000000000000000000000000000000000..1f9875283328e2e267d465f3cb1259a1d423cd22 GIT binary patch literal 7442 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 Qg8%>k07*qoM6N<$g7pTZ2mk;8 literal 0 HcmV?d00001 diff --git a/src/assets/js/mork2.js b/src/assets/js/mork2.js index dbaade3..e110797 100644 --- a/src/assets/js/mork2.js +++ b/src/assets/js/mork2.js @@ -91,7 +91,8 @@ export const homepageData = () => { 'materialCode': 'WGBMMC00002MGL8343P10-K23Z006', 'completed': '3.65吨' } - ] + ], + mainEquipmentStatus: [{devicename: '压机1', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机2', status: '暂停', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机3', status: '停机', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机4', status: '故障', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机5', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机1', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机2', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机3', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机4', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机5', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机1', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机2', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机3', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机4', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机5', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机1', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机2', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机3', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机4', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}, {devicename: '压机5', status: '运行', material: '镁碳砖DLMT-1025/023Z003'}] } return res } diff --git a/src/pages/shunhe/LogisticsProcess/index.vue b/src/pages/shunhe/LogisticsProcess/index.vue index ab3267e..63ed0c3 100644 --- a/src/pages/shunhe/LogisticsProcess/index.vue +++ b/src/pages/shunhe/LogisticsProcess/index.vue @@ -9,7 +9,7 @@
-
+ +
+
主要设备运行情况
+
+
+
+
    +
  • 生产设备
    • +
  • 运行情况
    • +
  • 当前生产物料名称
    • +
+
+ +
    +
  • +
    {{e.devicename}}
    +
    +
    +
    {{e.status}}
    +
    +
    {{e.material}}
    +
    • +
+ +
+
@@ -77,26 +103,16 @@
-
+
- 静置中 + 当前重量
{{stand.onStanding}} 吨
-
-
- - 已完成 -
-
- {{stand.completed}} - 吨 -
-
@@ -144,7 +160,7 @@
- 计划量 + 入窑量
{{dry.planned}} @@ -154,7 +170,7 @@
- 已生产 + 出窑量
{{dry.completed}} @@ -209,14 +225,14 @@
  • 物料名称
  • 完成
    • -
    +
    • -
      {{e.equipment}}
      -
      {{e.materialCode}}
      -
      {{e.materialName}}
      -
      {{e.completed}}
      +
      {{e.equipment}}
      +
      {{e.materialCode}}
      +
      {{e.materialName}}
      +
      {{e.completed}}
     @@ -260,7 +276,8 @@ export default { press: {}, dry: {}, sort: {}, - equipmentProductionStatistics: [] + equipmentProductionStatistics: [], + mainEquipmentStatus: [] } }, computed: { @@ -277,6 +294,20 @@ export default { singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3 waitTime: 1000 // 单步运动停止的时间(默认值1000ms) } + }, + defaultOption2 () { + return { + timer1: null, + timer2: null, + step: 0.4, // 数值越大速度滚动越快 + limitMoveNum: 31, // 开始无缝滚动的数据量 this.dataList.length + hoverStop: true, // 是否开启鼠标悬停stop + direction: 1, // 0向下 1向上 2向左 3向右 + openWatch: true, // 开启数据实时监控刷新dom + singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1 + singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3 + waitTime: 1000 // 单步运动停止的时间(默认值1000ms) + } } }, mounted () { @@ -677,15 +708,15 @@ export default { async _homepageData () { let res = await homepageData() // 当前设备情况 - this.running = res.currentEquipmentCondition.running - this.pausing = res.currentEquipmentCondition.pausing - this.shutdown = res.currentEquipmentCondition.shutdown - this.inTrouble = res.currentEquipmentCondition.inTrouble - this.setEchart1() + // this.running = res.currentEquipmentCondition.running + // this.pausing = res.currentEquipmentCondition.pausing + // this.shutdown = res.currentEquipmentCondition.shutdown + // this.inTrouble = res.currentEquipmentCondition.inTrouble + // this.setEchart1() // 每月故障统计 - this.currentMonth = res.monthlyFailureStatistics.currentMonth - this.average = res.monthlyFailureStatistics.average - this.setEchart2() + // this.currentMonth = res.monthlyFailureStatistics.currentMonth + // this.average = res.monthlyFailureStatistics.average + // this.setEchart2() // 工序生产统计 this.mix = res.dailyProductionStatistics.mix this.stand = res.dailyProductionStatistics.stand @@ -694,6 +725,7 @@ export default { this.sort = res.dailyProductionStatistics.sort // 设备生产统计 this.equipmentProductionStatistics = [...res.equipmentProductionStatistics] + this.mainEquipmentStatus = [...res.mainEquipmentStatus] } } } @@ -776,7 +808,7 @@ export default { border-bottom .01rem solid rgba(8,205,248,0.3) li float left - width 30% + width 32% font-size .14rem line-height .4rem color #78B1DE @@ -788,10 +820,16 @@ export default { overflow hidden box-sizing border-box &:nth-child(1) - width 20% + width 16% &:nth-child(4) width 20% -.scroll_container_1 +.scroll_tab_2 li + width 20% + &:nth-child(1) + width 20% + &:nth-child(3) + width 60% +.scroll_container width 100% height calc(100% - .4rem) overflow hidden @@ -803,7 +841,7 @@ export default { &:nth-child(even) background rgba(1,24,52,0.60) box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3) - .scroll-ul_1_div + .scroll-ul_div float left width 32% height 100% @@ -822,6 +860,15 @@ export default { width 16% &:nth-child(4) width 20% +.scroll-ul_2 + li + height .4rem + .scroll-ul_div + width 20% + &:nth-child(1) + width 20% + &:nth-child(3) + width 60% .item_inner_wrap width 100% padding-bottom 4% @@ -877,6 +924,9 @@ export default { justify-content space-between align-items center background center bottom / 100% 100% url(../../../assets/images/screen1/item_5.png) no-repeat +.item_inner_h2_inner_2 + width 100% + background-image url(../../../assets/images/screen1/item_8.png) .item_inner_h2_inner_l width 50% height 100% @@ -952,4 +1002,19 @@ export default { background: radial-gradient(circle at 7.2% 13.6%, rgb(37, 249, 245) 0%, #004c92 90%) +a margin-left .2rem +.state_icon + width .14rem + height .06rem +.bg_col_1 + background-color #30EBC9 + box-shadow 0px 0px 8px 0px #30EBC9 +.bg_col_2 + background-color #E2BB0E + box-shadow 0px 0px 8px 0px #E2BB0E +.bg_col_3 + background-color #516282 + box-shadow 0px 0px 8px 0px #516282 +.bg_col_4 + background-color #F96700 + box-shadow 0px 0px 8px 0px #F96700 diff --git a/src/pages/shunhe/ProdCount.vue b/src/pages/shunhe/ProdCount.vue index 15b1a12..465e698 100644 --- a/src/pages/shunhe/ProdCount.vue +++ b/src/pages/shunhe/ProdCount.vue @@ -20,7 +20,7 @@
    -
    今日干燥量：
    +
    今日出窑成品数量：
    {{item}}
    @@ -60,7 +60,7 @@
    -
    成品计划完成率
    +
    成品计划完成情况
    diff --git a/src/pages/shunhe/StorageMonitor.vue b/src/pages/shunhe/StorageMonitor.vue index 1ff24e0..e18b6df 100644 --- a/src/pages/shunhe/StorageMonitor.vue +++ b/src/pages/shunhe/StorageMonitor.vue @@ -340,7 +340,7 @@
    -

    成型库存

    +

    半成品库存

    货位物料编码物料名称库存数(块)托盘号入库时间