From dce0fb61398bad714a45ea7ab3e7ba200433129c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 12 九月 2024 14:41:43 +0800
Subject: [PATCH] 未完成
---
Monitor-APP/pages/index/data.json | 122 ++++++++++++++----------------
Monitor-APP/pages/home/home.vue | 78 ++++++++++++-------
2 files changed, 106 insertions(+), 94 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 546e957..1c677a4 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -92,12 +92,12 @@
<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 swiperList" :key="i">
- <view style="width: 30%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.owner}}</view>
- <view style="width: 30%;">{{item.matnr}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 10%;">{{item.orderNo}}</view>
+ <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>
@@ -129,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>
@@ -214,12 +214,12 @@
<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 swiperList" :key="i">
- <view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.owner}}</view>
- <view style="width: 20%;">{{item.matnr}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 20%;">{{item.orderNo}}</view>
+ <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>
@@ -279,7 +279,8 @@
<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 20%;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 20%;">澶囨敞: {{item.memo}}</view>
<view style="width: 30%;">鍗曟嵁鍙�: {{item.orderNo}}</view>
@@ -434,6 +435,8 @@
barcode: ""
},
swiperList: [],
+ boundInfoList: [],
+ deviceInfoList: [],
timeOut: false,
times: 0,
currDate: '',
@@ -473,7 +476,9 @@
this.getInfo2()
this.getError2()
this.getUrl()
- // this.controller()
+ this.getBoundInfoTest()
+ this.getDeviceInfoTest()
+ this.controller()
// 娴嬭瘯鐢�
},1000)
@@ -489,6 +494,20 @@
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() {
let that = this
@@ -499,20 +518,21 @@
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 = '妫�鏂欏嚭搴�'
- } 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 = '绌烘墭鍑哄簱'
- }
+ // 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
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index d8a5284..e31b3da 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -4,7 +4,7 @@
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
"data": [{
- "title": "鍏ㄦ澘鍑哄簱",
+ "title": "姝ゅ崟鏄敓浜ч鏂�",
"workNo": 8046,
"staNo": 200,
"sourceStaNo": null,
@@ -17,81 +17,69 @@
"batch": null,
"count": 40.0,
"specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "绾㈣壊",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "鏆傚瓨",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "绾㈣壊",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "17鍙锋",
+ "owner": "娴欐睙涓壃",
+ "memeo": "绾㈣壊",
+ "orderNo": "135645",
"total" : 200
}
+
],
"emptyMk": false,
"ioType": 101
}]
}
},
+
"dataError2": {
"data": {
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
"data": ""
+ }
+ },
+ "boundInfoTest": {
+ "data": {
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": {
+ "totalTime": "7鍒�09绉�",
+ "detls": [
+ {
+ "orderNo": "CK240910165887",
+ "docType": "鍑哄簱鍗�",
+ "outTime": "9-10 13:11",
+ "inTime": "9-10 20:20",
+ "useTime": "7鍒�09绉�"
+ }
+ ]
+ }
+ }
+ },
+ "deviceInfoTest": {
+ "data": {
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": {
+ "totalTime": "7鍒�09绉�",
+ "detls":[
+ {
+ "errCode": "ERRDD3",
+ "errContext": "鍫嗗灈鏈烘晠闅�",
+ "errTime": "9-10 13:11",
+ "reTime": "9-10 20:20",
+ "stopTime": "7鍒�09绉�"
+ },
+ {
+ "errCode": "ERRDD3",
+ "errContext": "鍫嗗灈鏈烘晠闅�",
+ "errTime": "9-10 13:11",
+ "reTime": "9-10 20:20",
+ "stopTime": "7鍒�09绉�"
+ }
+
+ ]
+ }
+
}
},
"lineData": {
@@ -130,8 +118,12 @@
"noneCount": 256,
"total": 3840,
"stockCunt": 2,
- "usedPr": 0.1,
- "used": 2,
+ "asrsUsedPr": 1,
+ "asrsUsed": 3537,
+ "asrsTotal": 45666,
+ "wmsUsedPr": 15,
+ "wmsUsed": 669,
+ "wmsTotal": 1520,
"pie": [{
"name": "鍦ㄥ簱",
"value": 2
--
Gitblit v1.9.1