删除

src/assets/css/layout2.styl

@@ -58,13 +58,13 @@
   z-index 100
   width 550px
   padding 20px 14px 30px 14px
-  _bis('../images/screen3/popup_bg.png')
+  _bis('../images/screen1/popup_bg.png')
 .foldline
   position absolute
   right -109px
   z-index 10
   _wh(127px,105px)
-  _bis('../images/screen3/dot_line.png')
+  _bis('../images/screen1/dot_line.png')
 .foldline_right
    right -109px
 .foldline_left
@@ -72,7 +72,7 @@
    transform rotateY(180deg)
 .popup_bg
   _wh(100%, 100%)
-  background top center / 100% 18px url(../images/screen3/popup_line.png) no-repeat
+  background top center / 100% 18px url(../images/screen1/popup_line.png) no-repeat
   overflow hidden
 .popup_block
   _wh(100%,100%)

src/components/DropdownMenu.vue

@@ -1,214 +0,0 @@
-<template>
-  <div class="dropdown-menu" :class="{'toggle_disabled': disabled === true}" ref="elemId">
-    <div v-if="inputed === false" class="fxrow dropdown-menu__item" @click="toggleItem">
-      <span class="dropdown-menu__title" :class="{'dropdown-menu__title_up': up === true,'dropdown-menu__title--active': open === true,'dropdown-menu__title--active_up': up === true && open === true}"><div class="ellipsis chose_T">{{active === '' ? '请选择' : option[active].label}}</div></span>
-    </div>
-    <div v-if="inputed === true" class="fxrow dropdown-menu__item dropdown-menu__item_2">
-      <input
-      type="text"
-      placeholder="请输入"
-      class="fxcol drop_input"
-      :value="value"
-      @input="handleChange($event)">
-      <span class="fxcol dropdown-menu__title dropdown-menu__title_2" :class="{'dropdown-menu__title_up': up === true,'dropdown-menu__title--active': open === true,'dropdown-menu__title--active_up': up === true && open === true}" @click="toggleItem"><div class="ellipsis">&nbsp;</div></span>
-    </div>
-    <div v-show="open" class="dropdown-item" :style="up === false ? 'top: 38px' : 'bottom: 38px'">
-      <div ref="dropdown" class="dropdown-item__content">
-        <div v-show="option.length > 0" v-for="(e, i) in option" :key="e.value" @click="$emit('dropdownMenu', i)" class="fxrow dropdown-item__option dropdown-item__option--active">
-          <div class="cell__title" :class="{'cell__title--active': i + '' === active}"><span>{{e.label}}</span></div>
-          <div class="iconfont check_icon" :class="{'check_icon--checked': i + '' === active}"></div>
-        </div>
-        <div v-show="option.length === 0" class="fxrow dropdown-item__option dropdown-item__option--active" @click="handleBlur">
-          <div class="cell__title"><span>无匹配数据</span></div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'DropdownMenu',
-  model: {
-    prop: 'value',
-    event: 'input'
-  },
-  props: {
-    value: String,
-    option: Array,
-    active: String,
-    open: Boolean,
-    up: {
-      type: Boolean,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    inputed: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    toggleItem () {
-      let cheight = document.body.clientHeight
-      let bottom = this.$refs.elemId.getBoundingClientRect().bottom
-      this.$refs.dropdown.style.maxHeight = (cheight - bottom - 20) + 'px'
-      this.$emit('toggleItem')
-    },
-    handleChange ($event) {
-      let cheight = document.body.clientHeight
-      let bottom = this.$refs.elemId.getBoundingClientRect().bottom
-      this.$refs.dropdown.style.maxHeight = (cheight - bottom - 20) + 'px'
-      this.$emit('input', $event.target.value)
-      this.$emit('handleChange', $event.target.value)
-    },
-    handleBlur () {
-      this.$emit('handleBlur')
-    }
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-@import '~@css/mixin'
-.dropdown-menu
-  position relative
-  height inherit
-  font-size inherit
-  line-height inherit
-  background-color #fff
-  user-select none
-  width 100%
-.selectopt
-  // _font(.3rem, 38px, #606266)
-.selectbtn
-  position relative
-  flex 0 0 1rem
-  _wh(.8rem, .8rem)
-  vertical-align top
-  background-color #cccccc
-  &::before
-    content ''
-    width 0
-    height 0
-    border-left .5rem solid transparent
-    border-right .5rem solid transparent
-    border-top .5rem solid white
-    position absolute
-    right .15rem
-    top .15rem
-    pointer-events none
-    z-index 3
-.options
-  position absolute
-  z-index 100000
-  top 38px
-  width 100%
-  li
-    width 100%
-    _font(.12rem, .35rem, #000000)
-    background-color #cccccc
-    border-top 1px solid #ffffff
-    padding 0 .3rem 0 .1rem
-    user-select none
-    &:hover
-      background:#999
-.dropdown-menu__item
-  justify-content center
-  height inherit
-  font-size inherit
-  width 100%
-.dropdown-menu__item_2
-  align-items flex-start
-.drop_input
-  height .86rem
-  width calc(100% - 3rem)
-  padding 0 .15rem
-  color #606266
-  font-size .3rem
-  line-height .86rem
-.dropdown-menu__title
-  position relative
-  width 100%
-  padding 0 .15rem
-  color #606266
-  font-size inherit
-  line-height inherit
-  width 100%
-  display block
-  box-sizing border-box
-  &::after
-    position absolute
-    top 50%
-    right .16rem
-    margin-top -.1rem
-    border .06rem solid
-    border-color transparent transparent #999 #999
-    transform rotate(-45deg)
-    opacity 0.8
-    content ''
-.dropdown-menu__title_2
-  line-height 38px
-  max-width 1.4rem
-  &::after
-    right .16rem
-.dropdown-menu__title_up
-  &::after
-    transform rotate(135deg)
-    top calc(50% + .06rem)
-.dropdown-menu__title--active, .dropdown-menu__title--active div
-  color #2778f3 !important
-  &::after
-    border-color transparent transparent currentColor currentColor
-    margin-top -.02rem
-    transform rotate(135deg)
-.dropdown-menu__title--active_up, .dropdown-menu__title--active_up div
-  &::after
-    transform rotate(-45deg)
-    top calc(50% - .06rem)
-.dropdown-item
-  position absolute
-  left 0
-  width 100%
-  z-index 10
-  border-radius 4px
-  overflow hidden
-  box-shadow 0 0 .08rem 0.02rem rgba(160,160,160,0.9)
-.dropdown-item__content
-  position relative
-  width 100%
-  height auto
-  z-index 2047
-  overflow-y auto
-  background-color #fff
-  transition transform 0.3s
-.dropdown-item__option
-  width 100%
-  height 38px
-  padding 0 .15rem
-  overflow hidden
-.cell__title
-  height 38px
-  overflow hidden
-  span
-    _font(16px, 38px, #999)
-.cell__title--active span
-  color #2778f3
-.toggle_disabled
-  background-color #f5f7fa
-  border 0.02rem solid #e4e7ed
-  cursor not-allowed
-  .dropdown-menu__title
-    div
-      color #929292
-    &::after
-      border-color transparent transparent #929292 #929292
-.chose_T
-  width 100%
-  font-size inherit
-  overflow hidden
-  color #999
-</style>

src/components/devicepop.vue

@@ -1,338 +0,0 @@
-<template>
-  <div v-if="pkId === data.equipment" class="popup_wraper" :class="{'popup_wraper_down': hangj === 1}">
-    <div class="popup_arrow" :class="{'popup_arrow_down': hangj === 1}">
-      <img src="../assets/images/device/arrow.png">
-    </div>
-    <div class="popup_bg">
-      <div class="popup_block">
-        <div v-show="type !== 'tp'" class="pop_header">
-          <div v-show="type !== 'lz' && type !== 'tp'" class="pop_name">{{data.equipment}}</div>
-          <div class="pop_status">
-            <div class="pop_status_dot" :class="data.status ==='1' ? 'green' : ''"></div>
-            <div class="pop_status_text fgray">运行</div>
-          </div>
-        </div>
-        <div v-if="type === 'lz' || type === 'tp'" class="pop_content">
-          <div class="pop_item">
-            <div class="pop_label">点位</div>
-            <div class="pop_val">{{data.equipment}}</div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">载具</div>
-            <div class="pop_val">L007</div>
-          </div>
-          <div class="pop_item pop_item_l">
-            <div class="pop_label">物料</div>
-            <div class="pop_val">W001</div>
-          </div>
-          <div class="pop_item pop_item_l">
-            <div class="pop_label">名称</div>
-            <div class="pop_val">物料1</div>
-          </div>
-          <div v-if="type === 'lz'" class="pop_item">
-            <div class="pop_label">重量</div>
-            <div class="pop_val">80&nbsp;<span>KG</span></div>
-          </div>
-          <div v-if="type === 'tp'" class="pop_item">
-            <div class="pop_label">数量</div>
-            <div class="pop_val">800&nbsp;<span>块</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">批次</div>
-            <div class="pop_val">20201010</div>
-          </div>
-          <div class="pop_item">
-            <div v-if="type === 'lz'" class="pop_label">组盘时间</div>
-            <div v-if="type === 'tp'" class="pop_label">组盘/入库时间</div>
-            <div class="pop_val">2020-10-10 19:20:20</div>
-          </div>
-          <div v-if="type === 'lz'" class="pop_item">
-            <div class="pop_label">已静置</div>
-            <div class="pop_val">8&nbsp;<span>h</span></div>
-          </div>
-        </div>
-        <div v-if="type === 'hlj' || type === 'yj' || type === 'yao' || type === 'cdjxs'" class="pop_content">
-          <div v-if="type !== 'yao'" class="pop_item pop_item_l">
-            <div class="pop_label">当前生产</div>
-            <div class="pop_val">铝碳化硅碳ACTTEXDA10M250X150X7523Z002</div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">已工作时间</div>
-            <div class="pop_val">8&nbsp;<span>h</span></div>
-          </div>
-          <div v-if="type === 'hlj' || type === 'yj'" class="pop_item">
-            <div class="pop_label">已生产总量</div>
-            <div class="pop_val">2300&nbsp;<span>KG</span></div>
-          </div>
-          <div v-if="type === 'yao'" class="pop_item">
-            <div class="pop_label">窑内物料数量</div>
-            <div class="pop_val">2300&nbsp;<span>块</span></div>
-          </div>
-          <div v-if="type === 'yao'" class="pop_item">
-            <div class="pop_label">当日已生产</div>
-            <div class="pop_val">2300&nbsp;<span>块</span></div>
-          </div>
-          <div v-if="type === 'cdjxs'" class="pop_item">
-            <div class="pop_label">完成托盘数</div>
-            <div class="pop_val">2300&nbsp;<span>托</span></div>
-          </div>
-          <div v-if="type === 'cdjxs'" class="pop_item">
-            <div class="pop_label">完成数量</div>
-            <div class="pop_val">2300&nbsp;<span>块</span></div>
-          </div>
-          <table class="popup_table">
-            <tr>
-              <th>本日生产</th>
-              <th v-if="type === 'hlj'">已生产数量</th>
-              <th v-else>客户</th>
-              <th v-if="type === 'hlj'">单位</th>
-              <th v-else>已生产（块）</th>
-            </tr>
-            <tr>
-              <td>铝碳化硅碳ACTTEXDA10M250X150X7523Z002</td>
-              <td v-if="type === 'hlj'">1500</td>
-              <td v-else>新余</td>
-              <td v-if="type === 'hlj'">KG</td>
-              <td v-else>1000</td>
-            </tr>
-            <tr>
-              <td>铝碳化硅碳ACTTEXDA10M250X150X7523Z002</td>
-              <td v-if="type === 'hlj'">1500</td>
-              <td v-else>新余</td>
-              <td v-if="type === 'hlj'">KG</td>
-              <td v-else>1000</td>
-            </tr>
-            <tr>
-              <td>铝碳化硅碳ACTTEXDA10M250X150X7523Z002</td>
-              <td v-if="type === 'hlj'">1500</td>
-              <td v-else>新余</td>
-              <td v-if="type === 'hlj'">KG</td>
-              <td v-else>1000</td>
-            </tr>
-          </table>
-        </div>
-        <div v-if="type === 'hangj'" class="pop_content">
-          <div class="pop_item pop_item_l">
-            <div class="pop_label">当前物料</div>
-            <div class="pop_val">L007</div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当前载具</div>
-            <div class="pop_val">T001</div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当前物料数量</div>
-            <div class="pop_val">800&nbsp;<span>块</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当日搬运托盘数</div>
-            <div class="pop_val">800&nbsp;<span>托</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当日搬运数量</div>
-            <div class="pop_val">800&nbsp;<span>块</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当日搬运物料数</div>
-            <div class="pop_val">800&nbsp;<span>个</span></div>
-          </div>
-        </div>
-        <div v-if="type === 'ssx'" class="pop_content">
-          <div class="pop_item">
-            <div class="pop_label">已工作时间</div>
-            <div class="pop_val">3&nbsp;<span>h</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">输入托盘数</div>
-            <div class="pop_val">800&nbsp;<span>托</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">输入数量</div>
-            <div class="pop_val">800&nbsp;<span>块</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">输出托盘数</div>
-            <div class="pop_val">800&nbsp;<span>托</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">输出数量</div>
-            <div class="pop_val">800&nbsp;<span>块</span></div>
-          </div>
-        </div>
-        <div v-if="type === 'cpj'" class="pop_content">
-          <div class="pop_item">
-            <div class="pop_label">已工作时间</div>
-            <div class="pop_val">3&nbsp;<span>h</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">完成托盘数</div>
-            <div class="pop_val">800&nbsp;<span>托</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">完成垛数</div>
-            <div class="pop_val">800&nbsp;<span>垛</span></div>
-          </div>
-        </div>
-        <div v-if="type === 'tpccx'" class="pop_content">
-          <div class="pop_item">
-            <div class="pop_label">已工作时间</div>
-            <div class="pop_val">3&nbsp;<span>h</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当前托盘垛数</div>
-            <div class="pop_val">800&nbsp;<span>垛</span></div>
-          </div>
-          <div class="pop_item">
-            <div class="pop_label">当前托盘数量</div>
-            <div class="pop_val">100&nbsp;<span>个</span></div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- <div class="iconfont icon-guanbi close_btn" @click="closePop"></div> -->
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'devicepop',
-  props: {
-    type: String,
-    pkId: String,
-    data: Object,
-    hangj: Number
-  },
-  methods: {
-    closePop () {
-      this.$emit('closePop')
-    }
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-@import '~@css/mixin'
-.popup_wraper
-  position absolute
-  left 50%
-  transform translateX(-50%) translateY(-80px)
-  bottom 0
-  z-index 100
-  padding 20px 0 30px 0
-  background top center / 100% 100% url(../assets/images/screen3/popup_bg.png) no-repeat
-  _wh(530px, auto)
-.popup_wraper_down
-  bottom auto
-  top 0
-  transform translateX(-50%) translateY(80px)
-.popup_arrow
-  position absolute
-  _wh(22px, 23px)
-  left calc(50% - 11px)
-  bottom -20px
-  animation todown 1.5s ease-in infinite
-  img
-    _wh(100%, 100%)
-.popup_arrow_down
-  bottom auto
-  top -20px
-  animation toup 1.5s ease-in infinite
-  img
-    transform rotateZ(180deg)
-.popup_bg
-  _wh(100%, auto)
-  background none
-  overflow hidden
-.popup_block
-  _wh(100%,100%)
-  padding 0
-.pop_header
-    _wh(calc(100% - 28px), 43px)
-    padding 15px 5px 0 5px
-    margin 0 14px
-    _fj(flex-end)
-    background top center / 100% 18px url(../assets/images/screen3/popup_line.png) no-repeat
-.pop_name
-  width 50%
-  _font(14px,28px,#32C5FF,,left)
-  text-shadow 2px 2px 4px #A6E6FF
-  margin-bottom 8px
-.pop_status
-  _wh(50%, 28px)
-  _fj(flex-end)
-.pop_status_dot
-    _wh(15px, 15px)
-    border-radius 50%
-    margin-right 10px
-.pop_status_text
-    _font(16px, 28px, #fff,,)
-.pop_content
-  _wh(calc(100% - 14px), auto)
-  padding 0 5px
-  margin 0 7px
-  overflow-y auto
-  _fj(flex-start)
-  align-content flex-start
-  flex-wrap wrap
-.pop_item
-    _wh(calc(50% - 14px), 24px)
-    _fj(row,flex-start)
-    background-color rgba(50,197,255,50%)
-    border-left 3px solid #fdfd0f
-    margin 0 7px 5px 7px
-    padding 0 10px 0 5px
-.pop_item_l
-  width calc(100% - 14px)
-.pop_label
-    width 80px
-    _font(12px, 24px, #fff,,left)
-.pop_val
-    width calc(100% - 80px)
-    _font(13px, 24px, #0ff,,left)
-    white-space nowrap
-    span
-      font-size 13px
-      color #fff
-.icon-guanbi
-    position absolute
-    top -30px
-    right -30px
-    _wh(30px, 30px)
-    _font(18px, 30px, #fff,,center)
-    border 1px solid #fff
-    border-radius 50%
-    background transparent
-@keyframes todown {
-    0% {
-      transform: translateY(0)
-    }
-    100% {
-      transform: translateY(20px)
-    }
-}
-@keyframes toup {
-    0% {
-      transform: translateY(0)
-    }
-    100% {
-      transform: translateY(-20px)
-    }
-}
-.popup_table
-  width calc(100% - 14px)
-  margin 0 7px
-  tr
-    th
-      _font(12px, 24px, #0ff,,left)
-      background-color #262f52
-      padding 0 10px
-    td
-      _font(13px, 24px, #fff,,left)
-      padding 0 10px
-    &:nth-child(2n)
-      td
-        background rgba(38,47,82,0.50)
-    &:nth-child(2n+1)
-      td
-        background rgba(38,47,82,0.80)
-</style>