From 0ef2692358a867784da731630bc5a1d390f526f1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Apr 2024 13:13:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/css/mixin.styl                    | 49 ---------------------------
 src/pages/modules/PressProd.vue       |  7 ++--
 src/pages/modules/SortWorkMonitor.vue | 13 ++++---
 3 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 src/css/mixin.styl

diff --git a/src/css/mixin.styl b/src/css/mixin.styl
deleted file mode 100644
index 97224f1..0000000
--- a/src/css/mixin.styl
+++ /dev/null
@@ -1,49 +0,0 @@
-$red = #ed4754
-$green = #67c23a
-$yellow = #f2d648
-$orange = #f17d3a
-$blue = #6798ef
-$gray = #c9c9c9
-$fc1 = #323232
-
-.green
-  background-color #11ff0d
-.yellow
-  background-color #fdfd0f
-.gray
-  background-color #bfbfbf
-.red
-  background-color #ff1016
-
-//宽高
-_wh(w, h)
-  width: w
-  height: h
-
-//字体大小、行高、颜色
-_font(size,height,color=$fc1,weight=normal,align=left)
-  font-size: size
-  line-height: height
-  color: color
-  font-weight: weight
-  text-align: align
-
-//flex 布局和 子元素 对其方式
-_fj(x=space-between,y=center)
-  display: flex
-  justify-content: x
-  align-items: y
-
-// 背景图片地址和大小
-_bis(url,w,h=auto,x=center,y=center)
-  background-position: x y
-  background-size: w h
-  background-image: url(url)
-  background-repeat: no-repeat
-
-// 定位上下居中
-_ct()
-  position: absolute
-  top: 50%
-  transform: translateY(-50%)
-  
\ No newline at end of file
diff --git a/src/pages/modules/PressProd.vue b/src/pages/modules/PressProd.vue
index cdcc78f..2b3ba35 100644
--- a/src/pages/modules/PressProd.vue
+++ b/src/pages/modules/PressProd.vue
@@ -100,7 +100,6 @@
 
 <script>
 import THeader from '@components/header3.vue'
