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 | 152 +++++++++++++++++++++++++++++---------------------
1 files changed, 87 insertions(+), 65 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 20d099f..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: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">KM</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: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">KM</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: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">H</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: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">H</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>
@@ -346,8 +306,8 @@
errorBoardShow: false,
carInfo: [],
series: [],
- homeViewShow: false,
- infoViewShow: true ,
+ homeViewShow: true,
+ infoViewShow: false ,
errorInfoViewShow: false,
homeMode: [],
infoMode: [],
@@ -368,6 +328,10 @@
"categories": [],
"series": []
},
+ "Line2": {
+ "categories": [],
+ "series": []
+ },
"Pie": {
"series": [{
"data": []
@@ -378,6 +342,7 @@
calendar: '',
ringOpts:{},
chartsDataLine1: {},
+ chartsDataLine2: {},
chartsDataPie2: {},
fontSize: '',
height: '',
@@ -414,7 +379,42 @@
timeOut: false,
times: 0,
currDate: '',
- textred: 'textred'
+ 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() {
@@ -440,12 +440,13 @@
this.getDate2()
setTimeout(()=>{
- // this.getServerData()
+ this.getServerData()
+ this.getShuttle()
// this.initlineChart()
// this.initPieChart()
// this.getOther()
setTimeout(()=>{
- // this.getServerData()
+ this.getServerData()
// this.initlineChart()
// this.initPieChart()
// this.getOther()
@@ -460,15 +461,16 @@
},
onLoad() {
setInterval(()=>{
+ // this.getServerData()
this.getDate2()
this.getUrl()
- this.getInfo()
- this.getError()
- this.getCarInfo()
+ // this.getInfo()
+ // this.getError()
+ // this.getCarInfo()
// this.getCarInfoTest()
- this.getInfo2()
+ // this.getInfo2()
// this.getError2()
- this.controller2()
+ this.controller()
},1000)
// setInterval(()=>{
@@ -483,6 +485,21 @@
},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
},
@@ -525,8 +542,13 @@
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
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(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() {
@@ -596,7 +618,7 @@
return
}
that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
- that.infoType = 1
+ that.infoType = 0
}
}
})
@@ -635,7 +657,7 @@
return;
}
that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
- that.infoType = 1
+ that.infoType = 0
}
},
controller2() {
@@ -1041,7 +1063,7 @@
width: 5vw;
}
.progressBar {
- margin-top: 9%;
+ margin-top: 5%;
/* width: 100%; */
height: 20%;
background-color: #233751;
--
Gitblit v1.9.1