干燥工序

src/components/flowsvg.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="svg_wraper dashRight">
+    <svg width="100%" height="100%">
+      <linearGradient id="linear" x1="0%" y1="0%" x2="100%" y2="0%">
+        <stop  stop-color="#ffe505"/>
+      </linearGradient>
+      <path :class="direction" d="M 0 7 L 1862 7" stroke="rgba(0, 206, 208, .7)" style="stroke-dasharray: 20, 8;stroke-width: 4;" />
+    </svg>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    direction: String
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.svg_wraper
+  width calc(100% - 20px)
+  height 16px
+  margin 0 auto
+  // border-top 2px solid rgba(0, 206, 208, .7)
+  // border-bottom 2px solid rgba(0, 206, 208, .7)
+  background-color rgba(0, 206, 208, .3)
+  // background-color: #02344d;
+  // border: 2px solid #186189;
+@keyframes dashLeft {
+  to {
+    stroke-dashoffset: 100;
+  }
+}
+@keyframes dashRight {
+  to {
+    stroke-dashoffset: -100;
+  }
+}
+.pathLeft {
+  animation: dashLeft 1s linear infinite;
+}
+.pathRight {
+  animation: dashRight 1s linear infinite;
+}
+</style>

src/components/header.vue

@@ -80,7 +80,9 @@ export default {
   line-height 37px
   font-size 20px
   color #fff
-  background-color transparent
+  text-align: center;
+  cursor: pointer;
+  border-radius: 50%;
 header
   position relative
   width 100%

src/config/mork2.js

@@ -2150,127 +2150,127 @@ export const klineInfo = () => {
         'vehicleCode': '1026',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1008',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0022',
         'materialCode': 'ML-75B',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1063',
         'materialCode': 'ML-75B',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0019',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1035',
         'materialCode': 'AP-55A',
         'materialModel': '35/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '1062',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1023',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1027',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0008',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0045',
         'materialCode': 'ML-75B',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1055',
         'materialCode': 'MT-14A',
         'materialModel': '20/40',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1147',
         'materialCode': 'ML-75B',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0039',
         'materialCode': 'ML-75B',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1001',
         'materialCode': 'MT-14BT',
         'materialModel': '20/10',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1064',
         'materialCode': 'ML-70B',
         'materialModel': '20/10',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1028',
         'materialCode': 'ML-60BT',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1029',
         'materialCode': 'ML-14BT',
         'materialModel': '20/10',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1044',
         'materialCode': 'ML-70B',
         'materialModel': '20/30',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1013',
         'materialCode': 'ML-60BT',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1135',
         'materialCode': 'ML-60BT',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       }
     ],
     'inKilnInfoVos': [
@@ -2278,79 +2278,79 @@ export const klineInfo = () => {
         'vehicleCode': '0009',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0048',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0024',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1046',
         'materialCode': 'ML-75B',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1145',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0016',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1085',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1801',
         'materialCode': 'BP-65A',
         'materialModel': '35/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '0036',
         'materialCode': 'MT-14A',
         'materialModel': '18/40',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0018',
         'materialCode': 'MT-14A',
         'materialModel': '18/40',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1098',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0010',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1139',
         'materialCode': 'ML-75B',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       }
     ],
     'twoKilnInfoVos': [],
@@ -2359,175 +2359,175 @@ export const klineInfo = () => {
         'vehicleCode': '0003',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1094',
         'materialCode': 'ML-75B',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0034',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1003',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1144',
         'materialCode': 'BP-70A',
         'materialModel': '40/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '1022',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1032',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0026',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1066',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1069',
         'materialCode': 'BP-65A',
         'materialModel': '35/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '1014',
         'materialCode': 'BP-70A',
         'materialModel': '40/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '1072',
         'materialCode': 'MT-60AT',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '0'
       },
       {
         'vehicleCode': '1057',
         'materialCode': 'ML-70BD',
         'materialModel': '20/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0049',
         'materialCode': 'BP-65A',
         'materialModel': '35/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '0032',
         'materialCode': 'BP-70A',
         'materialModel': '40/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '0027',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1065',
         'materialCode': 'ML-70B',
         'materialModel': '20/10',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0038',
         'materialCode': 'MT-14A',
         'materialModel': '18/40',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0006',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1038',
         'materialCode': 'MT-14BT',
         'materialModel': '20/10',
-        'materialSpec': 'ZX'
+        'materialQty': '0'
       },
       {
         'vehicleCode': '0013',
         'materialCode': 'ML-60BT',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '0'
       },
       {
         'vehicleCode': '1042',
         'materialCode': 'ML-75B',
         'materialModel': '18/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1138',
         'materialCode': 'AP-70A',
         'materialModel': '40/0',
-        'materialSpec': 'BD'
+        'materialQty': '126'
       },
       {
         'vehicleCode': '1056',
         'materialCode': 'ML-70BD',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1071',
         'materialCode': 'ML-75B',
         'materialModel': '18/30',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '0040',
         'materialCode': 'MT-14BT',
         'materialModel': '20/10',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1078',
         'materialCode': 'MT-14BT',
         'materialModel': '20/30',
-        'materialSpec': 'ZX'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1041',
         'materialCode': 'MT-14A',
         'materialModel': '20/40',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       },
       {
         'vehicleCode': '1080',
         'materialCode': 'ML-60BT',
         'materialModel': '20/10',
-        'materialSpec': 'BB'
+        'materialQty': '252'
       }
     ]
   }

