From edc8494de36373d8d67c69201c4eeed0b0f96f08 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 16 十二月 2023 13:10:39 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 588 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 429 insertions(+), 159 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 740c142..a283896 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -15,59 +15,19 @@
<view class="mian-item-box">
<y-box>
<view class="box-item">
- <text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
- <text class="item-subTitle">Automatic Storageand Retrieval System</text>
- <text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
+ <text class="item-title">鎻愬崌鏈鸿繍琛屾暟鎹�</text>
+ <text class="item-subTitle">Hoist operating data</text>
+ <view style="width: 100%;height: 25vh;">
+ <qiun-data-charts type="column" :chartData="chartsDataLine2" :opts="opts" :echartsH5="true" :echartsApp="true"/>
+ </view>
</view>
<view class="box-item">
- <text class="item-title">浠撳簱鏁版嵁</text>
- <text class="item-subTitle">warehouse data</text>
+ <text class="item-title">绌挎杞﹁繍琛屾暟鎹�</text>
+ <text class="item-subTitle">Shuttle operation data</text>
<view class="img-box">
-
- <view class="item-img">
- <image src="../../static/a1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
- </view>
+ <view style="width: 100%;height: 25vh;">
+ <qiun-data-charts type="ring" :chartData="chartsDataPie3" />
</view>
-
- <view class="item-img">
- <image src="../../static/b1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/c1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/d1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
- </view>
- </view>
-
</view>
</view>
<view class="box-item">
@@ -90,7 +50,7 @@
<view class="flex-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
<!-- 杩涘害鏉� -->
- <view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
+ <view class="flex-row" style="width: 100%;position: relative;">
<view class="progressBar" style="width: 80%;height: 2vw;">
<view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
</view>
@@ -167,13 +127,13 @@
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
+ <image src="../../static/f1.png" mode="aspectFit"></image>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
+ <image src="../../static/e1.png" mode="aspectFit"></image>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
</view>
</view>
@@ -186,9 +146,7 @@
<view style="height: 18%;">
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
- <!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
鑷姩浠撳簱WCS鐩戞帶骞冲彴
- <!-- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
</view>
</y-box>
</view>
@@ -213,12 +171,42 @@
<view class="info-main">
<view class="info-box">
<y-box>
- <view class="info-box-text">
- <view class="flex-col info-box-text-item">鐩爣绔欙細{{infoText.staNo}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧缂栧彿锛歿{infoText.matnr}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧鍚嶇О锛歿{infoText.maknx}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧瑙勬牸锛歿{infoText.specs}}</view>
- <view class="flex-col info-box-text-item">鏁伴噺锛歿{infoText.count}}</view>
+ <!-- 鏂囨湰瀹瑰櫒 -->
+ <view class="text-content">
+ <!-- head -->
+ <!-- <view class="swiper-head">
+ <view style="flex: 1;">浣滀笟鏁伴噺锛歿{infoText.barcode}}</view>
+ <view style="flex: 1;">鍓╀綑鏁伴噺</view>
+ </view> -->
+ <view class="swiper-head" v-show="swiperList.length > 0">
+ <view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
+ <view style="flex: 2;">{{infoText.title2}} <br />鍟嗗搧缂栧彿</view>
+ <view style="flex: 2;">绠辩爜</view>
+ <view style="flex: 2;">鍟嗗搧鍚嶇О</view>
+ <view style="flex: 5;">瑙勬牸</view>
+ <view style="flex: 1;">浣滀笟鏁伴噺</view>
+ <view style="flex: 1;">鍓╀綑鏁伴噺</view>
+ </view>
+ <!-- body -->
+ <view class="swiper-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="swiper-body-main" vertical="true"
+ display-multiple-items="15"
+ circular="true" :autoplay="true" :interval="3000" :duration="1000">
+ <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i" :style="item.color">
+ <view style="flex: 2;word-break: break-all;">{{item.orderNo ? item.orderNo : '--'}}</view>
+ <view style="flex: 2;">{{item.matNo}}</view>
+ <view style="flex: 2;">{{item.containerCode}}</view>
+ <view style="flex: 2;">{{item.maknx}}</view>
+ <view style="flex: 5;">{{item.specs}}</view>
+ <view style="flex: 1;">{{item.count}}</view>
+ <view style="flex: 1;">{{item.total}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
</view>
</y-box>
</view>
@@ -254,7 +242,7 @@
<!-- 寮瑰嚭title -->
<view class="eject-title">淇敼 / 閰嶇疆</view>
<!-- input -->
- <view class="eject-input">
+ <scroll-view scroll-y class="eject-input">
<view class="item">
<view class="desc">ip锛�</view>
<view class="input">
@@ -285,7 +273,7 @@
<input type="text" v-model="baseUrl">
</view>
</view>
- </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -293,15 +281,30 @@
</view>
</view>
</view>
+ <!-- 灏忚溅寮傚父 -->
+ <view class="board">
+ <uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
+ <view class="error-board" >
+ <text v-for="item in carInfo">{{item}}</text>
+ </view>
+ </uni-transition>
+ </view>
+
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ 杩炴帴瓒呮椂: {{times}} s
+ </view>
</view>
</template>
-
+<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
<script>
import demodata from '@/mockdata/demodata.json';
import ycqdata from '@/pages/index/data.json';
export default {
data() {
return {
+ newModeClass: 'slide-top',
+ errorBoardShow: false,
+ carInfo: [],
series: [],
homeViewShow: true,
infoViewShow: false ,
@@ -325,6 +328,10 @@
"categories": [],
"series": []
},
+ "Line2": {
+ "categories": [],
+ "series": []
+ },
"Pie": {
"series": [{
"data": []
@@ -335,6 +342,7 @@
calendar: '',
ringOpts:{},
chartsDataLine1: {},
+ chartsDataLine2: {},
chartsDataPie2: {},
fontSize: '',
height: '',
@@ -350,17 +358,63 @@
infoType: 0,
text: '',
infoText: {
- title: '鍏ㄦ澘鍑哄簱',
- staNo: "200",
- matnr: "300",
- maknx: "400",
- specs: "500",
- count: "600",
- error: "鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涖��"
+ title: '鑷姩浠撳簱WCS鐩戞帶骞冲彴',
+ title2: '',
+ staNo: "",
+ matnr: "",
+ maknx: "",
+ specs: "",
+ count: "",
+ error: "",
+ barcode: "",
+ orderNo: '',
+ batch: '',
+ doneOfTray: '',
+ totalOfTray: '',
+ doneOfUnit: '',
+ totalOfUnit: '',
+ ctnNo: '1'
},
-
-
-
+ swiperList: [],
+ timeOut: false,
+ times: 0,
+ currDate: '',
+ textred: 'textred',
+ opts: {
+ rotate: false,
+ rotateLock: false,
+ color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
+ padding: [5,5,5,5],
+ dataLabel: true,
+ enableScroll: false,
+ legend: {
+ show: true,
+ position: "right",
+ lineHeight: 25
+ },
+ title: {
+ name: "鏀剁泭鐜�",
+ fontSize: 15,
+ color: "#FFF"
+ },
+ subtitle: {
+ name: "70%",
+ fontSize: 25,
+ // color: "#7cb5ec"
+ },
+ extra: {
+ ring: {
+ ringWidth: 60,
+ activeOpacity: 0.5,
+ activeRadius: 10,
+ offsetAngle: 0,
+ labelWidth: 15,
+ border: true,
+ // borderWidth: 3,
+ borderColor: "#FFFFFF"
+ }
+ }
+ }
}
},
onShow() {
@@ -381,60 +435,127 @@
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
- this.getUrl()
+
+
+
+ this.getDate2()
+ setTimeout(()=>{
+ this.getServerData()
+ this.getShuttle()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
+ setTimeout(()=>{
+ this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
+ setTimeout(()=>{
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
+ },3000)
+ },1000)
+ },1000)
},
onLoad() {
-
- // this.getServerData()
- this.getDate()
setInterval(()=>{
- this.getDate()
- this.getInfo()
- this.getError()
+ // this.getServerData()
+ this.getDate2()
this.getUrl()
- // 娴嬭瘯鐢�
+ // this.getInfo()
+ // this.getError()
+ // this.getCarInfo()
+ // this.getCarInfoTest()
// this.getInfo2()
// this.getError2()
this.controller()
},1000)
+
+ // setInterval(()=>{
+ // this.changeErrorShow()
+ // },5000)
+
setInterval(()=>{
- // this.controller()
- },2000)
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
+ },600000)
},
methods: {
+ getShuttle() {
+ let res = ycqdata.infoData2.data
+ this.shuttleInfoModel(res)
+ },
+ shuttleInfoModel(res) {
+ if (res.code == 200 && res.data != '') {
+ let arr = []
+ for (let k of res.data.shuttle) {
+ arr.push(k.count)
+ }
+ this.chartsData.Line2.series = arr
+ } else {
+
+ }
+ },
+ changeErrorShow() {
+ this.errorBoardShow = !this.errorBoardShow
+ },
+ getCarInfoTest() {
+ let that = this
+ var result = ycqdata.carError
+ var res = result.data
+ that.carInfoModel(res)
+ },
+ getCarInfo() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/monitor/device/error",
+ method:"GET",
+ success(result) {
+ var res = result.data
+ that.carInfoModel(res)
+ }
+ })
+ },
+ carInfoModel(res) {
+ let infoList = []
+
+ if (res.code == 200 && res.data != '') {
+ let str = ''
+ for (let k of res.data) {
+ str = `${k.deviceNo}鍙�${k.device}-${k.errorMsg}`
+ infoList.push(str)
+ }
+ this.carInfo = infoList
+ this.errorBoardShow = true
+ } else {
+ this.errorBoardShow = false
+ }
+ },
+ timeOuts() {
+ console.log(this.times);
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
- // getServerData() {
- // this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
- // this.chartsDataPie2=JSON.parse(JSON.stringify(demodata.PieA))
- // },
+ getServerData() {
+ // this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
+ // this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
+
+ this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
+ this.chartsDataPie2=JSON.parse(JSON.stringify(demodata.Pie))
+ this.chartsDataLine2=JSON.parse(JSON.stringify(demodata.Line))
+ this.chartsDataPie3=JSON.parse(JSON.stringify(demodata.Pie))
+ },
// 鑾峰彇閿欒淇℃伅
getInfo2() {
let that = this
var result = ycqdata.dataInfo2
var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
- that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- }
- that.infoText.staNo = res.data[0].staNo
- that.infoText.specs = res.data[0].matDtos[0].specs
- that.infoText.maknx = res.data[0].matDtos[0].maknx
- that.infoText.count = res.data[0].matDtos[0].count
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
},
getError2 () {
let that = this
@@ -466,27 +587,7 @@
data: {ledId:that.baseLedId},
success(result) {
var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
- that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- }
- that.infoText.staNo = res.data[0].staNo
- that.infoText.specs = res.data[0].matDtos[0].specs
- that.infoText.maknx = res.data[0].matDtos[0].maknx
- that.infoText.count = res.data[0].matDtos[0].count
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
}
})
@@ -495,6 +596,7 @@
let that = this
uni.request({
url: that.commonUrl + "/monitor/led/error",
+ data: {ledId:that.baseLedId},
method:"GET",
success(result) {
var res = result.data
@@ -502,27 +604,149 @@
var errorInfo = res.data
if (that.infoType == 1) {
that.infoType = 3
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
return
}
that.infoType = 2
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
return
}
+ that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
that.infoType = 0
}
}
})
},
+ infoModel(res) {
+ let that = this
+ if (res.data && res.data !== "") {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
+ that.infoType = 1
+ if (res.data[0].ioType === 101) {
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ that.infoText.title2 = '鍏ㄦ澘鍑哄簱'
+ } else if(res.data[0].ioType === 103) {
+ that.infoText.title = '妫�鏂欏嚭搴�'
+ that.infoText.title2 = '妫�鏂欏嚭搴�'
+ } else if(res.data[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ that.infoText.title2 = '鐩樼偣鍑哄簱'
+ }
+ res.data[0].matDtos
+ for(let k in res.data[0].matDtos) {
+
+ if(res.data[0].matDtos[k].count == 0) {
+ res.data[0].matDtos[k]['color'] = 'color: #df741c'
+ }
+ }
+ that.infoText.staNo = res.data[0].staNo
+ that.infoText.barcode = res.data[0].barcode
+ that.swiperList = res.data[0].matDtos
+ } else {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
+ that.infoType = 0
+ }
+ },
+ controller2() {
+ switch(this.infoType) {
+ case 1:
+ if (this.homeViewShow) {
+ this.homeViewShow = false
+ this.homeMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.infoViewShow = true
+ this.infoMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.errorInfoViewShow) {
+ this.errorInfoViewShow = false
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.infoViewShow = true
+ this.infoMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
+ // 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
+ case 2:
+ if (this.homeViewShow) {
+ this.homeViewShow = false
+ this.homeMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.errorInfoViewShow = true
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.infoViewShow) {
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.errorInfoViewShow = true
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
+ // 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
+ case 3:
+ if (this.homeViewShow) {
+ this.homeViewShow = false
+ this.homeMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.errorInfoViewShow = true
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.infoViewShow) {
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.errorInfoViewShow = true
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
+
+ }
+ },
// 鎺у埗鍣�
controller() {
switch(this.infoType) {
// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+ case 0:
+ if (this.errorInfoViewShow) {
+ this.errorInfoViewShow = false
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.infoViewShow) {
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.errorInfoViewShow && this.infoViewShow) {
+ this.errorInfoViewShow = false
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
case 1:
if (this.homeViewShow) {
this.homeViewShow = false
@@ -577,23 +801,7 @@
},1000)
}
return;
- default :
- if (this.errorInfoViewShow) {
- this.errorInfoViewShow = false
- this.errorInfoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
+
}
},
@@ -630,6 +838,27 @@
this.getUrl()
this.ejectShow = false
},
+ // 鏃ュ巻 鏈嶅姟鍣�
+ getDate2() {
+ let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
+ uni.request({
+ url: that.commonUrl + "/monitor/date",
+ method:"GET",
+ success(result) {
+ // console.log(result);
+ var res = result.data.data
+ that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+ that.currDate = res.year + "/" + res.month + "/" + res.day
+ },
+ fail(res) {
+ }
+
+ })
+ },
+
// 鏃ュ巻
getDate() {
var dt = new Date();
@@ -653,7 +882,7 @@
this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
},
getDateFormat(value) {
- var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
+ var date = new Date(this.currDate);// 鑾峰彇褰撳墠鏃堕棿
date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
var m = date.getMonth() + 1
var d = date.getDate()
@@ -663,6 +892,9 @@
/*************** 鎶樼嚎鍥� *****************************************************************************************************/
initlineChart() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/line/charts",
method:'GET',
@@ -681,6 +913,9 @@
/*************** 楗煎浘 *****************************************************************************************************/
initPieChart() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/loc/rep",
method:'GET',
@@ -688,17 +923,20 @@
var res = result.data
if (res.code === 200) {
that.chartsData.Pie.series[0].data = res.data.pie
- that.stockCount = res.data.stockCunt
- that.emptyCount = res.data.emptyCount
- that.noneCount = res.data.noneCount
- that.used = res.data.used
- that.usedPr = res.data.usedPr
+ that.baseInfo.stockCount = res.data.stockCunt
+ that.baseInfo.emptyCount = res.data.emptyCount
+ that.baseInfo.noneCount = res.data.noneCount
+ that.baseInfo.used = res.data.used
+ that.baseInfo.usedPr = res.data.usedPr
}
}
})
},
getOther() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/other",
data: {
@@ -727,6 +965,7 @@
<style>
/* @import url("../../static/css/common.css"); */
+ @import url("home.css");
/* 鍒� */
.flex-col {
display: flex;
@@ -824,7 +1063,7 @@
width: 5vw;
}
.progressBar {
- margin-top: 9%;
+ margin-top: 5%;
/* width: 100%; */
height: 20%;
background-color: #233751;
@@ -852,6 +1091,9 @@
.sub-info image {
width: 3.5vw;
height: 3.5vw;
+ }
+ .red{
+ color: red
}
@@ -956,12 +1198,15 @@
text-align: center;
}
.eject-input {
-
+ margin-top: 2vh;
+ height: 25vh;
+ /* background-color: #00163E; */
+ ::-webkit-scrollbar{display:none}
}
.item {
display: flex;
align-items: center;
- margin: 2vh 0 0 0;
+ margin: 1vh 0 0 0;
font-size: 1.5vw;
color: #363636;
}
@@ -1020,5 +1265,30 @@
.info-box-text-item {
height: 20%;font-size: 8vh;
justify-content: center;
+ white-space: pre-line;
+ }
+ .textred{
+ color: red;
+ }
+
+ .board {
+ position: absolute;
+ top: 0;
+ right: 0;
+ /* background-color: #aa00ff; */
+ /* height: 13vh; */
+ width: 100%;
+ /* box-shadow: rgba(0,0,0,.35) 0px 5px 15px; */
+ }
+ .error-board {
+ margin: .2rem;
+ height: 11vh;
+ background-color: #F56C6C;
+ box-shadow: rgba(0,0,0,.35) 0px 5px 15px;
+ border-radius: .2rem;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ font-size: 2rem;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1