From b315e0c15e9f4e0ee76fbca9bb84a12b680f2754 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Wed, 24 Apr 2024 11:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Setup.vue | 48 +++++++++---------- src/pages/modules/InStore.vue | 86 +++++++++++++++++++---------------- src/pages/modules/Prod.vue | 16 ++++++- src/pages/modules/Weight.vue | 22 ++++----- 4 files changed, 96 insertions(+), 76 deletions(-) diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index 7b73287..ac9524d 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -102,30 +102,30 @@ export default { } else if (this.value === '3') { this.$router.push('/Prod') } - // let element = document.documentElement - // if (this.fullscreen) { - // if (document.exitFullscreen) { - // document.exitFullscreen() - // } else if (document.webkitCancelFullScreen) { - // document.webkitCancelFullScreen() - // } else if (document.mozCancelFullScreen) { - // document.mozCancelFullScreen() - // } else if (document.msExitFullscreen) { - // document.msExitFullscreen() - // } - // } else { - // if (element.requestFullscreen) { - // element.requestFullscreen() - // } else if (element.webkitRequestFullScreen) { - // element.webkitRequestFullScreen() - // } else if (element.mozRequestFullScreen) { - // element.mozRequestFullScreen() - // } else if (element.msRequestFullscreen) { - // // IE11 - // element.msRequestFullscreen() - // } - // } - // this.fullscreen = !this.fullscreen + let element = document.documentElement + if (this.fullscreen) { + if (document.exitFullscreen) { + document.exitFullscreen() + } else if (document.webkitCancelFullScreen) { + document.webkitCancelFullScreen() + } else if (document.mozCancelFullScreen) { + document.mozCancelFullScreen() + } else if (document.msExitFullscreen) { + document.msExitFullscreen() + } + } else { + if (element.requestFullscreen) { + element.requestFullscreen() + } else if (element.webkitRequestFullScreen) { + element.webkitRequestFullScreen() + } else if (element.mozRequestFullScreen) { + element.mozRequestFullScreen() + } else if (element.msRequestFullscreen) { + // IE11 + element.msRequestFullscreen() + } + } + this.fullscreen = !this.fullscreen } } } diff --git a/src/pages/modules/InStore.vue b/src/pages/modules/InStore.vue index fdc8dd0..c8fbb37 100644 --- a/src/pages/modules/InStore.vue +++ b/src/pages/modules/InStore.vue @@ -84,7 +84,7 @@
    -
  • +
  • {{i + 1}}
    {{e.palletSN}}
    {{e.productName}}
    @@ -117,7 +117,7 @@
      -
    • +
    • {{i + 1}}
      {{e.palletSN}}
      {{e.productName}}
      @@ -177,7 +177,6 @@ export default { } }, mounted () { - this.setEchart01() this.initData() this.refresh() }, @@ -199,39 +198,48 @@ export default { this.wrk = res.wrk this.kc = res.kc this.hw = res.hw + this.setEchart01() }, setEchart01 () { - let data = [ - { - value: 10, - name: '1号砖' - }, - { - value: 20, - name: '2号砖' - }, - { - value: 30, - name: '3号砖' - }, - { - value: 40, - name: '4号砖' - }, - { - value: 50, - name: '5号砖' - }, - { - value: 60, - name: '6号砖' - } - ] - // let dataName = [] + // let data = [ + // { + // value: 10, + // name: '1号砖' + // }, + // { + // value: 20, + // name: '2号砖' + // }, + // { + // value: 30, + // name: '3号砖' + // }, + // { + // value: 40, + // name: '4号砖' + // }, + // { + // value: 50, + // name: '5号砖' + // }, + // { + // value: 60, + // name: '6号砖' + // } + // ] + let dataName = [] // this.resData.mixProduction.map(el => { // dataName.push(el.name) // }) // let data = this.resData.mixProduction + let data = [] + this.kc.list.map(el => { + dataName.push(el.name) + data.push({ + value: el.number + '', + name: el.name + }) + }) var option = { legend: { // orient: 'vertical', @@ -246,8 +254,8 @@ export default { itemGap: 10.86, itemWidth: 14.16, itemHeight: 7.38, - // data: dataName - data: ['1号砖', '2号砖', '3号砖', '4号砖', '5号砖', '6号砖'] + data: dataName + // data: ['1号砖', '2号砖', '3号砖', '4号砖', '5号砖', '6号砖'] }, color: ['#0966E8', '#39E083', '#ffee0e', '#f975aa', '#32c5ff', '#f7b502'], series: [ @@ -311,17 +319,17 @@ export default { .bottom _wh(100%, 38px) background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat -.blue +.cblue color #32C5FF !important -.green - color #30EBC9 !important -.gray +.cgreen + color #6ce64e !important +.cgray color #516282 !important -.yellow +.cyellow color #E2BB0E !important -.orange +.corange color #F96700 !important -.red +.cred color #FF0000 !important .con01 width 48% diff --git a/src/pages/modules/Prod.vue b/src/pages/modules/Prod.vue index 807870b..8ea4b8e 100644 --- a/src/pages/modules/Prod.vue +++ b/src/pages/modules/Prod.vue @@ -23,7 +23,7 @@
        -
      • +
      • {{i + 1}}
        {{e.productName}}
        {{e.supplierName}}
        @@ -399,10 +399,22 @@ export default { float left _wh(11%, 44px) _fj(center) - _font(12px, 44px, #fff,,center) + _font(14px, 44px, #fff,,center) word-wrap break-word word-break break-all white-space nowrap padding 0 2px overflow hidden + .cblue div + color #32C5FF !important + .cgreen div + color #6ce64e !important + .cgray div + color #516282 !important + .cyellow div + color #E2BB0E !important + .corange div + color #F96700 !important + .cred div + color #FF0000 !important diff --git a/src/pages/modules/Weight.vue b/src/pages/modules/Weight.vue index f7314d8..5501dae 100644 --- a/src/pages/modules/Weight.vue +++ b/src/pages/modules/Weight.vue @@ -47,12 +47,12 @@

        点位状态:{{ resData.point_qty }}

      -

      称重设备:{{ resData.device_type }}

      -

      检测框架:{{ resData.frame_type }}

      +

      称重设备:{{ resData.device_type }}

      +

      检测框架:{{ resData.frame_type }}

      -

      母托扫码:{{ resData.mother_type }}

      -

      子托扫码:{{ resData.sub_type }}

      +

      母托扫码:{{ resData.mother_type }}

      +

      子托扫码:{{ resData.sub_type }}

      @@ -154,17 +154,17 @@ export default { .bottom _wh(100%, 38px) background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat -.blue +.cblue color #32C5FF !important -.green - color #30EBC9 !important -.gray +.cgreen + color #6ce64e !important +.cgray color #516282 !important -.yellow +.cyellow color #E2BB0E !important -.orange +.corange color #F96700 !important -.red +.cred color #FF0000 !important .bgred background #FF0000 !important