From 346a966f1d29883aaa3181b421da5e697b1c5d32 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 01 七月 2024 14:18:03 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 338 +++++++++++++++++++++++++++++++++--------
Monitor-APP/pages/home/home.css | 10
Monitor-APP/pages/home/home.vue | 125 ++++++++-------
3 files changed, 336 insertions(+), 137 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index e4c6152..25ce30e 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: 22px;
+ font-size: 1.6vw;
/* background-color: aliceblue; */
}
.swiper-head {
@@ -15,7 +15,7 @@
}
.swiper-body {
width: 100%;
- height: 90%;
+ height: 100%;
/* background-color: #aa0000; */
}
.swiper-body-main {
@@ -33,11 +33,11 @@
background-color: rgba(0, 0, 0, .2);
}
.swiper-item:nth-child(2n-1) {
- background-color: rgba(255, 255, 127, 0.1);
+ background-color: rgba(145, 145, 145, 0.1);
}
.swiper-item:first-child {
- background-color: rgba(255, 85, 0, 1.0);
+ background-color: rgba(255, 85, 0, 0.7);
}
.swiper-item:nth-child(2) {
- background-color: rgba(211, 70, 0, 1.0);
+ background-color: rgba(255, 85, 0, 0.5);
}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 05e4dc7..d9631a0 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -214,13 +214,12 @@
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
- <view class="swiper-head">
+ <!-- <view class="swiper-head">
<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>
+ <view style="width: 20%;">鎺ユ敹绔欑偣: {{infoText.staNo}}</view>
+ </view> -->
<!-- body -->
<view class="swiper-body">
<!-- swiper 涓�浜涜鏄�
@@ -228,18 +227,21 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="6"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ display-multiple-items="5"
+ circular="true" :autoplay="false" :interval="3000" :duration="2000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
- <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
+ <!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+ <view style="width: 20%;">浠诲姟鍗曞彿: {{item.taskNo}}</view>
+ <view style="width: 20%;">杞藉叿缂栧彿: {{item.barcode}}</view>
+ <view style="width: 20%;">宸ヤ綔鍙�: {{item.taskNo}}</view>
+ <view style="width: 20%;">鐗╂枡鍚嶇О: {{item.maktx}}</view>
+ <view style="width: 20%;">鐗╂枡鍙�: {{item.matnr}}</view>
-
- <view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 30%;">澶囨敞: {{item.memo}}</view>
+ <view style="width: 20%;">浠诲姟绫诲瀷: {{item.ioType$}}</view>
+ <view style="width: 20%;">鍑哄彂绔欑偣: {{item.startPoint ? item.startPoint : '--'}}</view>
+ <view style="width: 20%;">鎺ユ敹绔欑偣: {{item.targetPoint}}</view>
+ <view style="width: 20%;">杞繍鏁伴噺: {{item.anfme}}</view>
+ <!-- <view style="width: 20%;">澶囨敞: {{item.memo}}</view> -->
<!-- 11 -->
</swiper-item>
</swiper>
@@ -421,10 +423,10 @@
this.getOther()
// this.getDate()
this.getDate2()
- // this.getInfo()
+ this.getInfo()
// this.getError()
- this.getInfo2()
- this.getError2()
+ // this.getInfo2()
+ // this.getError2()
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
@@ -453,28 +455,28 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
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 = '绌烘墭鍑哄簱'
+ switch (res.data[0].ioType) {
+ case 101:
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ break;
+ case 103:
+ that.infoText.title = '妫�鏂欏嚭搴�'
+ break;
+ case 107:
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ break;
+ case 1:
+ that.infoText.title = '鍏ュ簱'
+ break;
+ case 10:
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ break;
+ case 110:
+ that.infoText.title = '绌烘墭鍑哄簱'
+ break;
}
- 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
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
+
+ that.swiperList = res.data
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -509,9 +511,9 @@
getInfo() {
let that = this
uni.request({
- url: that.commonUrl + "/monitor/led",
+ url: that.commonUrl + "/monitor/currentTask",
method:"GET",
- data: {ledId:that.baseLedId},
+ // data: {ledId:that.baseLedId},
success(result) {
that.timeOuts = false
that.times = 0
@@ -522,28 +524,28 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
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 = '绌烘墭鍑哄簱'
+ switch (res.data[0].ioType) {
+ case 101:
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ break;
+ case 103:
+ that.infoText.title = '妫�鏂欏嚭搴�'
+ break;
+ case 107:
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ break;
+ case 1:
+ that.infoText.title = '鍏ュ簱'
+ break;
+ case 10:
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ break;
+ case 110:
+ that.infoText.title = '绌烘墭鍑哄簱'
+ break;
}
- 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
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
+
+ that.swiperList = res.data
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -724,6 +726,7 @@
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
}
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 3b4790b..d407543 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -3,78 +3,274 @@
"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": "绾㈣壊",
- "total" : 200
- },
+ "data":[
{
- "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
- }
- ],
- "emptyMk": false,
- "ioType": 101
- }]
+ "taskNo": "4",
+ "status": 2,
+ "wrkNo": 6819,
+ "createTime": "2024-07-01T01:28:41.543+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": null,
+ "targetPoint": "0200602",
+ "modiUser": null,
+ "modiTime": "2024-07-01T01:28:41.543+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0004",
+ "maktx": "娴嬭瘯0004",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "娲惧彂",
+ "createTime$": "2024-07-01 09:28:41",
+ "modiTime$": "2024-07-01 09:28:41",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂14鍒�44绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ },
+ {
+ "taskNo": "1",
+ "status": 1,
+ "wrkNo": 6816,
+ "createTime": "2024-07-01T01:17:56.110+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": "1111",
+ "targetPoint": "0200602",
+ "modiUser": 9527,
+ "modiTime": "2024-07-01T01:29:47.133+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0001",
+ "maktx": "娴嬭瘯0001",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "鎺ユ敹",
+ "createTime$": "2024-07-01 09:17:56",
+ "modiTime$": "2024-07-01 09:29:47",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂25鍒�30绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ },
+ {
+ "taskNo": "2",
+ "status": 1,
+ "wrkNo": 6817,
+ "createTime": "2024-07-01T01:28:23.967+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": null,
+ "targetPoint": "0200602",
+ "modiUser": null,
+ "modiTime": "2024-07-01T01:28:23.967+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0001",
+ "maktx": "娴嬭瘯0001",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "鎺ユ敹",
+ "createTime$": "2024-07-01 09:28:23",
+ "modiTime$": "2024-07-01 09:28:23",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂15鍒�2绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ },
+ {
+ "taskNo": "3",
+ "status": 1,
+ "wrkNo": 6818,
+ "createTime": "2024-07-01T01:28:32.720+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": null,
+ "targetPoint": "0200602",
+ "modiUser": null,
+ "modiTime": "2024-07-01T01:28:32.720+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0003",
+ "maktx": "娴嬭瘯0003",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "鎺ユ敹",
+ "createTime$": "2024-07-01 09:28:32",
+ "modiTime$": "2024-07-01 09:28:32",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂14鍒�53绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ },
+ {
+ "taskNo": "5",
+ "status": 1,
+ "wrkNo": 6820,
+ "createTime": "2024-07-01T01:28:47.257+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": null,
+ "targetPoint": "0200602",
+ "modiUser": null,
+ "modiTime": "2024-07-01T01:28:47.257+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0005",
+ "maktx": "娴嬭瘯0005",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "鎺ユ敹",
+ "createTime$": "2024-07-01 09:28:47",
+ "modiTime$": "2024-07-01 09:28:47",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂14鍒�39绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ },
+ {
+ "taskNo": "6",
+ "status": 1,
+ "wrkNo": 6821,
+ "createTime": "2024-07-01T01:28:51.853+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": null,
+ "targetPoint": "0200602",
+ "modiUser": null,
+ "modiTime": "2024-07-01T01:28:51.853+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0006",
+ "maktx": "娴嬭瘯0006",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "鎺ユ敹",
+ "createTime$": "2024-07-01 09:28:51",
+ "modiTime$": "2024-07-01 09:28:51",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂14鍒�34绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ },
+ {
+ "taskNo": "7",
+ "status": 1,
+ "wrkNo": 6822,
+ "createTime": "2024-07-01T01:28:57.803+0000",
+ "ioType": 1,
+ "ioPri": 10,
+ "startPoint": null,
+ "targetPoint": "0200602",
+ "modiUser": null,
+ "modiTime": "2024-07-01T01:28:57.803+0000",
+ "memo": null,
+ "barcode": "80000001",
+ "assignTime": null,
+ "executeTime": null,
+ "completeTime": null,
+ "cancelTime": null,
+ "wrkSts": 1,
+ "crnNo": 1,
+ "commandStep": 0,
+ "transferMark": 0,
+ "originStartPoint": null,
+ "originTargetPoint": "0200602",
+ "matnr": "TTT0007",
+ "maktx": "娴嬭瘯0007",
+ "anfme": 11,
+ "ioType$": "1.鍏ュ簱",
+ "wrkSts$": "1.鐢熸垚鍏ュ簱ID",
+ "status$": "鎺ユ敹",
+ "createTime$": "2024-07-01 09:28:57",
+ "modiTime$": "2024-07-01 09:28:57",
+ "modiUser$": null,
+ "completeTime$": "",
+ "executeTime$": "",
+ "durationTime": "0澶�0灏忔椂14鍒�28绉�",
+ "assignTime$": "",
+ "cancelTime$": ""
+ }
+ ]
}
},
"dataError2": {
--
Gitblit v1.9.1