From 322d44a411b63c130a65d2e74ce7233bc3f95149 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 09 一月 2025 09:08:29 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 411 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 279 insertions(+), 132 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 29250a6..36d3ed9 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -3,7 +3,7 @@
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
<view class="head">
- <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+ <text>涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -15,61 +15,11 @@
<view class="mian-item-box">
<y-box>
<view class="box-item">
- <text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
+ <text class="item-title">涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
<text class="item-subTitle">Automatic Storageand Retrieval System</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 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;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
- </view>
- </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;">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: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">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: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
- </view>
- </view>
-
- </view>
- </view>
+
<view class="box-item">
<view class="flex-row" style="width: 100%;">
<!-- 宸︿晶 -->
@@ -82,21 +32,81 @@
<!-- 鐧惧垎姣� -->
<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>
+ <!-- <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 style="width: 100%;height: 100%;height: 3vh;"></view>
+ <view style="width: 100%;display: flex;">
+ <view style="flex: 1;padding: 10px;">
+ <!-- 鏁伴噺鏄剧ず鍖哄煙 -->
+ <view style="width: 100%;display: flex;">
+ <view style="margin-left: 10px;">绔嬪簱</view>
+ <view style="flex: 1;">{{baseInfo.asrsUsed}} / {{baseInfo.asrsTotal}}</view>
+ <view style="margin-right: 10px;">{{baseInfo.asrsUsedPr}}%</view>
+ </view>
+ <view style="height: 10px;width: 100%;"></view>
+ <view style="width: 100%;background-color: #233751;height: 2vh;border-radius: 2vh;">
+ <view class="progress" :style="'width:'+ baseInfo.asrsUsedPr + '%'"></view>
+ </view>
</view>
- <view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
+ <view style="flex: 1;padding: 10px;">
+ <!-- 鏁伴噺鏄剧ず鍖哄煙 -->
+ <view style="width: 100%;display: flex;">
+ <view style="margin-left: 10px;">骞冲簱</view>
+ <view style="flex: 1;">{{baseInfo.wmsUsed}} / {{baseInfo.wmsTotal}}</view>
+ <view style="margin-right: 10px;">{{baseInfo.wmsUsedPr}}%</view>
+ </view>
+ <view style="height: 10px;width: 100%;"></view>
+ <view style="width: 100%;background-color: #233751;height: 2vh;border-radius: 2vh;">
+ <view class="progress" :style="'width:'+ baseInfo.wmsUsedPr + '%'"></view>
+ </view>
+ </view>
</view>
</view>
+
+ <view class="box-item">
+ <text class="item-title">浠婃棩鍏ュ嚭搴撶粺璁�</text>
+ <text class="item-subTitle">TODAY'S INBOUND AND OUTBOUND STATISTICS</text>
+
+ <view style="height: 20px;"></view>
+ <view class="flex-col" style="width: 100%;height: 30vh;align-items: flex-start;font-size: 1vw">
+ <!-- head -->
+ <view class="manu-head">
+ <view style="width: 30%;">鍗曟嵁鍙�</view>
+ <view style="width: 20%;">鍗曟嵁绫诲瀷</view>
+ <view style="width: 30%;">鍑哄簱鏃堕棿</view>
+ <view style="width: 20%;">鍥炲簱鏃堕棿</view>
+ <view style="width: 10%;">鐢ㄦ椂</view>
+ </view>
+ <!-- body -->
+ <view class="manu-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="manu-body-main" vertical="true"
+ display-multiple-items="6"
+ circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ <swiper-item class="manu-item" v-for="(item,i) in boundInfoList" :key="i">
+ <view style="width: 30%;">{{item.orderNo}}</view>
+ <view style="width: 20%;">{{item.docType}}</view>
+ <view style="width: 30%;">{{item.outTime}}</view>
+ <view style="width: 20%;">{{item.outTime}}</view>
+ <view style="width: 10%;">{{item.useTime}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
+ </view>
+ <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;font-size: 1.5vh">
+ <view>绱鐢ㄦ椂锛� {{mTime}}</view>
+ </view>
+ </view>
+
</view>
</y-box>
</view>
@@ -104,7 +114,7 @@
<view class="mian-item">
<view class="mian-item-box">
<view style="width: 100%;height: 100%;">
- <view style="height: 35%;">
+ <view style="height: 30%;">
<!-- 鎶樼嚎鍥� -->
<y-box>
<view class="box-item">
@@ -119,8 +129,8 @@
<!-- 鐧惧垎姣� -->
<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>
+ <text class="item-subTitle" style="font-size: 1.5vh;">浠婃棩鍏ュ簱锛�10</text>
+ <text class="item-subTitle" style="font-size: 1.5vh;">浠婃棩鍑哄簱锛�20</text>
</view>
</view>
</view>
@@ -136,7 +146,7 @@
<view style="height: 2%;"></view>
- <view style="height: 43%;">
+ <view style="height: 40%;">
<y-box>
<view class="box-item">
<view class="flex-row" style="width: 100%;">
@@ -167,7 +177,7 @@
<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/f1.png" mode="aspectFit"></image>
+ <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>
@@ -183,12 +193,40 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%;">
+ <view style="height: 26%;">
<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 class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;">
+ <view class="flex-col" style="width: 100%;height: 30vh;align-items: flex-start;font-size: 1vw">
+ <!-- head -->
+ <view class="manu-head" style="height: 3vh;">
+ <view style="width: 20%;">浠ｇ爜</view>
+ <view style="width: 20%;">鍐呭</view>
+ <view style="width: 20%;">鏁呴殰鏃堕棿</view>
+ <view style="width: 20%;">淇鏃堕棿</view>
+ <view style="width: 20%;">鍋滄満鏃堕棿</view>
+ </view>
+ <!-- body -->
+ <view class="manu-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="manu-body-main" vertical="true"
+ display-multiple-items="3"
+ circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ <swiper-item class="manu-item" v-for="(item,i) in deviceInfoList" :key="i">
+ <view style="width: 20%;">{{item.errCode}}</view>
+ <view style="width: 20%;">{{item.errContext}}</view>
+ <view style="width: 20%;">{{item.errTime}}</view>
+ <view style="width: 20%;">{{item.reTime}}</view>
+ <view style="width: 20%;">{{item.stopTime}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
+ </view>
+ <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;font-size: 1.5vh;">
+ <view>绱鐢ㄦ椂锛� {{mTime}}</view>
+ </view>
</view>
</y-box>
</view>
@@ -217,11 +255,11 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
- <view>鍟嗗搧缂栧彿</view>
- <view>鍟嗗搧鍚嶇О</view>
- <view>瑙勬牸</view>
- <view>鏁伴噺</view>
+ <view style="width: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
+ <view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
+ <view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+ <view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
+ <!-- <view style="width: 10%;">鏁伴噺</view> -->
</view>
<!-- body -->
<view class="swiper-body">
@@ -230,14 +268,22 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="8"
- circular="true" :autoplay="true" :interval="3000" :duration="1000">
+ display-multiple-items="5"
+ circular="true" :autoplay="true" :interval="3000" :duration="8000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view>No:{{i+1}}</view>
- <view>{{item.matnr}}</view>
- <view>{{item.maktx}}</view>
- <view>{{item.specs}}</view>
- <view>{{item.count}}</view>
+ <view style="width: 20%;">{{i+1}} / {{swiperList.length}}</view>
+ <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
+ <view style="width: 30%;">鍚嶇О: {{item.maknx}}</view>
+ <view style="width: 20%;">鎵�灞�: {{item.owner}}</view>
+ <view style="width: 20%;">鍝佸彿: {{item.matnr}}</view>
+
+
+ <view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
+ <view style="width: 20%;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 20%;">澶囨敞: {{item.memo}}</view>
+ <view style="width: 30%;">鍗曟嵁鍙�: {{item.orderNo}}</view>
+
+
</swiper-item>
</swiper>
</view>
@@ -276,7 +322,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">
@@ -307,7 +353,7 @@
<input type="text" v-model="baseUrl">
</view>
</view>
- </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -315,9 +361,12 @@
</view>
</view>
</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';
@@ -336,8 +385,12 @@
yDistance: 2,
xDuration: 3,
yDuration: 4,
- usedPr: 50,
- used: 3537,
+ asrsUsedPr: 1,
+ asrsUsed: 3537,
+ asrsTotal: 45666,
+ wmsUsedPr: 15,
+ wmsUsed: 669,
+ wmsTotal: 1520,
stockCount: '',
emptyCount: '',
noneCount: '',
@@ -378,9 +431,16 @@
maknx: "",
specs: "",
count: "",
- error: ""
+ error: "",
+ barcode: ""
},
- swiperList: []
+ swiperList: [],
+ boundInfoList: [],
+ deviceInfoList: [],
+ timeOut: false,
+ times: 0,
+ currDate: '',
+ mTime: 2
}
},
onShow() {
@@ -409,24 +469,44 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- this.getDate()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
+ // this.getDate()
+ this.getDate2()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.getUrl()
+ this.getBoundInfoTest()
+ this.getDeviceInfoTest()
this.controller()
// 娴嬭瘯鐢�
},1000)
},
methods: {
+ timeOut() {
+ console.log(this.times);
+ },
getUrl() {
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))
+ },
+ // 鑾峰彇鍑哄叆搴撶粺璁℃暟鎹�
+ getBoundInfoTest() {
+ let that = this
+ var result = ycqdata.boundInfoTest
+ var res = result.data
+ that.boundInfoList = res.data
+ },
+ // 鑾峰彇璁惧鏁呴殰鏁版嵁
+ getDeviceInfoTest() {
+ let that = this
+ var result = ycqdata.deviceInfoTest
+ var res = result.data
+ that.deviceInfoList = res.data
},
// 鑾峰彇閿欒淇℃伅
getInfo2() {
@@ -438,12 +518,24 @@
return;
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
+ that.infoText.title = res.data[0].title
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- }
+ // if (res.data[0].ioType === 101) {
+ // that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ // } else if(res.data[0].ioType === 103) {
+ // that.infoText.title = '妫�鏂欏嚭搴�'
+ // } else if(res.data[0].ioType === 107) {
+ // that.infoText.title = '鐩樼偣鍑哄簱'
+ // } else if(res.data[0].ioType === 1) {
+ // that.infoText.title = '鍏ュ簱'
+ // } else if(res.data[0].ioType === 10) {
+ // that.infoText.title = '绌烘墭鍏ュ簱'
+ // } else if(res.data[0].ioType === 110) {
+ // that.infoText.title = '绌烘墭鍑哄簱'
+ // }
+ that.infoText.barcode = res.data[0].barcode
+ that.infoText.workNo = res.data[0].workNo
+ that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.infoText.staNo = res.data[0].staNo
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
@@ -465,12 +557,14 @@
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) {
@@ -486,6 +580,8 @@
method:"GET",
data: {ledId:that.baseLedId},
success(result) {
+ that.timeOut = false
+ that.times = 0
var res = result.data
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
@@ -497,18 +593,35 @@
that.infoText.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ } else if(res.data[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if(res.data[0].ioType === 1) {
+ that.infoText.title = '鍏ュ簱'
+ } else if(res.data[0].ioType === 10) {
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ } else if(res.data[0].ioType === 110) {
+ that.infoText.title = '绌烘墭鍑哄簱'
}
+ that.infoText.barcode = res.data[0].barcode
+ that.infoText.workNo = res.data[0].workNo
+ that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.infoText.staNo = res.data[0].staNo
- that.infoText.matnr = res.data[0].matDtos[0].matnr
- 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
+ that.swiperList = res.data[0].matDtos
+ // that.infoText.matnr = res.data[0].matDtos[0].matnr
+ // 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
}
+ },
+ fail(err) {
+ that.timeOut = true
+ that.times = that.times+1
+ that.infoType = 0
}
})
@@ -520,18 +633,21 @@
data: {ledId:that.baseLedId},
method:"GET",
success(result) {
+ that.timeOut = false
+ that.times = 0
var res = result.data
- console.log(res);
if (res.data && res.data !== "") {
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) {
@@ -539,6 +655,10 @@
}
that.infoType = 0
}
+ },
+ fail(err) {
+ that.timeOut = true
+ that.infoType = 0
}
})
@@ -547,6 +667,31 @@
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
@@ -601,23 +746,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;
+
}
},
@@ -654,6 +783,20 @@
this.getUrl()
this.ejectShow = false
},
+ // 鏃ュ巻 鏈嶅姟鍣�
+ getDate2() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/monitor/date",
+ method:"GET",
+ success(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
+ }
+ })
+ },
+
// 鏃ュ巻
getDate() {
var dt = new Date();
@@ -677,7 +820,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()
@@ -730,6 +873,7 @@
ledId: that.baseLedId,
},
success(result) {
+ console.log(result);
var res = result.data
if (res.code === 200) {
that.baseInfo.xDistance = res.data.xDistance
@@ -799,9 +943,9 @@
}
.time-tools {
position: absolute;
- right: 2%;
- top: 2%;
- font-size:1vw;
+ right: 0;
+ top: 1%;
+ font-size:1.5vw;
transform: scale(0.8);
}
.button-left {
@@ -856,7 +1000,7 @@
border-radius: 5vw;
}
.progress {
- /* width: 90%; */
+ min-width: 5%;
height: 100%;
background-color: #FF5722;
border-radius: 5vw;
@@ -904,7 +1048,7 @@
}
.box-item {
width: 100%;
- margin-top: 4%;
+ margin-top: 2%;
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -981,12 +1125,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;
}
--
Gitblit v1.9.1