root/screenkb-gaoce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
xiangxy
2024-04-24 11:13:47 +08:00
parent 68e3b85d07
commit b315e0c15e
4 changed files with 96 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/pages/Setup.vue
View File

@@ -102,30 +102,30 @@ export default {
} else if (this.value === '3') { } else if (this.value === '3') {
this.$router.push('/Prod') this.$router.push('/Prod')
} }
// let element = document.documentElement let element = document.documentElement
// if (this.fullscreen) { if (this.fullscreen) {
// if (document.exitFullscreen) { if (document.exitFullscreen) {
// document.exitFullscreen() document.exitFullscreen()
// } else if (document.webkitCancelFullScreen) { } else if (document.webkitCancelFullScreen) {
// document.webkitCancelFullScreen() document.webkitCancelFullScreen()
// } else if (document.mozCancelFullScreen) { } else if (document.mozCancelFullScreen) {
// document.mozCancelFullScreen() document.mozCancelFullScreen()
// } else if (document.msExitFullscreen) { } else if (document.msExitFullscreen) {
// document.msExitFullscreen() document.msExitFullscreen()
// } }
// } else { } else {
// if (element.requestFullscreen) { if (element.requestFullscreen) {
// element.requestFullscreen() element.requestFullscreen()
// } else if (element.webkitRequestFullScreen) { } else if (element.webkitRequestFullScreen) {
// element.webkitRequestFullScreen() element.webkitRequestFullScreen()
// } else if (element.mozRequestFullScreen) { } else if (element.mozRequestFullScreen) {
// element.mozRequestFullScreen() element.mozRequestFullScreen()
// } else if (element.msRequestFullscreen) { } else if (element.msRequestFullscreen) {
// // IE11 // IE11
// element.msRequestFullscreen() element.msRequestFullscreen()
// } }
// } }
// this.fullscreen = !this.fullscreen this.fullscreen = !this.fullscreen
} }
} }
} }

86
src/pages/modules/InStore.vue
View File