src/pages/modules/board/DryTask.vue

@@ -4,64 +4,69 @@
     <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 class="dry_hj fl" 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 class="mater_p p4">{{ e.materialQty }}</div>
           </div>
         </div>
       </div>
+      <flow-svg direction="pathLeft"></flow-svg>
     </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 class="dry_hj dry_hj_1 fr" 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 class="mater_p p4">{{ e.materialQty }}</div>
           </div>
         </div>
       </div>
+      <flow-svg direction="pathRight"></flow-svg>
     </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 class="dry_hj dry_hj_1 fr" 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 class="mater_p p4">{{ e.materialQty }}</div>
           </div>
         </div>
       </div>
+      <flow-svg direction="pathRight"></flow-svg>
     </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 class="dry_hj fl" 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 class="mater_p p4">{{ e.materialQty }}</div>
           </div>
         </div>
       </div>
+      <flow-svg direction="pathLeft"></flow-svg>
     </div>
   </div>
 </div>
 </template>
 <script>
+import FlowSvg from '@components/flowsvg.vue'
 import { klineInfo } from '@js/getData2.js'
 export default {
+  components: {
+    FlowSvg
+  },
   data () {
     return {
       interTime: this.$store.getters.setTime,
@@ -132,39 +137,18 @@ export default {
   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
+  padding 10px 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
+  margin-bottom 20px
+  &:last-child
+    margin-bottom 0
 .dry_title
   font-size 24px
   font-family: 'YouSheBiaoTiHei';
@@ -177,15 +161,23 @@ export default {
   text-align: center;
 .dry_item
   clear both
-  _wh(100%, calc(100% - 30px))
-  padding 20px 10px
+  _wh(100%, calc(100% - 46px))
+  padding 20px 10px 0px 10px
 .dry_hj
-  _wh(2.5%, 100%)
+  position relative
+  _wh(2.5%, calc(100% - 10px))
   background-color #02344d
   border 2px solid #186189
   border-right 0
   &:last-child
     border-right 2px solid #186189
+  &:after
+    content ''
+    position absolute
+    _wh(2px, 10px)
+    bottom -11px
+    left calc(50% - 1px)
+    background-color #186189
 .dry_hj_1
   &:last-child
     border-right 0

src/pages/modules/home/index.vue

@@ -8,7 +8,19 @@
             <h2>宁德华弘新材料科技有限公司</h2>
           </div>
           <v-time></v-time>
-          <div class="exit_btn iconfont" @click.stop="$router.push('/setup')">&#xe85b;</div>
+          <div class="n_header_info">
+            <div class="exit_btn iconfont" @click.stop="$router.push('/setup')">&#xe85b;</div>
+            <div class="header_select">
+              <el-select v-model="value" placeholder="看板选择" @change="selectChange">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
       </div>
       <div class="left_bg"></div>
       <div class="right_bg"></div>
@@ -143,6 +155,8 @@ export default {
   },
   data () {
     return {
+      options: [{value: 1, label: '压制生产看板'}, {value: 2, label: '分拣作业监控'}, {value: 3, label: '干燥作业监控'}],
+      value: '',
       interTime: this.$store.getters.setTime,
       timer: null,
       chart1Timer: null,
@@ -202,6 +216,15 @@ export default {
     this.chart4Timer = null
   },
   methods: {
+    selectChange (e) {
+      if (e === 1) {
+        this.$router.push('/boardindex/pressprod')
+      } else if (this.value === 2) {
+        this.$router.push('/boardindex/sortwork')
+      } else if (this.value === 3) {
+        this.$router.push('/boardindex/drytask')
+      }
+    },
     refresh () {
       this.timer = setInterval(() => {
         this._screenTableData()
@@ -1164,6 +1187,38 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
+.n_header_info
+  position absolute
+  right 15%
+  top 29px
+  height 28px
+  display flex
+.header_select
+  position relative
+  height 28px
+  line-height 28px
+  width 100px
+  margin 0 8px
+  /deep/ .el-input__inner
+    height 28px
+    line-height 28px
+    background-color transparent
+    padding-right 25px
+    border-color #093e7b
+    color #aecaf5
+    &::placeholder
+      color #aecaf5
+  /deep/ .el-input__icon
+    line-height 28px
+.exit_btn
+  height 28px
+  width 28px
+  line-height 28px
+  font-size 20px
+  color #aecaf5
+  text-align: center;
+  cursor: pointer;
+  border-radius: 50%;
 .n_container
   position relative
   width 100%
@@ -1243,6 +1298,8 @@ export default {
   width 22%
   height 100%
 .n-center_wraper
+  display flex
+  align-items center
   position relative
   width 1002px
   height 100%

src/pages/modules/home/workshop.vue

@@ -363,8 +363,6 @@ export default {
 .center_wrapper
   width 1002px
   height 905px
-  position relative
-  top 60px
 .pop_pointer
   position: fixed;
   z-index 101;

src/style/layout.styl

@@ -9,16 +9,3 @@
   background center / 100% 100% url('../images/state_2.png') no-repeat
 .state_3
   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;