From feb6a750d8f1ef1683de4e349d2773fd7cbfc720 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 05 六月 2023 12:18:52 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 495 +++++++++----------------------------------------
Monitor-APP/pages/home/home.css | 11
Monitor-APP/pages/home/home.vue | 36 ++-
3 files changed, 123 insertions(+), 419 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index cdfe410..c2d368c 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,7 +1,7 @@
.text-content {
width: 100%;
height: 100%;
- font-size: 30px;
+ font-size: 50px;
/* background-color: aliceblue; */
}
.swiper-head {
@@ -25,11 +25,12 @@
}
.swiper-item {
display: flex;
+ flex-wrap: wrap;
align-items: center;
- /* display: grid; */
- /* align-items: center; */
- /* grid-template-columns: 2fr 3fr 2fr 1fr; */
+ text-align: start;
+ border-bottom: 2px solid #000;
+ background-color: rgba(0, 0, 0, .2);
}
.swiper-item:nth-child(2n-1) {
- background-color: rgba(255, 255, 255, .1);
+ /* background-color: rgba(255, 255, 255, .1); */
}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index aad59ba..15ca418 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,11 +217,11 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view style="width: 20%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
- <view style="width: 35%;">鍟嗗搧缂栧彿</view>
- <view style="width: 35%;">鍟嗗搧鍚嶇О</view>
- <!-- <view style="width: 20%;">瑙勬牸</view> -->
- <view style="width: 10%;">鏁伴噺</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 +230,20 @@
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="3"
+ circular="true" :autoplay="true" :interval="3000" :duration="2000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 20%;">No:{{i+1}}</view>
- <view style="width: 35%;">{{item.matnr}}</view>
- <view style="width: 35%;">{{item.maknx}}</view>
- <!-- <view style="width: 20%;">{{item.specs}}</view> -->
- <view style="width: 10%;">{{item.count}}</view>
+ <view style="width: 20%;">{{i+1}}\5</view>
+ <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
+ <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
+ <view style="width: 40%;">瀹㈡埛: {{item.info}}</view>
+
+
+ <view style="width: 20%;">鏁伴噺: {{item.count}}</view>
+ <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 40%;">澶囨敞: {{item.bz}}</view>
+
+
</swiper-item>
</swiper>
</view>
@@ -464,6 +470,9 @@
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
// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -530,6 +539,9 @@
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
// that.infoText.specs = res.data[0].matDtos[0].specs
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 2b8a110..b74b8d9 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,389 +1,81 @@
{
- "dataInfo2":
- {"data":{"msg": "鎿嶄綔鎴愬姛","code": 200,"data": [{
- "title":"鍏ㄦ澘鍑哄簱",
- "workNo":8046,
- "staNo":4,
- "sourceStaNo":null,
- "locNo":null,
- "sourceLocNo":"1500502",
- "barcode": "80009901",
- "matDtos":[
- {
- "matnr":"020101000001",
- "maknx":"63-90鍨嬪崟绔嬫煴",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- }
-
- ],
- "emptyMk":false,
- "ioType":101
- }]
- }},
- "dataError2":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}},
- "lineData":{
+ "dataInfo2": {
+ "data": {
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": [{
+ "title": "鍏ㄦ澘鍑哄簱",
+ "workNo": 8046,
+ "staNo": 200,
+ "sourceStaNo": null,
+ "locNo": null,
+ "sourceLocNo": "1500502",
+ "barcode": "80009901",
+ "matDtos": [{
+ "matnr": "020101000001",
+ "maknx": "63-90鍨嬪崟绔嬫煴",
+ "batch": null,
+ "count": 40.0,
+ "specs": "gcslxwt",
+ "info": "娴欐睙涓壃",
+ "bz": "绾㈣壊"
+ },
+ {
+ "matnr": "LPJ.SLJ.XG.037",
+ "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
+ "batch": null,
+ "count": 40.0,
+ "specs": "gcslxwt",
+ "info": "娴欐睙涓壃",
+ "bz": "鏆傚瓨"
+ },
+ {
+ "matnr": "LPJ.SLJ.XG.037",
+ "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
+ "batch": null,
+ "count": 40.0,
+ "specs": "gcslxwt",
+ "info": "娴欐睙涓壃",
+ "bz": "绾㈣壊"
+ },
+ {
+ "matnr": "LPJ.SLJ.XG.037",
+ "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
+ "batch": null,
+ "count": 40.0,
+ "specs": "gcslxwt",
+ "info": "娴欐睙涓壃",
+ "bz": ""
+ },
+ {
+ "matnr": "LPJ.SLJ.XG.037",
+ "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
+ "batch": null,
+ "count": 40.0,
+ "specs": "gcslxwt",
+ "info": "娴欐睙涓壃",
+ "bz": "17鍙锋"
+ }
+ ],
+ "emptyMk": false,
+ "ioType": 101
+ }]
+ }
+ },
+ "dataError2": {
+ "data": {
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": ""
+ }
+ },
+ "lineData": {
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
"data": {
- "rows": [
- {
+ "rows": [{
"name": "鍏ュ簱鏁伴噺",
- "data": [0,0,0,0,1,1,0,0,4,4,0,4]
+ "data": [0, 0, 0, 0, 1, 1, 0, 0, 4, 4, 0, 4]
},
{
"name": "鍑哄簱鏁伴噺",
@@ -405,7 +97,8 @@
]
}
},
- "pieData":{"msg": "鎿嶄綔鎴愬姛",
+ "pieData": {
+ "msg": "鎿嶄綔鎴愬姛",
"code": 200,
"data": {
"emptyCount": 3582,
@@ -414,8 +107,7 @@
"stockCunt": 2,
"usedPr": 0.1,
"used": 2,
- "pie": [
- {
+ "pie": [{
"name": "鍦ㄥ簱",
"value": 2
},
@@ -434,21 +126,20 @@
]
}
},
- "other":{
- "msg": "鎿嶄綔鎴愬姛",
- "code": 200,
- "data": {
- "xDistance": 15651.0,
- "xSpeed": 32704.0,
- "zSpeed": 32704.0,
- "yDistance": 15,
- "yDuration": 0.0,
- "ySpeed": 32704.0,
- "xDuration": 0.0,
- "content": "",
- "forkPos": 1,
- "isShow": false
- }
-}
-}
-
+ "other": {
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": {
+ "xDistance": 15651.0,
+ "xSpeed": 32704.0,
+ "zSpeed": 32704.0,
+ "yDistance": 15,
+ "yDuration": 0.0,
+ "ySpeed": 32704.0,
+ "xDuration": 0.0,
+ "content": "",
+ "forkPos": 1,
+ "isShow": false
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1