@@ -84,7 +84,7 @@
<div class="scroll_container_2"> <div class="scroll_container_2">
<vue-seamless-scroll :data="kn" :class-option="defaultOption2"> <vue-seamless-scroll :data="kn" :class-option="defaultOption2">
<ul class="scroll-ul_2"> <ul class="scroll-ul_2">
<li v-for="(e, i) in kn" :key="i" :class="['green', 'red'][Number(e.state)]"> <li v-for="(e, i) in kn" :key="i">
<div class="scroll-ul_2_div">{{i + 1}}</div> <div class="scroll-ul_2_div">{{i + 1}}</div>
<div class="scroll-ul_2_div">{{e.palletSN}}</div> <div class="scroll-ul_2_div">{{e.palletSN}}</div>
<div class="scroll-ul_2_div">{{e.productName}}</div> <div class="scroll-ul_2_div">{{e.productName}}</div>
@@ -117,7 +117,7 @@
<div class="scroll_container_2"> <div class="scroll_container_2">
<vue-seamless-scroll :data="wrk" :class-option="defaultOption2"> <vue-seamless-scroll :data="wrk" :class-option="defaultOption2">
<ul class="scroll-ul_2"> <ul class="scroll-ul_2">
<li v-for="(e, i) in wrk" :key="i" :class="['green', 'red'][Number(e.state)]"> <li v-for="(e, i) in wrk" :key="i">
<div class="scroll-ul_2_div">{{i + 1}}</div> <div class="scroll-ul_2_div">{{i + 1}}</div>
<div class="scroll-ul_2_div">{{e.palletSN}}</div> <div class="scroll-ul_2_div">{{e.palletSN}}</div>
<div class="scroll-ul_2_div">{{e.productName}}</div> <div class="scroll-ul_2_div">{{e.productName}}</div>
@@ -177,7 +177,6 @@ export default {
} }
}, },
mounted () { mounted () {
this.setEchart01()
this.initData() this.initData()
this.refresh() this.refresh()
}, },
@@ -199,39 +198,48 @@ export default {
this.wrk = res.wrk this.wrk = res.wrk
this.kc = res.kc this.kc = res.kc
this.hw = res.hw this.hw = res.hw
this.setEchart01()
}, },
setEchart01 () { setEchart01 () {
let data = [ // let data = [
{ // {
value: 10, // value: 10,
name: '1号砖' // name: '1号砖'
}, // },
{ // {
value: 20, // value: 20,
name: '2号砖' // name: '2号砖'
}, // },
{ // {
value: 30, // value: 30,
name: '3号砖' // name: '3号砖'
}, // },
{ // {
value: 40, // value: 40,
name: '4号砖' // name: '4号砖'
}, // },
{ // {
value: 50, // value: 50,
name: '5号砖' // name: '5号砖'
}, // },
{ // {
value: 60, // value: 60,
name: '6号砖' // name: '6号砖'
} // }
] // ]
// let dataName = [] let dataName = []
// this.resData.mixProduction.map(el => { // this.resData.mixProduction.map(el => {
// dataName.push(el.name) // dataName.push(el.name)
// }) // })
// let data = this.resData.mixProduction // 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 = { var option = {
legend: { legend: {
// orient: 'vertical', // orient: 'vertical',
@@ -246,8 +254,8 @@ export default {
itemGap: 10.86, itemGap: 10.86,
itemWidth: 14.16, itemWidth: 14.16,
itemHeight: 7.38, itemHeight: 7.38,
// data: dataName data: dataName
data: ['1号砖', '2号砖', '3号砖', '4号砖', '5号砖', '6号砖'] // data: ['1号砖', '2号砖', '3号砖', '4号砖', '5号砖', '6号砖']
}, },
color: ['#0966E8', '#39E083', '#ffee0e', '#f975aa', '#32c5ff', '#f7b502'], color: ['#0966E8', '#39E083', '#ffee0e', '#f975aa', '#32c5ff', '#f7b502'],
series: [ series: [
@@ -311,17 +319,17 @@ export default {
.bottom .bottom
_wh(100%, 38px) _wh(100%, 38px)
background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat
.blue .cblue
color #32C5FF !important color #32C5FF !important
.green .cgreen
color #30EBC9 !important color #6ce64e !important
.gray .cgray
color #516282 !important color #516282 !important
.yellow .cyellow
color #E2BB0E !important color #E2BB0E !important
.orange .corange
color #F96700 !important color #F96700 !important
.red .cred
color #FF0000 !important color #FF0000 !important
.con01 .con01
width 48% width 48%

16
src/pages/modules/Prod.vue
View File

@@ -23,7 +23,7 @@
<div class="scroll_container_2"> <div class="scroll_container_2">
<vue-seamless-scroll :data="pt" :class-option="defaultOption2"> <vue-seamless-scroll :data="pt" :class-option="defaultOption2">
<ul class="scroll-ul_2"> <ul class="scroll-ul_2">
<li v-for="(e, i) in pt" :key="i" :class="['cgreen', 'cred'][Number(e.state)]"> <li v-for="(e, i) in pt" :key="i" :class="{cgreen:e.state =='1',cred:e.state =='0'}">
<div class="scroll-ul_2_div">{{i + 1}}</div> <div class="scroll-ul_2_div">{{i + 1}}</div>
<div class="scroll-ul_2_div">{{e.productName}}</div> <div class="scroll-ul_2_div">{{e.productName}}</div>
<div class="scroll-ul_2_div">{{e.supplierName}}</div> <div class="scroll-ul_2_div">{{e.supplierName}}</div>
@@ -399,10 +399,22 @@ export default {
float left float left
_wh(11%, 44px) _wh(11%, 44px)
_fj(center) _fj(center)
_font(12px, 44px, #fff,,center) _font(14px, 44px, #fff,,center)
word-wrap break-word word-wrap break-word
word-break break-all word-break break-all
white-space nowrap white-space nowrap
padding 0 2px padding 0 2px
overflow hidden 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
</style> </style>

22
src/pages/modules/Weight.vue
View File

@@ -47,12 +47,12 @@
<p class="li-left">点位状态:<span>{{ resData.point_qty }}</span></p> <p class="li-left">点位状态:<span>{{ resData.point_qty }}</span></p>
</div> </div>
<div class="li"> <div class="li">
<p class="li-left">称重设备:<span>{{ resData.device_type }}</span></p> <p class="li-left">称重设备:<span :class="{cgreen:resData.device_type ==='正常',cyellow:resData.device_type ==='离线',cred:resData.device_type ==='故障中'}">{{ resData.device_type }}</span></p>
<p class="li-right">检测框架:<span>{{ resData.frame_type }}</span></p> <p class="li-right">检测框架:<span :class="{cgreen:resData.frame_type ==='正常',cyellow:resData.frame_type ==='离线',cred:resData.frame_type ==='故障中'}">{{ resData.frame_type }}</span></p>
</div> </div>
<div class="li"> <div class="li">
<p class="li-left">母托扫码:<span>{{ resData.mother_type }}</span></p> <p class="li-left">母托扫码:<span :class="{cgreen:resData.mother_type ==='正常',cyellow:resData.mother_type ==='离线',cred:resData.mother_type ==='故障中'}">{{ resData.mother_type }}</span></p>
<p class="li-right">子托扫码:<span>{{ resData.sub_type }}</span></p> <p class="li-right">子托扫码:<span :class="{cgreen:resData.sub_type ==='正常',cyellow:resData.sub_type ==='离线',cred:resData.sub_type ==='故障中'}">{{ resData.sub_type }}</span></p>
</div> </div>
<div class="bottom-con"> <div class="bottom-con">
<div> <div>
@@ -154,17 +154,17 @@ export default {
.bottom .bottom
_wh(100%, 38px) _wh(100%, 38px)
background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat background center bottom / 1906px 100% url(../../images/screen1/bottom.png) no-repeat
.blue .cblue
color #32C5FF !important color #32C5FF !important
.green .cgreen
color #30EBC9 !important color #6ce64e !important
.gray .cgray
color #516282 !important color #516282 !important
.yellow .cyellow
color #E2BB0E !important color #E2BB0E !important
.orange .corange
color #F96700 !important color #F96700 !important
.red .cred
color #FF0000 !important color #FF0000 !important
.bgred .bgred
background #FF0000 !important background #FF0000 !important