From bb9e8871b4b1ebad935968ae32f3c747fac7c3a2 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期四, 17 十一月 2022 20:24:04 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 222 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 191 insertions(+), 31 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 098cfa0..f623243 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -18,37 +18,86 @@
<view class="box-item">
<text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
<text class="item-subTitle">Automatic Storageand Retrieval System</text>
- <text class="item-text">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
+ <text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
</view>
<view class="box-item">
<text class="item-title">浠撳簱鏁版嵁</text>
<text class="item-subTitle">warehouse data</text>
<view class="img-box">
+
<view class="item-img">
<image src="../../static/a1.png" mode="aspectFit"></image>
-
- <view>绱璧拌璺濈(绫�)</view>
+ <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>
+
<view class="item-img">
- <image src="../../static/a1.png" mode="aspectFit"></image>
-
- <view>绱璧拌璺濈(绫�)</view>
+ <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/a1.png" mode="aspectFit"></image>
-
- <view>绱璧拌璺濈(绫�)</view>
+ <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/a1.png" mode="aspectFit"></image>
-
- <view>绱璧拌璺濈(绫�)</view>
+ <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">
- <text class="item-title">搴撲綅浣跨敤鐜�</text>
- <text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
+ <view class="flex-row" style="width: 100%;">
+ <!-- 宸︿晶 -->
+ <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
+ <text class="item-title">搴撲綅浣跨敤鐜�</text>
+ <text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
+ </view>
+ <!-- 鍙充晶 -->
+ <view style="margin-left: auto;">
+ <!-- 鐧惧垎姣� -->
+ <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
+ <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
+ <text class="item-title">{{baseInfo.usedPr}}%</text>
+ <text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text>
+ </view>
+ </view>
+ </view>
+
+ <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="progressBar" style="width: 80%;height: 2vw;">
+ <view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
+ </view>
+ <view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
+ </view>
+ </view>
</view>
</y-box>
</view>
@@ -56,15 +105,61 @@
<view class="mian-item">
<view class="mian-item-box">
<view style="width: 100%;height: 100%;">
+ <view style="height: 40%;">
+ <!-- 鎶樼嚎鍥� -->
+ <y-box>
+ <view class="box-item">
+ <view class="flex-row" style="width: 100%;">
+ <!-- 宸︿晶 -->
+ <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
+ <text class="item-title">鍏ュ嚭搴撶粺璁�</text>
+ <text class="item-subTitle">ORDER STATISTICS</text>
+ </view>
+ <!-- 鍙充晶 -->
+ <view style="margin-left: auto;">
+ <!-- 鐧惧垎姣� -->
+ <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
+ <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
+ <text class="item-title">31</text>
+ <text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
+ </view>
+ </view>
+ </view>
+ <view class="charts-box" v-if="!showCharts">
+ <qiun-data-charts type="line" :chartData="chartsDataLine1" :echartsH5="true" :echartsApp="true"/>
+ </view>
+ </view>
+ </y-box>
+ </view>
+
+
+ <!-- null -->
+ <view style="height: 2%;"></view>
+
+
<view style="height: 38%;">
- <y-box></y-box>
+ <y-box>
+ <view class="box-item">
+ <view class="flex-row" style="width: 100%;">
+ <!-- 宸︿晶 -->
+ <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
+ <text class="item-title">搴撳瓨绫诲瀷</text>
+ <text class="item-subTitle">INCOME DATE</text>
+ </view>
+ <!-- 鍙充晶 -->
+ <view style="margin-left: auto;">
+ <!-- 鐧惧垎姣� -->
+ <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
+ <text class="item-title">浠婂ぉ</text>
+ <text class="item-subTitle">Today</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 38%;">
- <y-box></y-box>
- </view>
- <view style="height: 2%;"></view>
- <view style="height: 20%;">
+ <view style="height: 18%;">
<y-box></y-box>
</view>
</view>
@@ -83,9 +178,11 @@
</template>
<script>
+ import demodata from '@/mockdata/demodata.json';
export default {
data() {
return {
+ series: [],
homeViewShow: true,
modeClass: ['fade', 'slide-top'],
homeView: {
@@ -98,14 +195,33 @@
backgroundColor: '#4cd964',
boxShadow: '0 0 5px 1px rgba(0,0,0,0.2)'
},
+ baseInfo: {
+ xDistance: 1,
+ yDistance: 2,
+ xDuration: 3,
+ yDuration: 4,
+ usedPr: 50,
+ used: 3537
+ },
+ chartsData: {
+ "Line": {
+ "categories": [],
+ "series": []
+ },
+ "Pie": {
+ "series": [{
+ "data": []
+ }]
+ },
+ },
duration: 1000,
calendar: '',
- xDistance: '',
- yDistance: '',
- xDuration: '',
- yDuration: '',
+ ringOpts:{},
+ chartsDataLine1: {},
+ chartsDataPie2: {},
fontSize: '',
- height: ''
+ height: '',
+ showCharts: false
}
},
onShow() {
@@ -115,17 +231,26 @@
// #endif
},
onLoad() {
+ this.getServerData()
this.getDate()
setInterval(()=>{
this.getDate()
+
},1000)
setInterval(()=>{
- // this.handle(['fade', 'slide-top'])
+ this.handle(['fade', 'slide-top'])
},4000)
},
methods: {
+ getServerData() {
+ this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
+ },
handle(type) {
this.homeViewShow = !this.homeViewShow
+ setTimeout(()=>{
+ this.showCharts = !this.showCharts
+ },1000)
+
this.modeClass = type
},
// 鏃ュ巻
@@ -157,6 +282,17 @@
<style>
@import url("../../static/css/common.css");
+ /* 鍒� */
+ .flex-col {
+ display: flex;
+ flex-direction: column;
+ }
+ /* 琛� */
+ .flex-row {
+ display: flex;
+ flex-direction: row;
+ }
+
.container{
width: 100vw;
min-height: 100vh;
@@ -219,6 +355,25 @@
width: 13.5%;
height: 8.5%;
}
+ .progressBar {
+ margin-top: 9%;
+ /* width: 100%; */
+ height: 20%;
+ background-color: #233751;
+ border-radius: 5vw;
+ }
+ .progress {
+ /* width: 90%; */
+ height: 100%;
+ background-color: #FF5722;
+ border-radius: 5vw;
+ }
+ .charts-box {
+ width: 80%;
+ height: 24vh;
+ margin-left: 10%;
+ }
+
@@ -244,7 +399,7 @@
}
.box-item {
width: 100%;
- margin-top: 2%;
+ margin-top: 4%;
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -256,30 +411,35 @@
}
.item-subTitle {
font-size:0.5vw;
- text-indent: 1em;
+ text-indent: 0em;
}
.item-text {
font-size: 1vw;
text-indent: 2em;
letter-spacing: 1px;
+ line-height: 3vh;
}
.img-box {
width: 100%;
- background-color: #666666;
+ /* background-color: #666666; */
display: flex;
flex-direction: row;
justify-content: flex-start;
flex-wrap: wrap;
+ font-size: 1vw;
}
.item-img {
width: 50%;
- margin-top: 3%;
- background-color: #00ffff;
+ margin-top: 5%;
display: flex;
flex-direction: row;
+ /* background-color: #00ffff; */
justify-content: flex-start;
align-items: flex-start;
}
+ .distance {
+
+ }
.item-img image {
height: 5vw;
width: 5vw;
--
Gitblit v1.9.1