-// import * as echarts from 'echarts'
 import { cockpitpress } from '@js/getData1'
 // import {cockpitpress} from '@js/mork1.js'
 export default {
@@ -632,9 +631,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-// @import '~@css/mixin'
-@import '../../css/mixin'
-// @import '~@style/mixin'
+@import '~@style/mixin'
 .bg
   _wh(100%, 100%)
   overflow hidden
@@ -886,7 +883,7 @@ export default {
     .scroll-ul_2_div
         float left
         _wh(7%, 44px)
-        _fj(center)
+        _fj(row,center)
         _font(12px, 44px, #fff,,center)
         word-wrap break-word
         word-break break-all
diff --git a/src/pages/modules/SortWorkMonitor.vue b/src/pages/modules/SortWorkMonitor.vue
index 8539a88..7e7421f 100644
--- a/src/pages/modules/SortWorkMonitor.vue
+++ b/src/pages/modules/SortWorkMonitor.vue
@@ -471,8 +471,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-// @import '~@css/mixin'
-@import '../../css/mixin'
+@import '~@style/mixin'
 .bg
   _wh(100%, 100%)
   overflow hidden
@@ -545,12 +544,12 @@ export default {
     &:nth-child(1)
       color #2ef6ff
 .zdy_box
-  _fj(flex-start, flex-start)
+  _fj(row,flex-start, flex-start)
   flex-wrap wrap
   align-content flex-start
 .one_wrap_item
   height calc(50% - 15px)
-  _fj(flex-start)
+  _fj(row,flex-start)
   margin-top 15px
   margin-right 15px
 .one_w_item_label
@@ -563,7 +562,7 @@ export default {
   min-width 20px
   height 100%
   _font(30px, 1, #f7b502,,center)
-  _fj(center)
+  _fj(row,center)
   background-color rgba(50,197,255,0.1)
   padding 0 10px
 .two_wrap
@@ -572,7 +571,7 @@ export default {
 .two_wrap_item
   _wh(50%, 100%)
   padding 0 15px
-  _fj()
+  _fj(row)
 .two_w_item_label
   width 170px
   _font(18px, 1, #32c5ff,,)
@@ -655,7 +654,7 @@ export default {
     .scroll-ul_2_div
         float left
         _wh(11.1%, 44px)
-        _fj(center)
+        _fj(row,center)
         _font(12px, 44px, #fff,,center)
         word-wrap break-word
         word-break break-all

From 0dc3448227c7679bf91277c7d5f66aba997c9e9d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Apr 2024 17:37:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=80=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/header.vue             | 157 +++++++++++++++++---------
 src/components/header3.vue            | 143 -----------------------
 src/pages/Setup.vue                   |   2 +-
 src/pages/modules/PressProd.vue       |   4 +-
 src/pages/modules/SortWorkMonitor.vue |   4 +-
 src/pages/modules/home/index.vue      |  30 +----
 src/style/iconfont.styl               |   4 +-
 src/style/iconfont/iconfont.json      |  37 ------
 src/style/iconfont/iconfont.ttf       | Bin 2052 -> 2432 bytes
 src/style/iconfont/iconfont.woff      | Bin 1376 -> 1676 bytes
 src/style/iconfont/iconfont.woff2     | Bin 944 -> 1272 bytes
 src/style/layout.styl                 |  15 ++-
 12 files changed, 124 insertions(+), 272 deletions(-)
 delete mode 100644 src/components/header3.vue
 delete mode 100644 src/style/iconfont/iconfont.json

diff --git a/src/components/header.vue b/src/components/header.vue
index 011e3e3..5028fdc 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -1,20 +1,19 @@
 <template>
   <header>
-    <div class="center_text">晟华大屏监控</div>
-    <div class="tag_block">
-      <div class="tag_left">
-        <!-- <div v-if="index == '0'" class="tag cur_tag">首页</div>
-        <router-link v-else to="/homepage" class="tag">首页</router-link> -->
-        <div v-if="index == '1'" class="tag cur_tag">生产统计</div>
-        <router-link v-else to="/prodcount" class="tag">生产统计</router-link>
-      </div>
-      <div class="tag_right">
-        <div v-if="index == '2'" class="tag cur_tag">仓储监控</div>
-        <router-link v-else to="/storagemonitor" class="tag">仓储监控</router-link>
-        <div v-if="index == '3'" class="tag cur_tag">设备监控</div>
-        <router-link v-else to="/devicemonitor" class="tag">设备监控</router-link>
+    <div class="exit_btn iconfont" @click.stop="$router.push('/setup')">&#xe85b;</div>
+    <p>{{title}}</p>
+    <div class="data_box clearfix">
+      <div class="date_item date">{{date}}</div>
+      <div class="date_item week">{{week}}</div>
+      <div class="date_item clearfix">
+        <div class="tiem_item hours">{{hours}}</div>
+        <div class="colon">:</div>
+        <div class="tiem_item minutes">{{minutes}}</div>
+        <div class="colon">:</div>
+        <div class="tiem_item seconds">{{seconds}}</div>
       </div>
     </div>
+    <slot></slot>
   </header>
 </template>
 
@@ -22,54 +21,102 @@
 export default {
   name: 'Header',
   data () {
-    return {}
+    return {
+      expand: false,
+      timer: null,
+      time: '',
+      hours: '',
+      minutes: '',
+      seconds: '',
+      date: '',
+      week: ''
+    }
   },
   props: {
-    index: String
+    title: String
+  },
+  created () {
+    this.updateTime()
+    this.timer = window.setInterval(this.updateTime, 1000)
+  },
+  beforeDestroy () {
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer)
+    })
+  },
+  methods: {
+    expandTooltip () {
+      this.expand = !this.expand
+    },
+    updateTime () {
+      let cd = new Date()
+      let year = cd.getFullYear()
+      let month = cd.getMonth() + 1 < 10 ? '0' + (cd.getMonth() + 1) : cd.getMonth() + 1
+      let date = cd.getDate() < 10 ? '0' + cd.getDate() : cd.getDate()
+      let hh = cd.getHours() < 10 ? '0' + cd.getHours() : cd.getHours()
+      let mm = cd.getMinutes() < 10 ? '0' + cd.getMinutes() : cd.getMinutes()
+      let ss = cd.getSeconds() < 10 ? '0' + cd.getSeconds() : cd.getSeconds()
+      var weekday = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+      let myddy = new Date().getDay()
+      let week = weekday[myddy]
+      this.time = `${hh}:${mm}:${ss}`
+      this.hours = `${hh}`
+      this.minutes = `${mm}`
+      this.seconds = `${ss}`
+      this.date = `${year}年${month}月${date}日`
+      this.week = `${week}`
+    }
   }
 }
 </script>
 
 <style lang="stylus" scoped>
-@import '~@style/mixin'
-header
-  _wh(100%, 84px)
-  overflow hidden
-  position relative
-  _bis('../assets/images/top.png',auto, 84px)
-.center_text
-  _wh(400px, 40px)
+.exit_btn
   position absolute
-  _font(36px, 40px, #fff,,center)
-  font-family "阿里妈妈数黑体" !important
-  left 50%
-  top 8px
-  margin-left -200px
-  letter-spacing 6px
-.tag_block
-  _wh(100%, 100%)
-  _fj(row)
-  padding 25px 15px 0
-.tag_left
-  _wh(50%, 100%)
-  _fj(row, flex-start)
-  .tag
-    margin-right 20px
-.tag_right
-  _wh(50%, 100%)
-  _fj(row, flex-end)
-  .tag
-    margin-left 20px
-.tag
-  display inline-block
-  _wh(132px, 36px)
-  _font(16px, 36px)
-  _bis('../assets/images/tag_1.png')
-  cursor pointer
-  &:hover
-    color #32C5FF
-    _bis('../assets/images/tag_2.png')
-.cur_tag
-  color #32C5FF
-  _bis('../assets/images/tag_2.png')
+  left 25px
+  top 14px
+  height 37px
+  width 37px
+  line-height 37px
+  font-size 20px
+  color #fff
+  background-color transparent
+header
+  position relative
+  width 100%
+  height 8%
+  position relative
+  background center center / 100% 100% url(../images/screen1/header.png) no-repeat
+  p
+    // font-family "PangMenZhengDao"
+    font-family "YouSheBiaoTiHei"
+    font-size 50px
+    line-height 100px
+    color #fff
+    font-weight lighter
+    text-align center
+    letter-spacing 5px
+    text-shadow 0 8px 8px rgba(0,0,0,0.30)
+.data_box
+  position absolute
+  right 25px
+  top 14px
+  height 37px
+.date, .week
+  padding-right 20px
+.date_item
+  float left
+  font-size 20px
+  line-height 37px
+  color #fff
+.tiem_item
+  float left
+  font-size 32px
+  line-height 37px
+  color #fff
+.colon
+  float left
+  font-size 32px
+  line-height 37px
+  color #fff
 </style>
diff --git a/src/components/header3.vue b/src/components/header3.vue
deleted file mode 100644
index 5b63d58..0000000
--- a/src/components/header3.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <header>
-    <div class="exit_btn" :style="expand ? {opacity: 1} : {opacity: 0.1}">
-      <div class="exit_txt" @click="$router.push('/setup')" :style="expand ? {width: '70px'} : {width: '0px'}">退出</div>
-      <div class="exit_arrow" v-text="!expand ? '&gt;&gt;' : '&lt;&lt;'" @click.stop="expand = !expand"></div>
-    </div>
-    <p>{{title}}</p>
-    <div class="data_box clearfix">
-      <div class="date_item date">{{date}}</div>
-      <div class="date_item week">{{week}}</div>
-      <div class="date_item time clearfix">
-        <div class="tiem_item hours">{{hours}}</div>
-        <div class="colon">:</div>
-        <div class="tiem_item minutes">{{minutes}}</div>
-        <div class="colon">:</div>
-        <div class="tiem_item seconds">{{seconds}}</div>
-      </div>
-    </div>
-    <slot></slot>
-  </header>
-</template>
-
-<script>
-export default {
-  name: 'Header',
-  data () {
-    return {
-      expand: false,
-      timer: null,
-      time: '',
-      hours: '',
-      minutes: '',
-      seconds: '',
-      date: '',
-      week: ''
-    }
-  },
-  props: {
-    title: String
-  },
-  created () {
-    this.updateTime()
-    this.timer = window.setInterval(this.updateTime, 1000)
-  },
-  beforeDestroy () {
-    this.$once('hook:beforeDestroy', () => {
-      clearInterval(this.timer)
-    })
-  },
-  methods: {
-    expandTooltip () {
-      this.expand = !this.expand
-    },
-    updateTime () {
-      let cd = new Date()
-      let year = cd.getFullYear()
-      let month = cd.getMonth() + 1 < 10 ? '0' + (cd.getMonth() + 1) : cd.getMonth() + 1
-      let date = cd.getDate() < 10 ? '0' + cd.getDate() : cd.getDate()
-      let hh = cd.getHours() < 10 ? '0' + cd.getHours() : cd.getHours()
-      let mm = cd.getMinutes() < 10 ? '0' + cd.getMinutes() : cd.getMinutes()
-      let ss = cd.getSeconds() < 10 ? '0' + cd.getSeconds() : cd.getSeconds()
-      var weekday = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
-      let myddy = new Date().getDay()
-      let week = weekday[myddy]
-      this.time = `${hh}:${mm}:${ss}`
-      this.hours = `${hh}`
-      this.minutes = `${mm}`
-      this.seconds = `${ss}`
-      this.date = `${year}年${month}月${date}日`
-      this.week = `${week}`
-    }
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-header
-  position relative
-  width 100%
-  height 8%
-  position relative
-  background center center / 100% 100% url(../images/screen1/header.png) no-repeat
-  p
-    // font-family "PangMenZhengDao"
-    font-family "YouSheBiaoTiHei"
-    font-size 50px
-    line-height 100px
-    color #fff
-    font-weight lighter
-    text-align center
-    letter-spacing 5px
-    text-shadow 0 8px 8px rgba(0,0,0,0.30)
-.data_box
-  position absolute
-  right 0
-  top 14px
-  height 37px
-.date, .week
-  padding-right 20px
-.time
-  width 170px
-  text-align center
-.date_item
-  float left
-  font-size 20px
-  line-height 37px
-  color #fff
-.tiem_item
-  float left
-  font-size 32px
-  line-height 37px
-  color #fff
-.colon
-  float left
-  font-size 32px
-  line-height 37px
-  color #fff
-.exit_btn
-  position: absolute;
-  left: 0;
-  top: 30px;
-  height 50px;
-  display: flex;
-  justify-content: space-between;
-.exit_txt
-  font-size: 20px;
-  line-height: 50px;
-  color: #e6e7e1;
-  text-align: center;
-  font-weight: bold;
-  transition width .3s ease
-  overflow hidden
-  background-color: rgba(30, 182, 203, 80%);
-.exit_arrow
-  width: 46px;
-  font-size: 20px;
-  line-height: 50px;
-  color: #e6e7e1;
-  text-align: center;
-  background-color: rgba(30, 182, 203, 60%);
-  border-top-right-radius: 30px;
-  border-bottom-right-radius: 30px
-</style>
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index f0c5b0d..9629e7b 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -68,7 +68,7 @@ export default {
     return {
       loginname: '',
       password: '',
-      options: [{value: '1', label: '大屏'}, {value: '2', label: '看板1'}, {value: '3', label: '看板2'}],
+      options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}],
       value: this.$store.getters.equipId,
       baseUrl: this.$store.getters.baseUrl,
       setTime: this.$store.getters.setTime / 1000,
diff --git a/src/pages/modules/PressProd.vue b/src/pages/modules/PressProd.vue
index 2b3ba35..e628a7d 100644
--- a/src/pages/modules/PressProd.vue
+++ b/src/pages/modules/PressProd.vue
@@ -99,7 +99,7 @@
 </template>
 
 <script>
-import THeader from '@components/header3.vue'
+import THeader from '@components/header.vue'
 import { cockpitpress } from '@js/getData1'
 // import {cockpitpress} from '@js/mork1.js'
 export default {
@@ -637,7 +637,7 @@ export default {
   overflow hidden
 .container
   _wh(100%, calc(100% - 138px))
-  padding 30px 25.09px 0
+  padding 30px 25px 0
   overflow hidden
   clear both
 .bottom
diff --git a/src/pages/modules/SortWorkMonitor.vue b/src/pages/modules/SortWorkMonitor.vue
index 7e7421f..d232adc 100644
--- a/src/pages/modules/SortWorkMonitor.vue
+++ b/src/pages/modules/SortWorkMonitor.vue
@@ -161,7 +161,7 @@
 </template>
 
 <script>
-import THeader from '@components/header3.vue'
+import THeader from '@components/header.vue'
 import {cockpitsorting} from '@js/getData1.js'
 // import {cockpitsorting} from '@js/mork1.js'
 export default {
@@ -477,7 +477,7 @@ export default {
   overflow hidden
 .container
   _wh(100%, calc(100% - 138px))
-  padding 30px 25.09px 0
+  padding 30px 25px 0
   clear both
 .bottom
   _wh(100%, 38px)
diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue
index 98ddf32..c244d78 100644
--- a/src/pages/modules/home/index.vue
+++ b/src/pages/modules/home/index.vue
@@ -8,10 +8,7 @@
             <h2>宁德华弘新材料科技有限公司</h2>
           </div>
           <v-time></v-time>
-          <div class="exit_btn" :style="expand ? {opacity: 1} : {opacity: 0.1}">
-            <div class="exit_txt" @click="$router.push('/setup')" :style="expand ? {width: '70px'} : {width: '0px'}">退出</div>
-            <div class="exit_arrow" v-text="!expand ? '&gt;&gt;' : '&lt;&lt;'" @click.stop="expand = !expand"></div>
-          </div>
+          <div class="exit_btn iconfont" @click.stop="$router.push('/setup')">&#xe85b;</div>
       </div>
       <div class="left_bg"></div>
       <div class="right_bg"></div>
@@ -1423,29 +1420,4 @@ export default {
       .state_name
         width 100%
         height 20px
-.exit_btn
-  position: absolute;
-  left: 0;
-  top: 30px;
-  height 50px;
-  display: flex;
-  justify-content: space-between;
-.exit_txt
-  font-size: 20px;
-  line-height: 50px;
-  color: #e6e7e1;
-  text-align: center;
-  font-weight: bold;
-  transition width .3s ease
-  overflow hidden
-  background-color: rgba(30, 182, 203, 80%);
-.exit_arrow
-  width: 46px;
-  font-size: 20px;
-  line-height: 50px;
-  color: #e6e7e1;
-  text-align: center;
-  background-color: rgba(30, 182, 203, 60%);
-  border-top-right-radius: 30px;
-  border-bottom-right-radius: 30px
 </style>
diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl
index 60a459d..e9d5e14 100644
--- a/src/style/iconfont.styl
+++ b/src/style/iconfont.styl
@@ -1,5 +1,5 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 1255596 */
+  font-family: "iconfont";
   src: url('iconfont/iconfont.woff2') format('woff2'),
        url('iconfont/iconfont.woff') format('woff'),
        url('iconfont/iconfont.ttf') format('truetype');
@@ -30,4 +30,4 @@
 
 .icon-guanbi:before {
   content: "\e60f";
-}
+}
\ No newline at end of file
diff --git a/src/style/iconfont/iconfont.json b/src/style/iconfont/iconfont.json
deleted file mode 100644
index 34ac18f..0000000
--- a/src/style/iconfont/iconfont.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "id": "1255596",
-  "name": "nl-hht-hl",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "2229060",
-      "name": "无信号",
-      "font_class": "no-signal",
-      "unicode": "e76b",
-      "unicode_decimal": 59243
-    },
-    {
-      "icon_id": "400034",
-      "name": "下拉",
-      "font_class": "htmal5icon03",
-      "unicode": "e626",
-      "unicode_decimal": 58918
-    },
-    {
-      "icon_id": "731140",
-      "name": "选择",
-      "font_class": "guanbi1",
-      "unicode": "e608",
-      "unicode_decimal": 58888
-    },
-    {
-      "icon_id": "4736203",
-      "name": "关闭",
-      "font_class": "guanbi",
-      "unicode": "e60f",
-      "unicode_decimal": 58895
-    }
-  ]
-}
diff --git a/src/style/iconfont/iconfont.ttf b/src/style/iconfont/iconfont.ttf
index d19ae0d69deb508c110d24f379a84e2089fd95d5..239c64c568b29efb8c61bed42e622fd743523db7 100644
GIT binary patch
delta 1440
zcmYLITTC2f6h3FJJ3GtHvO7DlKo?kGMwja@dnx5&q)<r#O>Ctk>uq6y(gI7lL}*NQ
ziNrLfG1N&D?Gw?MrqvoBt=8&;(PE5=FPa!*ln2^spBjzT1n|u6G~Laa|2yY9-}%q^
z=bv>?-nUVk^A9!x;CTRed3-iKfA_}qMF56eygD_rI=S%bo0S0UCuHi$iFC%exx7u}
zZ)Ay+6cB%9UnhKntp4Qe(uzuewD;(t&Sb~ac#Anm+7HQh&8Ao8QH6El%gL{qOV3W|
zp7**w1`xiZO{eCwi%T1yEmE=+ql6(qlIHjG@cf0ZLx-xipT75!()BmU9FYLq&%AyA
z(Yl}KfL$ZsQRv<xNDVx!0B?ryG|zE>8|GWsSp#=cg{r{*0(m=+7W>C==I`h;AE58K
zQ-u-$8DI;jiB>1oJp~-lRJ2uLvmM+~?xgnj0e0XaDilNFotA=h3~8t#6wEWse`cPM
z%+stlN7Rm$%F;@#Wmfw;O3_F|%@)n>1z;XN!cly~;`a0GpEPtmv_TgP0{GnMSIdG}
zrbUxIm`ucDhHi-dAme62Eeu8CN!5*^7L3OdQH@t~kDP|6<}bC$(pcjA6JtihxzW_E
z)abbeBN`cr_71r^7A{@Aw9w%i>Q!B;rn&<40jA|4+Pmou6fyHh|F`p*g0N5{voJZ<
z|AdgZczN?|U*Fly%NG+uP*z<oH79!m0dE0X=>33q??;y^Qvk!>KyhMri}?z4nk|-S
z=QSEB5%0kuR-;CP3JMB((unDG4K!dk>aF2sJZdzvXmmZ>G!m{2V&`Lj)wdv4SMI%2
za-iIe_-SL1L8VIVQ0sGQ^l;sgP(`4rt@_IYN<+4ygyEIS@_2=Hb722pc9V5b8$o*A
zDR>2-A;Ri)A%PBAE7Md_5Um5(+M~%tGC^m}#&pBxgQyB3C0b;p2U(pw`di{sRqLeg
zwQ9^+Y!7y0B2H3P^+!l==#3cC<Ma|bu~0Z!s`}aKHA#>aWgy(t6dn*IMHU^$Bkj>h
zqBA1#vf?tDTa6NrQ*cDP?>f9<&66(%u28=GdHM0jn^AHJqQi+Og#+qS^#RX?5=n5b
zd2$u{a8>X;)6OeSk0U&A^xEJ+m~%Ot3LiOkVr%5s-u=!@6|cyO!#|uF)<i;F)dYUQ
zF??lPzr*9)%gBn<S8FgL!+E52j$?WyW%mQ-1;6Kz>UNf3mn^yc2mRXaKS-Cn_-(RB
zm@TM;Dll(znVgTp*1fl$4)EES0g+OQahBpC8*_xiHs(QwsEq}RciY$rjnHpnnJUg(
z-!CW84m!MMV+0RevG6z%47lOCO|V3KV`Gl+Pd4U3gWEP1D86fBCyZc;jb+er{P4m=
zdTAn4GqzeYJ)WJL%+4*Dt-=}eT|qY=2p;oi;Ro}Y*i<b}EvM(krX!A(>Ga&xYId2M
LNspz4Vie$iEUx;f

delta 1053
zcmYjQTTIhn6h5b2+pQyl4pzJnSYexy0pqp_3?$wNJeZ(}1T|V<T-*)Dh=9>8iahy%
z_SpwDz8E7$Uo_E3l<=e`zNj%0jWG}tjfs&&jTBF}n(()$=R4<o-}(Q)f19#R<;*ye
z?^+iD@Dc!Y_C}Q9mkU>CDE>uuZy-F;zq94SJOKNE;;F%)(zosAk1pbVB=ZeYLO9P(
z6MjTiG8jpW=Mo_9XL{s@W4#Le#Q^DVQ=Ao1#)r`kZB);vxG1Vbg07|x?JNLCBqlN(
z8%;dFA-)9=birXjlBU*D0GAi!dhs`|p2!ZYfYn4rfcMYdNb9``*fNUE!01^Tqy`R}
zKu~22acBbksb0Yb$-Ep&cRj|YAZ75#sbA53Jf2nogn>;X4|$PV#lZy4L=w~enI-d5
z_L6Hkw6+GY9uq?!NW9EN8z3d4_d;GBVg9Ho#-fJUO-Zw^BrZ!nJ7dIzC0EAuT`Y$(
zW~@nH)g;WoQxNn?*ah0J02?3=oKOyR&`5K*c|r2~{JLvGzbzBlWI^&(S4nod{4TeP
z&9zr0eKjtbw^6DP^<1$H{fOtbbnce1c7Oa-hrGSJW^S*ym@5s~8tS)t$|qw!Z@F9U
z9zA_ak|nxZn(FrXP!1eu@4BuX^xz$w_c(St(O2-@+wOEX+O_-H)g^o>j~~QxzQXP(
zbUBZBD_5f%CCPC#KOZN!`~n|30}fd$WWH=(rQ_7k4A_Uv8GZjwbfBiSvhitLp>(D;
z$K0h;1q(U_3$iD*HtlsYrWjymwTf3o+BGH#YCk`g%=@n(otfTIT1{OAC@?Tf`4R)0
z2zw07ffZ^D%u{}sfkh~V76V(s266oxF<EGy9dOaW2stpT;~*6nI-Dm)fu+I=1Dgmh
z8khq+d^0c)ImjAVgif>>*a|Kj68FS|N+Q@-)H6{u)EkTT$D#>QeJqTisFs=C^gLw#
zWToGT)}s%RzBb9vA%iTMkV76U(OB8&&_GlPXALGIO1M^U<E<73#*}E!P$i%7Y4Jam
CxWB{z

diff --git a/src/style/iconfont/iconfont.woff b/src/style/iconfont/iconfont.woff
index 31debf3715bff451c87dc99e355127fa234274e7..82a494ed0807fe2459e84431979263a6be900507 100644
GIT binary patch
delta 1534
zcmXw3dpOf=7=C}-n8sLbrIbU|S5i!AawcLakx;4Fj7(*lHlNAiM;UWy*RY(T96F6c
zk#ZiAL#XILI><^!>2Rr#>+}6w*Y~~Gb-&MZ-`D-T&-2goj^NVpqzHFsX8-}@D5n9{
z#keFcon#I>AsNkj`5q%iD4hcUBt$q9iKU8$T5j;E$m2-<4FFUg0BF+bXwhnB5Iqn8
zOd8@dK|tBi6h6vCL_}*q_!<Q3uy4_c%upU5(FPH&j(|i$u2XErqHi2Y)fNGD+M;%Z
z()mbZ%rqkCAkc$IAb~{>4FW(3se$Z~=D~y#>q-ur%R{F3LOkXO_KNGdH#1crdnG!Z
zmM_b6gY;q32H|nm%sZJ(7M%o9w~~uD2B5&H9<@e({ul9Wd>mN~^O!(L5g$r`HV&Q3
zN@+2uQDI|iMoLmYN92#jL*wn6mJJHtTYmJNv9Xwca4oi9QF!R^REdvww0Ec3<EEm<
zeO7aA&au5=U)kB#_Y$xB-(1>djEA|p_|H%b2_|*(^W8kH*aIG<rcai!?SJPdoHXC(
znPi!aXJt@C@@hBT;_CGij3VzNhG&a#)V+nq)B@pyC-H(JbU|GqjsSz?4w?O`m9rYM
zL@~jU!RlWTR>AvOz@4(Nd^f9}qDQg~h$SEMvX?WpZt3w1m9<uFrBi=vRXtIeXkx%t
z4aY}U)@;f-Gl5@*E<=UeedGPIJ37tV62{svKl12>=)miDEcgWbtEP5Eouap*JF`B?
zL?dFu$LEpy#DY%e7TE>WXHnT^edK?dW@a6N#XD|19crwv+R>qe?Qn@wRgH4#z(T>U
zPFcwkv$PL()32$&nmno6BY)vBLY*-f13OWI#<1Ict|y$G+nggt7xaJd8u^?kAD-2}
zYL5Pub0jh7dQaT8n5t@pDCbGTk1`LaGw94?$$Kxgk=`504!s$>J@wxHoX@yGah2C<
zw4L}K>)UcOZ};;7mD{`;ILE-b@K_ELb@!=bLW=jpz9VZ2Ds8V2FUkK5yg2D+05dVX
zCuwY}Phmur4sLME#AY((?)Voh(TUwZ7T#U>LNi49tYvSY(C4Z`WP{6kbFgs9xw`Y1
zr#Vr_(lfp8e#~-ZrD}R7Yf?(LS7@1)=^IJ!9MIuP_!446E_-K2bM%**?`QwXetV5l
zp5-91@Drkh<qj-T+RTAnABx}b;a7f-^4vM+y-UJcLbo*gh14!REG#`09y1xpZTwv|
z)ODxy3htF}l-no6l)$gDKPtz!$y0Y)znY|$-Y1XJbX-P9<y6e$)Cq-A^qy4r^g~|p
zA-mH;h<UMdt5<GXuQOho;O?Ouw6u6qF`R`Hg@&!eTD$Pr<;}J6cFO!s68J#mRn6{5
zM|H=cN@Ft5vAyn_AVxQ4xq(Si^_>4YwNzsO`1uT4AdLnBa$RECqqCt+TRBzaIGMr1
zs>_7w1?3gWW6pZn=i-;F!vU(5D(8Ry;#LvbS^>&FBOO{^i2^RFC>HV-okpWMv;hbM
zmIDAIYY6}cltYK0l>Zvhf^L8S0u2>ltQSa|(HPr?d<FAR?&2VVbQ@NyJwb4}MU0Vb
zbiHC0;$ygRS=YRTD)lJ5UWlz4bE$dhYeIcy;U*FjKd2~}+!Si$pd)%$!>b|o+ooLY
zE-+P@l=P$ilkrg7`l<}r=)SCkb73yC(mi%Xc~SBuPQhFm2W`S9vhFY*s$YWJZweyl
z8uw-h<s-_MTfHazTWx2L+)u>LtGtvh;LOS2%LNyik?&;_(gE)FVW~H>zw^ozU-UD8
z=>A1&{gmRL>lJ>kZ@-qpYnX8{x_;b3Q`(v5gpVwf58mj>yUS8PR>?D-yf>Ua?!a88
zMk_KEF!CMgiQ019S~X9nUA*AgoGB%W@NmdNxchibr&RZ}z!=5rJ8DqZ-x_J@CfedZ
zxj&p|#CnvMU?%bH-5qdeRKxo9Eos6t^ybu3wV3MKVj}F(Bc6u_Gua0-^^`Q%+BBM(
hnivj<OZ2yynlx^0maN}kYM74K@0I~@I~NxO{sp=*mw^BP

delta 1250
zcmeC-eZVDB?(gQtz{mgutO*R<Aew_^qKJ9DGmsT#bIbE?a&BS)0|R3Rke>;pH=R2+
zcS3qjWg3wE1&E`8xW&S~`A9};VhRHTa{y4CE)bi^Ed3Ob0Tcv^H30cCK&-;v#N3vV
zTT%fOn*-$Y0kMb(kjTkT2B}*EWb%OVA3H{y+{6l?#mqZ^0`fqtz$nJxm6w>C3KY8m
zwA7V>fhpH6<X>$;esKxV^$I{W4nQ1wW--@|$sCLhtSN~Je-2IdWmKv!v^k%a_v8Kn
zfx~wWTwoAMV>!vlz&DrIn4x0M+ldEx8x(k4;~9As)$$IWRJ`Ht&&Qjbu~0_lkiXnQ
z`&@qc1jao@8jMfeUhKLu^<nj;56rHwU5-4=T2p=YZH?TIeal^bzxndkQN3jPnm@OW
z#iof?Rk{6d-6ehad|R5kHSZJFi279V?Le1R%rTv?-~W(<$npET+stMt86K7EV5#1^
zmXkwt120ELhy9{v&SNVQi^?vrurF5o7xBlwq$EIC-JC7?(Thi~-aL77;;MGr?$dkA
z@BiL+`nQaRLfaR$vrSBk4fw=F7I5)0l%%x&nkV0;_UqPv&t$Hzr&L#Uzr5Y2tNNvW
zQuxN1YdBTA7p7#rP>%C?vqj?E`ZE4)H+`00iY`0rv2LC2l}kSl-JJMbOy-)U-OlAb
zU0biMSyyr5)$F%>t@lkm&R%m?T9<q8nf}|`=Cqxg|M+R9rTXLR9*%mi+^%gaySww>
zLy4tsMxDzirW|u#oo6sl_5Mmb(YO3N;!ao!FmUtMKdFg*b?<>b&-<z;oJtIVTc&7u
z{jO=Q*Lx_+_~}HqeDI%XF>Pi>AJ$DO_c**n<E!&63o9neiLS0<f4V&m`)eqzWX-zN
z^U=XHI7?uKrrDW~RvjA`inYwTk*pcad*pTflK8-GVCW_%q$DITB(0m@Q~&s9?mnY}
z%?1qz<{rL&w0>fy7+YGb!qI~VSROGl$To9wfujSg0hBHd95}?l<S=O>qv!@E2HS8Z
zA)sN22?+^~hZz`I7({`JK_G{rieUo7A*e+OsT-0L(is@l6rM3Tv9<kAuw!Q6Z(vLW
zIwZB<*YB`_Kx_Oj_9a5ARwUH7KVeN`)c7m7Ixiw5>w9d;{bhc$wK|oLuf4)tAlG+*
z(}L+vgY^dw_1R|Aj^E!?ne5MS=K;H1-+kTh6K!LRtc!TXcZjbGt{2Fg5Z^L8<8kN?
z*T23ujvFsKlv|Qm*?fIR(zllKM1I*Cj_U=z{tvCb>OW-r8NH*^`VZIk3m;z{s<(R<
z7rvv{UH{whF#S1kE1x<ZU3gMyvgQ7!nQ`wYwXVJNYEE|a5w+mv1@WH2b2Fpw2EV!P
z{9H*ia`Gz9)mEN8r`Fzlb%9m-`KQ43;+=9WYEL7Q|7|<Q)K|#bs>;`6=p>QSaq7hj
z>(I0>>o+<dimMK@J^Q>QTI9<A;#NkcFXv+_f_H7YRB7ekXd5pbR9d2)cY59wlZkO>
zJ%u(o#a-JL;`EBqEH%7Ouqx(ar@cnH$A1RSsJs)v5C;WyQUik?+na`|6FVo)oY*>X
y>crkgWBvH;7RI*vhVAN$Rm=^Kn;2W#pFc3ecCU${zUJi#yiUdj3=E2<yq*9nwgd<O

diff --git a/src/style/iconfont/iconfont.woff2 b/src/style/iconfont/iconfont.woff2
index f9b361d1d545ec87b1e7878f7d73ee25fdfc77f1..5929552e1e1eeb3274b8ddb60061e3cff628c9be 100644
GIT binary patch
literal 1272
zcmV<U1PA+fPew8T0RR9100j5|3jhEB011Eq00gQ40RR9100000000000000000000
z0000SR0d!GgDMJ!6ooqhHUcCA6blRh1Rw>3X9r9hSqR9Unmo#c1rj6^3n);NQwSo;
zsk3*I<49pF0HIs}2ABBRcwW2u%t6dSs*E{skcF}@n>}<=1^a^))Uo=tQ2zACdnv&D
z|GA&9i_+PA=h^@uBeCp(O>{urR*3_z|M83ZUts4DsMX0$5Wpf2rBD?rmDB*69&M=x
zcwi7z3e?%sqpOqyX1WSvhAg<HF6l@EnS}{zvU&r|%wI2G$R}=4n3`a%I-PPw@YKu4
z=GyTA{S0S+1=v~vCZK^FXQq*E^QI0MmZ2PItg(O*MS$zOQQ#GC@W<vp9}(bOmBEb_
z{=)-}!azV=1fl@KmkAr-C8j}xS7=b+4K`r#<k-l09wL*()}AuN4bo7TW!UHJf{Dr)
z5D=VMCB~&sNRZa|-r+R7|30FOH-7jrkMT5mz}5lp1Jpgzln0D~UrKgo(Yh%cmPqf`
zshfM&{C2ECwU1-y+1lLmz~=Vfk>0hkcJ%iBk_{iF9W1|Aq`}?WWVUzL;-~CN>M~1)
zOREJIWAkt#j~M7_aIa=w?U-+mM<1G@c<MbLs?A02-FNO4F&Z&fA2wUC9kJiwULXk6
zK$7M9hR3s<(LT3On5b{7XSRg{WJ{(G#Wq+LQx=@hLl@eXQ!_tkyfwnep?~AK-Yrui
zYS`JaO-^KO&2-P^snK<{Gvix5QS95VjVf?2wH<;R1M7x|8)s+?eu4CiUeTMg2RDi&
z4#je{IX)(33l>jX?iN|=J9Hs?3)7j-a(lN+ANs9HNqcW`m*RVEhe;Vma@sfKW!I%O
z!omag7IP`KHz3@45^^2RzLK+$X>-FXB1?pBzq_*BWo^X?^H289QGZUB_-xQC?nitl
zCh**-CvFA(DKu*uPQC$`<##LOL*=Ytl_LsIB8oD))ms=hv-ocN4X7U*TQ8n{8P^bx
zon&3SSbNKHrsa1#_+W<|B~8&K=$WmZX1V&~S)#+2$NfXa|7B{)89uOoTg#R_{P>Xi
z**(u>LV!uz{%hs~+K96LGqTngv}B-kURuKRkcq(2z)ZV|<q277P$T8~zQ1USI%$rj
z>k4@NUyyM${YbipX@&4j4|R-`{=s|<0DSa!?E%o2)j5q?uhM3gO6u~j?QaNpQ|oJ6
zaEX6rwgJGK+Kc|>E*}GIXZ>2(V%Bd<+(L+GxC{~-W5uxn!PPM2L$N6M6>)z~F$m+u
zek|co8w9t`Mo{<>4;nY=&;~vmnAqe47j8;|MRqEVw+W{YhKS)0WMV9U5W;3q1aTNN
zAzVZo_=jK;#RqT^!hf)6B!RQpWRmvf3F0UcA>R$<0@g?(Db1^`LQ=hoBSU@`5uF^p
zFfLb~ZZsch5ZOf^U57NDQVEn0tcH2&dPt?hP)o1^2{c+psWv?(cc-zlL<?9AvLPTi
zC<qZqJGy~%MF68gk|NXg=T(7_qDKV>5u#ZGLB~w09+H<_<Po6rMH*4bGpXO74y430
z0E&d$b%KCV1F7U15UMbQf%F+~rT`&8iKfejfR=P}6H+IsDEjyk^$X1YQ<n`cVTuwh
ihM3~Quk%1o!^`8$hIHjL(r&Cb>d}_xOh%Ld0000h?@adq

literal 944
zcmV;h15f;SPew8T0RR9100Xc93jhEB00;yC00UwG0RR9100000000000000000000
z0000SR0dW6gE9((1cFfkHUcCA6blRh1Rw>3Z3k5w{07J#k|Y%Z2^3U;DsTr-ir{HK
z+PvNUe&Xq_sb<46i9}RM#H%D|RV+~w*(?5&f7V;bv&rtASM<lsM?8Pdu7v73QI#s9
zO;UyV|8qHQErI#%EXTDM*HJI9;(!7hYf_X2TtFwv4P!SEG{i>)db`TFUZ`v7fxvql
zGeazQpgBk?<DMdM;B6X}hRV<ib;ZIWenLfh=K2tL&VL_2WQ8|Lm4S(uZ`6u#^`rNv
zyKYOJXRcBlh^F&{Q6gh=JLY&&>Ac4+N^Ww~d)T=<0eY<@eQrOFe_Z}#a60j&2U7R&
z509)!f~bM=5pbfU3ZK0(LgsUjuu3&aMo4@yh@a)43iKFo4R`^t7G2W_A+=32(fO5J
z&xe%uvZplaMSma5x$>rY@MT5jO;_rN*VoKE<F}#rUg^2g^4EQ@N0#o}aA4W~^?QeJ
zHNNVMD1YAf+ILVbRs<5VK;#>+LF?aM*DbuKZ`=C4OCx%FwzT#~_4jTa@R^Z)i*D@h
zMU|D|P<t`n_ESmk?g*bfSdx3Cr8@AhzIOkq(09c<51mSzZ%*s|{SJo@_R;j&8T&Sd
z5FJUDbW+{imuqU`dm;RFE9yud*z@7g=d<Wiusi*q%1cL1J)Qd0xn#__7z)oEj*Ggv
z`UiFgD7&CvtGnnBiiZW<MVkJC3!YM*${+JgKz`}E0D$}<9R=h|uJ`^MHvV_9kB^u9
zYW)iMbmL7FHx|QFtwd+xUsCB<S9}RDRmH8vLbtSX#EW|s|B$MG<DK$u8tv?Tr$cKt
zfuylu&stw3;|qBcDuY9)wT_{;p?>*b8s#QRhjptY2osJ#GUh#G6CU9U`7KoD{D9g-
zxIynqgl#xj4#l^cVvb=E@$--(Sj+@jn6Iep!qO}wN7E9{?!#15A}BL0BcG|qW=yA;
zqRp1F7$b;KiwV_9$6=$<f~?e{Vu7W}j9H7)(@E8f(gceMe4R&O90n61ym=6Xz`~5s
z){JlA`&}@}EJhsKfa(eM!6=Q=Ig%+&MhASo(%cDkE6-?VlVo8S0wE|16QoY+hZz}J
zAlB-BDontnkq5-BiloCvq^mM*d9~>sw?PkFP(_LyC90@(4=gh^MKW_nf0>!6BKIK%
SWn_Cvvp6%aWO{M~0001s6S_M9

diff --git a/src/style/layout.styl b/src/style/layout.styl
index 285076a..c051f9f 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -8,4 +8,17 @@
 .state_2
   background center / 100% 100% url('../images/state_2.png') no-repeat
 .state_3
-  background center / 100% 100% url('../images/state_3.png') no-repeat
\ No newline at end of file
+  background center / 100% 100% url('../images/state_3.png') no-repeat
+.exit_btn
+  position: fixed;
+  left: 16px;
+  top: 74px;
+  width: 40px;
+  height 40px;
+  line-height 40px;
+  border-radius: 50%;
+  background-color: rgba(0,0,0,0.1);
+  font-size: 22px;
+  color: rgba(103,100,100,0.1);
+  text-align: center;
+  cursor: pointer;
\ No newline at end of file

From 6babf89e1b3a7f8de8a2d191a4dd115137532e8c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Apr 2024 19:06:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Setup.vue                           |   4 +-
 src/pages/modules/board/DryTask.vue           |   6 +
 src/pages/modules/{ => board}/PressProd.vue   | 214 ++++++------
 .../modules/{ => board}/SortWorkMonitor.vue   | 315 ++++++++----------
 src/pages/modules/board/index.vue             |  35 ++
 src/router/index.js                           |  22 +-
 6 files changed, 302 insertions(+), 294 deletions(-)
 create mode 100644 src/pages/modules/board/DryTask.vue
 rename src/pages/modules/{ => board}/PressProd.vue (80%)
 rename src/pages/modules/{ => board}/SortWorkMonitor.vue (63%)
 create mode 100644 src/pages/modules/board/index.vue

diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index 9629e7b..daa43f0 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -98,9 +98,9 @@ export default {
       if (this.value === '1') {
         this.$router.push('/home')
       } else if (this.value === '2') {
-        this.$router.push('/pressprod')
+        this.$router.push('/boardindex/pressprod')
       } else if (this.value === '3') {
-        this.$router.push('/SortWorkMonitor')
+        this.$router.push('/boardindex/sortwork')
       }
       let element = document.documentElement
       if (this.fullscreen) {
diff --git a/src/pages/modules/board/DryTask.vue b/src/pages/modules/board/DryTask.vue
new file mode 100644
index 0000000..4fb6a0a
--- /dev/null
+++ b/src/pages/modules/board/DryTask.vue
@@ -0,0 +1,6 @@
+<template>
+  <section class="bg">
+    <t-header title="压制生产看板">
+    </t-header>
+  </section>
+</template>
diff --git a/src/pages/modules/PressProd.vue b/src/pages/modules/board/PressProd.vue
similarity index 80%
rename from src/pages/modules/PressProd.vue
rename to src/pages/modules/board/PressProd.vue
index e628a7d..54a9df1 100644
--- a/src/pages/modules/PressProd.vue
+++ b/src/pages/modules/board/PressProd.vue
@@ -1,112 +1,103 @@
 <template>
-    <section class="bg">
-      <t-header title="压制生产看板">
-      </t-header>
-      <div class="container">
-        <div class="con1">
-          <div class="cbox">
-            <div>当前班次：</div>
-            <div class="num" style="color: #f7b502; font-size: 46px; letter-spacing: 15px;">
-              {{showText}}
-            </div>
+<div class="wraper">
+  <div class="con1">
+    <div class="cbox">
+      <div>当前班次：</div>
+      <div class="num" style="color: #f7b502; font-size: 46px; letter-spacing: 15px;">
+        {{showText}}
+      </div>
+    </div>
+    <div class="cbox">
+      <div>计划生产：</div>
+      <div class="num">
+        <div class="bg" v-for="(item, i) in showNum1" :key="i" :class="{dot: item === '.'}">{{item}}</div>
+      </div>
+      <div>块</div>
+    </div>
+    <div class="cbox">
+      <div>已生产：</div>
+      <div class="num">
+        <div class="bg" v-for="(item, i) in showNum2" :key="i" :class="{dot: item === '.'}">{{item}}</div>
+      </div>
+      <div>块</div>
+    </div>
+    <div class="cbox">
+      <div>不合格数：</div>
+      <div class="num">
+        <div class="bg" v-for="(item, i) in showNum3" :key="i" :class="{dot: item === '.'}">{{item}}</div>
+      </div>
+      <div>块</div>
+    </div>
+  </div>
+  <div class="center_wrapper" style="display:flex">
+    <div class="con2">
+      <div class="title"><span class="dotIncon"></span><span class="tltxt">当班生产</span></div>
+      <div class="item_content_0">
+        <div id="echart_d1" style="width: 100%; height: 100%"></div>
+      </div>
+    </div>
+    <div class="con3">
+      <div class="title"><span class="dotIncon"></span><span class="tltxt">当日订单</span></div>
+      <div class="item_content_1">
+        <div id="echart_d2" style="width: 100%; height: 100%"></div>
+      </div>
+    </div>
+  </div>
+  <div class="four_wrap">
+      <div class="item_tip item_tip_bg_l">
+        <div class="item_tip_left">生产任务</div>
+      </div>
+      <div class="item_content">
+        <div class="scroll_wrap">
+          <ul class="scroll_tab_2">
+            <li>设备</li>
+            <li>工单号</li>
+            <li>班次类型</li>
+            <li>生产物料</li>
+            <li>订单客户</li>
+            <li>计划开始</li>
+            <li>计划数(块)</li>
+            <li>已生产(块)</li>
+            <li>不合格(块)</li>
+            <li>合格率</li>
+            <li>状态</li>
+            <li>开工人</li>
+            <li>开工时间</li>
+            <li>完工时间</li>
+          </ul>
+          <div class="scroll_container_2">
+            <vue-seamless-scroll :data="ProductionTask" :class-option="defaultOption2">
+              <ul class="scroll-ul_2">
+                <li v-for="(e, i) in ProductionTask" :key="i">
+                  <div class="scroll-ul_2_div">{{e.device}}</div>
+                  <div class="scroll-ul_2_div">{{e.workorderCode}}</div>
+                  <div class="scroll-ul_2_div">{{e.team}}</div>
+                  <div class="scroll-ul_2_div">{{e.materialName}}</div>
+                  <div class="scroll-ul_2_div">{{e.customer}}</div>
+                  <div class="scroll-ul_2_div">{{e.planproducestartDate}}</div>
+                  <div class="scroll-ul_2_div">{{e.planQty}}</div>
+                  <div class="scroll-ul_2_div">{{e.realQty}}</div>
+                  <div class="scroll-ul_2_div">{{e.unqualifiedQty}}</div>
+                  <div class="scroll-ul_2_div">{{e.qualifiedRate}}%</div>
+                  <div class="scroll-ul_2_div">{{e.workorderStatus}}</div>
+                  <div class="scroll-ul_2_div">{{e.operator}}</div>
+                  <div class="scroll-ul_2_div">{{e.realproducestartDate}}</div>
+                  <div class="scroll-ul_2_div">{{e.realproduceendDate}}</div>
+                </li>
+              </ul>
+            </vue-seamless-scroll>
           </div>
-          <div class="cbox">
-            <div>计划生产：</div>
-            <div class="num">
-              <div class="bg" v-for="(item, i) in showNum1" :key="i" :class="{dot: item === '.'}">{{item}}</div>
-            </div>
-            <div>块</div>
-          </div>
-          <div class="cbox">
-            <div>已生产：</div>
-            <div class="num">
-              <div class="bg" v-for="(item, i) in showNum2" :key="i" :class="{dot: item === '.'}">{{item}}</div>
-            </div>
-            <div>块</div>
-          </div>
-          <div class="cbox">
-            <div>不合格数：</div>
-            <div class="num">
-              <div class="bg" v-for="(item, i) in showNum3" :key="i" :class="{dot: item === '.'}">{{item}}</div>
-            </div>
-            <div>块</div>
-          </div>
-        </div>
-        <div class="center_wrapper" style="display:flex">
-          <div class="con2">
-            <div class="title"><span class="dotIncon"></span><span class="tltxt">当班生产</span></div>
-            <div class="item_content_0">
-              <div id="echart_d1" style="width: 100%; height: 100%"></div>
-            </div>
-          </div>
-          <div class="con3">
-            <div class="title"><span class="dotIncon"></span><span class="tltxt">当日订单</span></div>
-            <div class="item_content_1">
-              <div id="echart_d2" style="width: 100%; height: 100%"></div>
-            </div>
-          </div>
-        </div>
-        <div class="four_wrap">
-            <div class="item_tip item_tip_bg_l">
-              <div class="item_tip_left">生产任务</div>
-            </div>
-            <div class="item_content">
-              <div class="scroll_wrap">
-                <ul class="scroll_tab_2">
-                  <li>设备</li>
-                  <li>工单号</li>
-                  <li>班次类型</li>
-                  <li>生产物料</li>
-                  <li>订单客户</li>
-                  <li>计划开始</li>
-                  <li>计划数(块)</li>
-                  <li>已生产(块)</li>
-                  <li>不合格(块)</li>
-                  <li>合格率</li>
-                  <li>状态</li>
-                  <li>开工人</li>
-                  <li>开工时间</li>
-                  <li>完工时间</li>
-                </ul>
-                <div class="scroll_container_2">
-                  <vue-seamless-scroll :data="ProductionTask" :class-option="defaultOption2">
-                    <ul class="scroll-ul_2">
-                      <li v-for="(e, i) in ProductionTask" :key="i">
-                        <div class="scroll-ul_2_div">{{e.device}}</div>
-                        <div class="scroll-ul_2_div">{{e.workorderCode}}</div>
-                        <div class="scroll-ul_2_div">{{e.team}}</div>
-                        <div class="scroll-ul_2_div">{{e.materialName}}</div>
-                        <div class="scroll-ul_2_div">{{e.customer}}</div>
-                        <div class="scroll-ul_2_div">{{e.planproducestartDate}}</div>
-                        <div class="scroll-ul_2_div">{{e.planQty}}</div>
-                        <div class="scroll-ul_2_div">{{e.realQty}}</div>
-                        <div class="scroll-ul_2_div">{{e.unqualifiedQty}}</div>
-                        <div class="scroll-ul_2_div">{{e.qualifiedRate}}%</div>
-                        <div class="scroll-ul_2_div">{{e.workorderStatus}}</div>
-                        <div class="scroll-ul_2_div">{{e.operator}}</div>
-                        <div class="scroll-ul_2_div">{{e.realproducestartDate}}</div>
-                        <div class="scroll-ul_2_div">{{e.realproduceendDate}}</div>
-                      </li>
-                    </ul>
-                  </vue-seamless-scroll>
-                </div>
-              </div>
-            </div>
         </div>
       </div>
-      <section class="bottom"></section>
-    </section>
+  </div>
+</div>
 </template>
 
 <script>
-import THeader from '@components/header.vue'
 import { cockpitpress } from '@js/getData1'
 // import {cockpitpress} from '@js/mork1.js'
 export default {
   name: 'ProdCount',
-  components: {
-    THeader
-  },
   data () {
     return {
       timeOut: null,
@@ -632,17 +623,6 @@ export default {
 
 <style lang="stylus" scoped>
 @import '~@style/mixin'
-.bg
-  _wh(100%, 100%)
-  overflow hidden
-.container
-  _wh(100%, calc(100% - 138px))
-  padding 30px 25px 0
-  overflow hidden
-  clear both
-.bottom
-  _wh(100%, 38px)
-  background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat
 .blue
   color #32C5FF !important
 .green
@@ -660,7 +640,7 @@ export default {
   height 123px
   overflow hidden
   position relative
-  background center center / 100% 100% url(../../images/screen1/sctj_top.png) no-repeat
+  background center center / 100% 100% url(../../../images/screen1/sctj_top.png) no-repeat
   margin 5px 0
   text-align center
   display flex
@@ -680,7 +660,7 @@ export default {
       height 19px
       overflow hidden
       position relative
-      background center center / 100% 100% url(../../images/screen1/sctj_icon.png) no-repeat
+      background center center / 100% 100% url(../../../images/screen1/sctj_icon.png) no-repeat
       margin-right 20px
     .num
       display flex
@@ -712,7 +692,7 @@ export default {
     _font(18px, 32px, #fff,,left)
     letter-spacing: 2px;
     text-shadow: 0 0 9px #159aff;
-    background center center / 100% 100% url(../../images/screen1/bg_title_l.png) no-repeat
+    background center center / 100% 100% url(../../../images/screen1/bg_title_l.png) no-repeat
   .item_content_0
     // _wh(calc(100% - 44px), calc(100% - 112px))
     _wh(calc(100% - 44px), 100%)
@@ -729,7 +709,7 @@ export default {
   position relative
   top 3px
   left -6px
-  background center center / 100% 100% url(../../images/screen1/bg_title_tip.png) no-repeat
+  background center center / 100% 100% url(../../../images/screen1/bg_title_tip.png) no-repeat
 .con3
   width 30%
   height calc(100% - 34px)
@@ -744,7 +724,7 @@ export default {
     _font(18px, 32px, #fff,,left)
     letter-spacing: 2px;
     text-shadow: 0 0 9px #159aff;
-    background center center / 100% 100% url(../../images/screen1/bg_title_s.png) no-repeat
+    background center center / 100% 100% url(../../../images/screen1/bg_title_s.png) no-repeat
   .item_content_1
     _wh(calc(100% - 44px), 100%)
     margin 60px auto
@@ -758,7 +738,7 @@ export default {
 //     _wh(calc(100% - 0px), 32px)
 //     margin 17px 0 10px 0
 //     padding-left 18px
-//     background center center / 100% 100% url(../../images/screen1/bg_title_j.png) no-repeat
+//     background center center / 100% 100% url(../../../images/screen1/bg_title_j.png) no-repeat
 //     color #fff
 //     h2
 //       _font(16px, 32px, #fff,,left)
@@ -840,7 +820,7 @@ export default {
     line-height 32px
     padding 0 10px
 .item_tip_bg_l
-    background center center / 100% 100% url(../../images/screen1/bg_title_j.png) no-repeat
+    background center center / 100% 100% url(../../../images/screen1/bg_title_j.png) no-repeat
 .item_tip_left
     _wh(60%, 100%)
     font-family "SourceHanSansCN"
@@ -848,7 +828,7 @@ export default {
     letter-spacing 2px
     text-shadow 0 0 9px #159AFF
     padding-left 34px
-    background center left / 22px 22px url(../../images/screen1/bg_title_tip.png) no-repeat
+    background center left / 22px 22px url(../../../images/screen1/bg_title_tip.png) no-repeat
 .item_content
     _wh(100%, calc(100% - 37px))
     margin-top 7px
diff --git a/src/pages/modules/SortWorkMonitor.vue b/src/pages/modules/board/SortWorkMonitor.vue
similarity index 63%
rename from src/pages/modules/SortWorkMonitor.vue
rename to src/pages/modules/board/SortWorkMonitor.vue
index d232adc..d689888 100644
--- a/src/pages/modules/SortWorkMonitor.vue
+++ b/src/pages/modules/board/SortWorkMonitor.vue
@@ -1,174 +1,165 @@
 <template>
-  <section class="bg">
-    <t-header title="分拣作业监控">
-    </t-header>
-    <div class="container">
-      <div class="zdy_box">
-        <div class="zero-wrap">
-          <div class="zero-title">
-            <div class="item_tip_left">{{topSec1.pointName}}</div>
-          </div>
-          <div class="zero-title">
-            <div class="item_tip_left">{{topSec2.pointName}}</div>
-          </div>
-          <div class="zero-title">
-            <div class="item_tip_left">人工分拣线</div>
-          </div>
-        </div>
-        <div class="one_wrap">
-          <div class="e-box">
-            <div class="a-box">
-              <!-- <div class="a-title">分拣线1：</div> -->
-              <div class="pie_wraper_2">
-                <div class="w_wraper">
-                  <div id="new_home_echart_01" style="width: 220px; height: 220px;"></div>
-                </div>
-              </div>
-            </div>
-            <div class="b-box">
-              <div class="b-item"><span>当前工单：</span><span>{{topSec1.workorderCode}}</span></div>
-              <div class="b-item"><span>客户：</span><span>{{topSec1.customer}}</span></div>
-              <div class="b-item"><span>物料：</span><span>{{topSec1.materialName}}</span></div>
-              <div class="b-item"><span>规格：</span><span>{{topSec1.materialSpec}}</span></div>
-              <div class="b-item"><span>数量：</span><span>{{topSec1.planQty}}</span></div>
-            </div>
-          </div>
-          <div class="e-box">
-            <div class="a-box">
-              <!-- <div class="a-title">分拣线2：</div> -->
-              <div class="pie_wraper_2">
-                <div class="w_wraper">
-                  <div id="new_home_echart_02" style="width: 220px; height: 220px;"></div>
-                </div>
-              </div>
-            </div>
-            <div class="b-box">
-              <div class="b-item"><span>当前工单：</span><span>{{topSec2.workorderCode}}</span></div>
-              <div class="b-item"><span>客户：</span><span>{{topSec2.customer}}</span></div>
-              <div class="b-item"><span>物料：</span><span>{{topSec2.materialName}}</span></div>
-              <div class="b-item"><span>规格：</span><span>{{topSec2.materialSpec}}</span></div>
-              <div class="b-item"><span>数量：</span><span>{{topSec2.planQty}}</span></div>
-            </div>
-          </div>
-          <div class="e-box">
-            <div class="a-box">
-              <!-- <div class="a-title">人工分拣线：</div> -->
-              <div class="pie_wraper_2">
-                <div class="w_wraper">
-                  <div id="new_home_echart_03" style="width: 220px; height: 220px;"></div>
-                </div>
-              </div>
-            </div>
-            <div class="b-box">
-              <div class="b-item" v-for="(e, i) in topSec3" :key="i"><span>{{e.pointName}}：</span><span>{{e.materialName}}</span></div>
-              <!-- <div class="b-item"><span>当前工单：</span><span>{{topSec3.workorderCode}}</span></div>
-              <div class="b-item"><span>客户：</span><span>{{topSec3.customer}}</span></div>
-              <div class="b-item"><span>物料：</span><span>{{topSec3.materialName}}</span></div>
-              <div class="b-item"><span>规格：</span><span>{{topSec3.materialSpec}}</span></div>
-              <div class="b-item"><span>数量：</span><span>{{topSec3.planQty}}</span></div> -->
+<div class="wraper">
+  <div class="zdy_box">
+    <div class="zero-wrap">
+      <div class="zero-title">
+        <div class="item_tip_left">{{topSec1.pointName}}</div>
+      </div>
+      <div class="zero-title">
+        <div class="item_tip_left">{{topSec2.pointName}}</div>
+      </div>
+      <div class="zero-title">
+        <div class="item_tip_left">人工分拣线</div>
+      </div>
+    </div>
+    <div class="one_wrap">
+      <div class="e-box">
+        <div class="a-box">
+          <!-- <div class="a-title">分拣线1：</div> -->
+          <div class="pie_wraper_2">
+            <div class="w_wraper">
+              <div id="new_home_echart_01" style="width: 220px; height: 220px;"></div>
             </div>
           </div>
         </div>
-        <div class="two_wrap">
-          <div class="zdy_box">
-            <div class="two_wrap_item">
-              <div class="two_w_item_label">当日已拆垛：</div>
-            </div>
-            <div class="two_wrap_item">
-              <div class="two_w_item_label">当日已码垛：</div>
+        <div class="b-box">
+          <div class="b-item"><span>当前工单：</span><span>{{topSec1.workorderCode}}</span></div>
+          <div class="b-item"><span>客户：</span><span>{{topSec1.customer}}</span></div>
+          <div class="b-item"><span>物料：</span><span>{{topSec1.materialName}}</span></div>
+          <div class="b-item"><span>规格：</span><span>{{topSec1.materialSpec}}</span></div>
+          <div class="b-item"><span>数量：</span><span>{{topSec1.planQty}}</span></div>
+        </div>
+      </div>
+      <div class="e-box">
+        <div class="a-box">
+          <!-- <div class="a-title">分拣线2：</div> -->
+          <div class="pie_wraper_2">
+            <div class="w_wraper">
+              <div id="new_home_echart_02" style="width: 220px; height: 220px;"></div>
             </div>
           </div>
         </div>
-        <div class="three_wrap">
-          <div class="zdy_box">
-            <div class="three_w_item">
-              <vue-seamless-scroll :data="chaiduoArr" :class-option="defaultOption1">
-                <ul class="scroll-ul_1">
-                  <li v-for="(e, i) in chaiduoArr" :key="i">
-                    <span>{{e.createTime}}&nbsp;</span>
-                    <span class="scroll_th">托盘号:</span>
-                    <span>{{ e.vehicleCode }}，</span>
-                    <span class="scroll_th">物料:</span>
-                    <span>{{ e.materialName }}，</span>
-                    <span class="scroll_th">数量:</span>
-                    <span>{{ e.materialQty }}，</span>
-                    <span class="scroll_th">重量:</span>
-                    <span>{{ e.materialWeight }}</span>
-                  </li>
-                </ul>
-              </vue-seamless-scroll>
-            </div>
-            <div class="three_w_item">
-              <vue-seamless-scroll :data="maduoArr" :class-option="defaultOption1">
-                <ul class="scroll-ul_1">
-                  <li v-for="(e, i) in maduoArr" :key="i">
-                    <span>{{e.createTime}}&nbsp;</span>
-                    <span class="scroll_th">托盘号:</span>
-                    <span>{{ e.vehicleCode }}，</span>
-                    <span class="scroll_th">物料:</span>
-                    <span>{{ e.materialName }}，</span>
-                    <span class="scroll_th">数量:</span>
-                    <span>{{ e.materialQty }}，</span>
-                    <span class="scroll_th">重量:</span>
-                    <span>{{ e.materialWeight }}</span>
-                  </li>
-                </ul>
-              </vue-seamless-scroll>
+        <div class="b-box">
+          <div class="b-item"><span>当前工单：</span><span>{{topSec2.workorderCode}}</span></div>
+          <div class="b-item"><span>客户：</span><span>{{topSec2.customer}}</span></div>
+          <div class="b-item"><span>物料：</span><span>{{topSec2.materialName}}</span></div>
+          <div class="b-item"><span>规格：</span><span>{{topSec2.materialSpec}}</span></div>
+          <div class="b-item"><span>数量：</span><span>{{topSec2.planQty}}</span></div>
+        </div>
+      </div>
+      <div class="e-box">
+        <div class="a-box">
+          <!-- <div class="a-title">人工分拣线：</div> -->
+          <div class="pie_wraper_2">
+            <div class="w_wraper">
+              <div id="new_home_echart_03" style="width: 220px; height: 220px;"></div>
             </div>
           </div>
         </div>
-        <div class="four_wrap">
-            <div class="item_tip item_tip_bg_l">
-              <div class="item_tip_left">剩余工单列表</div>
-            </div>
-            <div class="item_content">
-              <div class="scroll_wrap">
-                <ul class="scroll_tab_2">
-                  <li>工单号</li>
-                  <li>物料</li>
-                  <li>规格</li>
-                  <li>数量（块）</li>
-                  <li>重量（吨）</li>
-                  <li>订单号</li>
-                  <li>客户</li>
-                  <li>托盘类型</li>
-                  <li>创建时间</li>
-                </ul>
-                <div class="scroll_container_2">
-                  <vue-seamless-scroll :data="lastWorkOrderList" :class-option="defaultOption2">
-                    <ul class="scroll-ul_2">
-                      <li v-for="(e, i) in lastWorkOrderList" :key="i">
-                        <div class="scroll-ul_2_div">{{e.workorderCode}}</div>
-                        <div class="scroll-ul_2_div">{{e.materialName}}</div>
-                        <div class="scroll-ul_2_div">{{e.materialSpec}}</div>
-                        <div class="scroll-ul_2_div">{{e.planQty}}</div>
-                        <div class="scroll-ul_2_div">{{e.planWeight}}</div>
-                        <div class="scroll-ul_2_div">{{e.produceOrder}}</div>
-                        <div class="scroll-ul_2_div">{{e.customer}}</div>
-                        <div class="scroll-ul_2_div">{{e.vehicleType}}</div>
-                        <div class="scroll-ul_2_div">{{e.createTime}}</div>
-                      </li>
-                    </ul>
-                  </vue-seamless-scroll>
-                </div>
-              </div>
-            </div>
+        <div class="b-box">
+          <div class="b-item" v-for="(e, i) in topSec3" :key="i"><span>{{e.pointName}}：</span><span>{{e.materialName}}</span></div>
+          <!-- <div class="b-item"><span>当前工单：</span><span>{{topSec3.workorderCode}}</span></div>
+          <div class="b-item"><span>客户：</span><span>{{topSec3.customer}}</span></div>
+          <div class="b-item"><span>物料：</span><span>{{topSec3.materialName}}</span></div>
+          <div class="b-item"><span>规格：</span><span>{{topSec3.materialSpec}}</span></div>
+          <div class="b-item"><span>数量：</span><span>{{topSec3.planQty}}</span></div> -->
         </div>
       </div>
     </div>
-    <section class="bottom"></section>
-  </section>
+    <div class="two_wrap">
+      <div class="zdy_box">
+        <div class="two_wrap_item">
+          <div class="two_w_item_label">当日已拆垛：</div>
+        </div>
+        <div class="two_wrap_item">
+          <div class="two_w_item_label">当日已码垛：</div>
+        </div>
+      </div>
+    </div>
+    <div class="three_wrap">
+      <div class="zdy_box">
+        <div class="three_w_item">
+          <vue-seamless-scroll :data="chaiduoArr" :class-option="defaultOption1">
+            <ul class="scroll-ul_1">
+              <li v-for="(e, i) in chaiduoArr" :key="i">
+                <span>{{e.createTime}}&nbsp;</span>
+                <span class="scroll_th">托盘号:</span>
+                <span>{{ e.vehicleCode }}，</span>
+                <span class="scroll_th">物料:</span>
+                <span>{{ e.materialName }}，</span>
+                <span class="scroll_th">数量:</span>
+                <span>{{ e.materialQty }}，</span>
+                <span class="scroll_th">重量:</span>
+                <span>{{ e.materialWeight }}</span>
+              </li>
+            </ul>
+          </vue-seamless-scroll>
+        </div>
+        <div class="three_w_item">
+          <vue-seamless-scroll :data="maduoArr" :class-option="defaultOption1">
+            <ul class="scroll-ul_1">
+              <li v-for="(e, i) in maduoArr" :key="i">
+                <span>{{e.createTime}}&nbsp;</span>
+                <span class="scroll_th">托盘号:</span>
+                <span>{{ e.vehicleCode }}，</span>
+                <span class="scroll_th">物料:</span>
+                <span>{{ e.materialName }}，</span>
+                <span class="scroll_th">数量:</span>
+                <span>{{ e.materialQty }}，</span>
+                <span class="scroll_th">重量:</span>
+                <span>{{ e.materialWeight }}</span>
+              </li>
+            </ul>
+          </vue-seamless-scroll>
+        </div>
+      </div>
+    </div>
+    <div class="four_wrap">
+        <div class="item_tip item_tip_bg_l">
+          <div class="item_tip_left">剩余工单列表</div>
+        </div>
+        <div class="item_content">
+          <div class="scroll_wrap">
+            <ul class="scroll_tab_2">
+              <li>工单号</li>
+              <li>物料</li>
+              <li>规格</li>
+              <li>数量（块）</li>
+              <li>重量（吨）</li>
+              <li>订单号</li>
+              <li>客户</li>
+              <li>托盘类型</li>
+              <li>创建时间</li>
+            </ul>
+            <div class="scroll_container_2">
+              <vue-seamless-scroll :data="lastWorkOrderList" :class-option="defaultOption2">
+                <ul class="scroll-ul_2">
+                  <li v-for="(e, i) in lastWorkOrderList" :key="i">
+                    <div class="scroll-ul_2_div">{{e.workorderCode}}</div>
+                    <div class="scroll-ul_2_div">{{e.materialName}}</div>
+                    <div class="scroll-ul_2_div">{{e.materialSpec}}</div>
+                    <div class="scroll-ul_2_div">{{e.planQty}}</div>
+                    <div class="scroll-ul_2_div">{{e.planWeight}}</div>
+                    <div class="scroll-ul_2_div">{{e.produceOrder}}</div>
+                    <div class="scroll-ul_2_div">{{e.customer}}</div>
+                    <div class="scroll-ul_2_div">{{e.vehicleType}}</div>
+                    <div class="scroll-ul_2_div">{{e.createTime}}</div>
+                  </li>
+                </ul>
+              </vue-seamless-scroll>
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</div>
 </template>
 
 <script>
-import THeader from '@components/header.vue'
 import {cockpitsorting} from '@js/getData1.js'
 // import {cockpitsorting} from '@js/mork1.js'
 export default {
   name: 'SortWorkMonitor',
-  components: {
-    THeader
-  },
   data () {
     return {
       timer: null,
@@ -472,16 +463,6 @@ export default {
 
 <style lang="stylus" scoped>
 @import '~@style/mixin'
-.bg
-  _wh(100%, 100%)
-  overflow hidden
-.container
-  _wh(100%, calc(100% - 138px))
-  padding 30px 25px 0
-  clear both
-.bottom
-  _wh(100%, 38px)
-  background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat
 .zero-wrap
   _wh(100%, 12%)
   padding 0 0 15px 0
@@ -494,14 +475,14 @@ export default {
   font-weight: bold;
   font-size 18px
   color #ffffff
-  background center center / 100% 100% url(../../images/screen1/bg_title_s.png) no-repeat
+  background center center / 100% 100% url(../../../images/screen1/bg_title_s.png) no-repeat
   &:nth-child(2)
     margin-left 2%
     margin-right 2%
 .one_wrap
   _wh(100%, 12%)
   padding 0 0 15px 15px
-  // background center center / 100% 100% url(../../images/screen1/sctj_top.png) no-repeat
+  // background center center / 100% 100% url(../../../images/screen1/sctj_top.png) no-repeat
   overflow hidden
   display flex
 .e-box
@@ -519,7 +500,7 @@ export default {
 //   line-height 34px
 //   font-size 18px
 //   color #32c5ff
-  // background center center / 100% 100% url(../../images/screen1/bg_title_s.png) no-repeat
+  // background center center / 100% 100% url(../../../images/screen1/bg_title_s.png) no-repeat
 .pie_wraper_2
   // position absolute
   // top 17px
@@ -528,7 +509,7 @@ export default {
   height 222px
   // width 70%
   // height 70%
-  background center / 100% auto url('../../images/pie-bg_2.png') no-repeat
+  background center / 100% auto url('../../../images/pie-bg_2.png') no-repeat
   .w_wraper
     width 100%
     height 100%
@@ -611,7 +592,7 @@ export default {
     line-height 32px
     padding 0 10px
 .item_tip_bg_l
-    background center center / 100% 100% url(../../images/screen1/bg_title_j.png) no-repeat
+    background center center / 100% 100% url(../../../images/screen1/bg_title_j.png) no-repeat
 .item_tip_left
     _wh(60%, 100%)
     font-family "SourceHanSansCN"
@@ -619,7 +600,7 @@ export default {
     letter-spacing 2px
     text-shadow 0 0 9px #159AFF
     padding-left 34px
-    background center left / 22px 22px url(../../images/screen1/bg_title_tip.png) no-repeat
+    background center left / 22px 22px url(../../../images/screen1/bg_title_tip.png) no-repeat
 .item_content
     _wh(100%, calc(100% - 37px))
     margin-top 7px
diff --git a/src/pages/modules/board/index.vue b/src/pages/modules/board/index.vue
new file mode 100644
index 0000000..644f2ee
--- /dev/null
+++ b/src/pages/modules/board/index.vue
@@ -0,0 +1,35 @@
+<template>
+  <section class="wraper">
+    <t-header :title="$route.meta.title"></t-header>
+    <div class="container">
+      <router-view></router-view>
+    </div>
+    <section class="bottom"></section>
+  </section>
+</template>
+
+<script>
+import THeader from '@components/header.vue'
+export default {
+  components: {
+    THeader
+  }
+}
+</script>
+
+<style lang="stylus">
+.wraper
+  width 100%
+  height 100%
+  overflow hidden
+.container
+  width 100%
+  height calc(100% - 138px)
+  padding 30px 25px 0
+  overflow hidden
+  clear both
+.bottom
+  width 100%
+  height 38px
+  background center bottom / 1906px 100% url(../../../images/screen1/bottom.png) no-repeat
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 2c5898a..c5a37d3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,8 +3,9 @@ import Router from 'vue-router'
 
 const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup')
 const home = r => require.ensure([], () => r(require('@page/modules/home/index')), 'home')
-const PressProd = r => require.ensure([], () => r(require('@page/modules/PressProd')), 'PressProd')
-const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/SortWorkMonitor')), 'SortWorkMonitor')
+const boardIndex = r => require.ensure([], () => r(require('@page/modules/board/index')), 'boardIndex')
+const PressProd = r => require.ensure([], () => r(require('@page/modules/board/PressProd')), 'PressProd')
+const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/board/SortWorkMonitor')), 'SortWorkMonitor')
 
 Vue.use(Router)
 
@@ -24,12 +25,17 @@ export default new Router({
       component: home
     },
     {
-      path: '/pressprod',
-      component: PressProd
-    },
-    {
-      path: '/SortWorkMonitor',
-      component: SortWorkMonitor
+      path: '/boardindex',
+      component: boardIndex,
+      children: [{
+        path: 'pressprod',
+        component: PressProd,
+        meta: {title: '压制生产看板'}
+      }, {
+        path: 'sortwork',
+        component: SortWorkMonitor,
+        meta: {title: '分拣作业监控'}
+      }]
     }
   ]
 })

From 531846f0d18afe089f16fd741b29b58522df2837 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 26 Apr 2024 13:12:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=B9=B2=E7=87=A5=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                           |   3 +-
 src/config/getData2.js              |   2 +
 src/config/mork2.js                 | 391 ++++++++++++++++++++++++++++
 src/pages/Setup.vue                 |   4 +-
 src/pages/modules/board/DryTask.vue | 213 ++++++++++++++-
 src/router/index.js                 |   5 +
 6 files changed, 612 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index aa6f202..224b019 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,5 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
 # 注意事项
 + 华弘大屏分辨率都为 1920 * 1200
 + 看板分辨率为 1920 * 1080
-+ 接口文档地址：https://apifox.com/apidoc/shared-7fca569c-0233-402a-92da-74188764d4fc
\ No newline at end of file
++ 接口文档地址：https://apifox.com/apidoc/shared-7fca569c-0233-402a-92da-74188764d4fc
++ https://apifox.com/apidoc/shared-7fca569c-0233-402a-92da-74188764d4fc/api-168547155
\ No newline at end of file
diff --git a/src/config/getData2.js b/src/config/getData2.js
index a1db901..a60290c 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -7,3 +7,5 @@ export const inOutKilnDetail = () => post('api/cockpit/inOutKilnDetail', {})
 export const kilnDetail = () => post('api/cockpit/kilnDetail', {})
 // 大屏-两侧图表
 export const screenTableData = () => post('api/cockpit/screenTableData', {})
+// 窑看板
+export const klineInfo = () => post('api/cockpit/klineInfo', {})
diff --git a/src/config/mork2.js b/src/config/mork2.js
index 3ab73c9..88d71ce 100644
--- a/src/config/mork2.js
+++ b/src/config/mork2.js
@@ -2142,3 +2142,394 @@ export const screenTableData = () => {
   }
   return res
 }
+// 窑看板
+export const klineInfo = () => {
+  let res = {
+    'outKilnInfoVos': [
+      {
+        'vehicleCode': '1026',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1008',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0022',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1063',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0019',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1035',
+        'materialCode': 'AP-55A',
+        'materialModel': '35/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '1062',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1023',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1027',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0008',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0045',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1055',
+        'materialCode': 'MT-14A',
+        'materialModel': '20/40',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1147',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0039',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1001',
+        'materialCode': 'MT-14BT',
+        'materialModel': '20/10',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1064',
+        'materialCode': 'ML-70B',
+        'materialModel': '20/10',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1028',
+        'materialCode': 'ML-60BT',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1029',
+        'materialCode': 'ML-14BT',
+        'materialModel': '20/10',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1044',
+        'materialCode': 'ML-70B',
+        'materialModel': '20/30',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1013',
+        'materialCode': 'ML-60BT',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1135',
+        'materialCode': 'ML-60BT',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      }
+    ],
+    'inKilnInfoVos': [
+      {
+        'vehicleCode': '0009',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0048',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0024',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1046',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1145',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0016',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1085',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1801',
+        'materialCode': 'BP-65A',
+        'materialModel': '35/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '0036',
+        'materialCode': 'MT-14A',
+        'materialModel': '18/40',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '0018',
+        'materialCode': 'MT-14A',
+        'materialModel': '18/40',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1098',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0010',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1139',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      }
+    ],
+    'twoKilnInfoVos': [],
+    'oneKilnInfoVos': [
+      {
+        'vehicleCode': '0003',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1094',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0034',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1003',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1144',
+        'materialCode': 'BP-70A',
+        'materialModel': '40/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '1022',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1032',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0026',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1066',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1069',
+        'materialCode': 'BP-65A',
+        'materialModel': '35/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '1014',
+        'materialCode': 'BP-70A',
+        'materialModel': '40/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '1072',
+        'materialCode': 'MT-60AT',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1057',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0049',
+        'materialCode': 'BP-65A',
+        'materialModel': '35/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '0032',
+        'materialCode': 'BP-70A',
+        'materialModel': '40/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '0027',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1065',
+        'materialCode': 'ML-70B',
+        'materialModel': '20/10',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '0038',
+        'materialCode': 'MT-14A',
+        'materialModel': '18/40',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '0006',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1038',
+        'materialCode': 'MT-14BT',
+        'materialModel': '20/10',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '0013',
+        'materialCode': 'ML-60BT',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1042',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1138',
+        'materialCode': 'AP-70A',
+        'materialModel': '40/0',
+        'materialSpec': 'BD'
+      },
+      {
+        'vehicleCode': '1056',
+        'materialCode': 'ML-70BD',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1071',
+        'materialCode': 'ML-75B',
+        'materialModel': '18/30',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '0040',
+        'materialCode': 'MT-14BT',
+        'materialModel': '20/10',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1078',
+        'materialCode': 'MT-14BT',
+        'materialModel': '20/30',
+        'materialSpec': 'ZX'
+      },
+      {
+        'vehicleCode': '1041',
+        'materialCode': 'MT-14A',
+        'materialModel': '20/40',
+        'materialSpec': 'BB'
+      },
+      {
+        'vehicleCode': '1080',
+        'materialCode': 'ML-60BT',
+        'materialModel': '20/10',
+        'materialSpec': 'BB'
+      }
+    ]
+  }
+  return res
+}
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index daa43f0..8f703fd 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -68,7 +68,7 @@ export default {
     return {
       loginname: '',
       password: '',
-      options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}],
+      options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}, {value: '4', label: '干燥作业监控'}],
       value: this.$store.getters.equipId,
       baseUrl: this.$store.getters.baseUrl,
       setTime: this.$store.getters.setTime / 1000,
@@ -101,6 +101,8 @@ export default {
         this.$router.push('/boardindex/pressprod')
       } else if (this.value === '3') {
         this.$router.push('/boardindex/sortwork')
+      } else if (this.value === '4') {
+        this.$router.push('/boardindex/drytask')
       }
       let element = document.documentElement
       if (this.fullscreen) {
diff --git a/src/pages/modules/board/DryTask.vue b/src/pages/modules/board/DryTask.vue
index 4fb6a0a..8c50f47 100644
--- a/src/pages/modules/board/DryTask.vue
+++ b/src/pages/modules/board/DryTask.vue
@@ -1,6 +1,211 @@
 <template>
-  <section class="bg">
-    <t-header title="压制生产看板">
-    </t-header>
-  </section>
+<div class="dry_wraper">
+  <div class="dry_content">
+    <div class="dry_item_wraper">
+      <div class="dry_title">冷却输送线</div>
+      <div class="dry_item">
+        <div class="dry_hj dry_hj_1 fr" v-for="e in outKilnInfoVos" :key="e.vehicleCode" :style="e.active ? {'backgroundColor':'#653101'} : ''">
+          <div v-show="e.active" class="p1">{{ e.vehicleCode }}</div>
+          <div v-show="e.active" class="mater_info">
+            <div class="mater_p p2">{{e.materialCode}}</div>
+            <div class="mater_p p3">{{ e.materialModel }}</div>
+            <div class="mater_p p4">{{ e.materialSpec }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="dry_item_line"></div>
+    <div class="dry_item_wraper">
+      <div class="dry_title">1号窑</div>
+      <div class="dry_item">
+        <div class="dry_hj fl" v-for="e in oneKilnInfoVos" :key="e.vehicleCode" :style="e.active ? {'backgroundColor':'#653101'} : ''">
+          <div v-show="e.active" class="p1">{{ e.vehicleCode }}</div>
+          <div v-show="e.active" class="mater_info">
+            <div class="mater_p p2">{{e.materialCode}}</div>
+            <div class="mater_p p3">{{ e.materialModel }}</div>
+            <div class="mater_p p4">{{ e.materialSpec }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="dry_item_line"></div>
+    <div class="dry_item_wraper">
+      <div class="dry_title">2号窑</div>
+      <div class="dry_item">
+        <div class="dry_hj fl" v-for="e in twoKilnInfoVos" :key="e.vehicleCode" :style="e.active ? {'backgroundColor':'#653101'} : ''">
+          <div v-show="e.active" class="p1">{{ e.vehicleCode }}</div>
+          <div v-show="e.active" class="mater_info">
+            <div class="mater_p p2">{{e.materialCode}}</div>
+            <div class="mater_p p3">{{ e.materialModel }}</div>
+            <div class="mater_p p4">{{ e.materialSpec }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="dry_item_line"></div>
+    <div class="dry_item_wraper">
+      <div class="dry_title">进窑输送线</div>
+      <div class="dry_item">
+        <div class="dry_hj dry_hj_1 fr" v-for="e in inKilnInfoVos" :key="e.vehicleCode" :style="e.active ? {'backgroundColor':'#653101'} : ''">
+          <div v-show="e.active" class="p1">{{ e.vehicleCode }}</div>
+          <div v-show="e.active" class="mater_info">
+            <div class="mater_p p2">{{e.materialCode}}</div>
+            <div class="mater_p p3">{{ e.materialModel }}</div>
+            <div class="mater_p p4">{{ e.materialSpec }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 </template>
+<script>
+import { klineInfo } from '@js/getData2.js'
+export default {
+  data () {
+    return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      outKilnInfoVos: [], // 出窑缓存线信息
+      inKilnInfoVos: [], // 入窑缓存线
+      oneKilnInfoVos: [], // 窑1
+      twoKilnInfoVos: [] // 窑2
+    }
+  },
+  created () {
+    this._klineInfo()
+    this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+    this.timer = null
+  },
+  destroyed () {
+    clearInterval(this.timer)
+    this.timer = null
+  },
+  methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this._klineInfo()
+      }, this.interTime)
+    },
+    async _klineInfo () {
+      let res = await klineInfo()
+      this.outKilnInfoVos = [...res.outKilnInfoVos]
+      this.outKilnInfoVos.map(el => {
+        this.$set(el, 'active', true)
+      })
+      for (let i = this.outKilnInfoVos.length; i < 39; i++) {
+        this.outKilnInfoVos.push({vehicleCode: `out${i}`, active: false})
+      }
+      this.inKilnInfoVos = [...res.inKilnInfoVos]
+      this.inKilnInfoVos.map(el => {
+        this.$set(el, 'active', true)
+      })
+      for (let i = this.inKilnInfoVos.length; i < 40; i++) {
+        this.inKilnInfoVos.push({vehicleCode: `in${i}`, active: false})
+      }
+      this.oneKilnInfoVos = [...res.oneKilnInfoVos]
+      this.oneKilnInfoVos.map(el => {
+        this.$set(el, 'active', true)
+      })
+      for (let i = this.oneKilnInfoVos.length; i < 37; i++) {
+        this.oneKilnInfoVos.push({vehicleCode: `yao1${i}`, active: false})
+      }
+      this.twoKilnInfoVos = [...res.twoKilnInfoVos]
+      this.twoKilnInfoVos.map(el => {
+        this.$set(el, 'active', true)
+      })
+      for (let i = this.twoKilnInfoVos.length; i < 37; i++) {
+        this.twoKilnInfoVos.push({vehicleCode: `yao2${i}`, active: false})
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin'
+.dry_wraper
+  position relative
+  border-left 4px solid #18537a
+  border-right 4px solid #18537a
+  _wh(100%, 100%)
+  // background-color #034c6d
+  background: -webkit-radial-gradient(closest-side circle,rgba(86, 188, 234, 50%) 25%, #034c6d 100%)
+  box-shadow inset 3px -6px 6px 0px rgba(0, 0, 0, 30%), inset -6px 3px 6px 0px rgba(0, 0, 0, 30%)
+.dry_content
+  position relative
+  _wh(100%, 100%)
+  margin 0 auto
+  padding 24px 0
+  box-shadow inset 3px -6px 6px 0px rgba(0, 0, 0, 30%), inset -6px 3px 6px 0px rgba(0, 0, 0, 30%)
+  &:before
+    content ''
+    position absolute
+    top 0
+    left -4px
+    _wh(calc(100% + 4px), 20px)
+    border 2px solid #7d420b
+    background-color #653101
+  &:after
+    content ''
+    position absolute
+    bottom 0
+    left -4px
+    _wh(calc(100% + 4px), 20px)
+    border 2px solid #7d420b
+    background-color #653101
+.dry_item_wraper
+  _wh(100%, calc((100% - 60px) / 4))
+.dry_item_line
+  position relative
+  left -4px
+  _wh(calc(100% + 8px), 20px)
+  border 2px solid #7d420b
+  background-color #653101
+.dry_title
+  font-size 24px
+  font-family: 'YouSheBiaoTiHei';
+  font-weight: 400;
+  color: transparent;
+  line-height 30px
+  background: linear-gradient(0deg, #F9FEFF 0%, #F5FCFF 53.3154296875%, #BAE9FF 100%);
+  -webkit-background-clip: text;
+  background-clip: text;
+  text-align: center;
+.dry_item
+  clear both
+  _wh(100%, calc(100% - 30px))
+  padding 20px 10px
+.dry_hj
+  _wh(2.5%, 100%)
+  background-color #02344d
+  border 2px solid #186189
+  border-right 0
+  &:last-child
+    border-right 2px solid #186189
+.dry_hj_1
+  &:last-child
+    border-right 0
+.p1
+  _font(14px, 30px, #73f440,,)
+  border-bottom 2px solid #186189
+.mater_info
+  height calc(100% - 32px)
+.mater_p
+  display flex
+  justify-content center
+  align-items center
+  width 100%
+  _font(12px, 13px, #fff,,center)
+.p2
+  height 50%
+  // border-bottom 2px solid #186189
+.p3
+  height 25%
+  // border-bottom 2px solid #186189
+.p4
+  height 25%
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index c5a37d3..a896ce5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@ const home = r => require.ensure([], () => r(require('@page/modules/home/index')
 const boardIndex = r => require.ensure([], () => r(require('@page/modules/board/index')), 'boardIndex')
 const PressProd = r => require.ensure([], () => r(require('@page/modules/board/PressProd')), 'PressProd')
 const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/board/SortWorkMonitor')), 'SortWorkMonitor')
+const DryTask = r => require.ensure([], () => r(require('@page/modules/board/DryTask')), 'DryTask')
 
 Vue.use(Router)
 
@@ -35,6 +36,10 @@ export default new Router({
         path: 'sortwork',
         component: SortWorkMonitor,
         meta: {title: '分拣作业监控'}
+      }, {
+        path: 'drytask',
+        component: DryTask,
+        meta: {title: '干燥作业监控'}
       }]
     }
   ]