From 36909d121a6f1b4c3f4540b8c64c80e872d105ae Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 五月 2025 15:12:32 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/index.vue | 453 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 334 insertions(+), 119 deletions(-)
diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index 55653ea..b24e432 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -6,7 +6,7 @@
<view class="head">
<text @click="port()">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
<view class="time-tools">{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}} {{week}}</view>
- <view class="button-left" @click="url()"></view>
+ <view class="button-left" @click="ejected()"></view>
<view class="button-right" @click="ledId()"></view>
</view>
<view class="main">
@@ -16,24 +16,58 @@
<view class="box-border box-border2"></view>
<view class="box-border box-border3"></view>
<view class="box-border box-border4"></view>
- <!-- 鍏ㄦ澘鍑哄簱 -->
- <view style="width: 10%;height: 100%;display:inline-block;float: left;text-align: center;padding-top: 180px;">
- <text>{{title}}</text>
+ <view style="width: 100%;height: 100%;" v-show="!errorShow">
+ <!-- 鍒嗘湁鏃犺鍗曞垝鍒嗕袱閮ㄥ垎 -->
+ <!-- 宸︿晶淇℃伅 -->
+ <view style="" :class="width">
+ <!-- 鍏ㄦ澘鍑哄簱 -->
+ <view class="box-items">{{title}}</view>
+ <!-- 鐩爣绔� -->
+ <view class="box-items">{{staNo}}</view>
+ <!-- 鍟嗗搧缂栧彿 -->
+ <!-- <view class="box-items">{{matnr}}</view> -->
+ <!-- 鍟嗗搧鍚嶇О -->
+ <view class="box-items">{{maknx}}</view>
+ <!-- 鍟嗗搧鍚嶇О -->
+ <view class="box-items">{{specs}}</view>
+ <!-- 鍑哄簱鏁伴噺 -->
+ <view class="box-items">{{count}}</view>
+ </view>
+ <view style="width: 50%;height: 100%;display: inline-block;float: left;" v-show="orderShow">
+ <!-- 璁㈠崟鍙� -->
+ <view class="box-items">{{orderNo}}</view>
+ <!-- 宸插嚭鎵樼洏鏁� -->
+ <view class="box-items">{{doneOfTray}}</view>
+ <!-- 鎵樼洏鎬绘暟閲� -->
+ <view class="box-items">{{totalOfTray}}</view>
+ <!-- 宸插嚭绠辨暟 -->
+ <view class="box-items">{{doneOfUnit}}</view>
+ <!-- 鎬荤鏁� -->
+ <view class="box-items">{{totalOfUnit}}</view>
+ </view>
</view>
+ <view style="width: 100%;height: 100%;" v-show="errorShow">
+ <view style="line-height: 700px;font-size: 175rpx;">{{errorMsg}}</view>
+ </view>
+
+ <!-- 鍏ㄦ澘鍑哄簱 -->
+ <!-- <view style="width: 10%;height: 100%;display:inline-block;float: left;text-align: center;padding-top: 180px;">
+ <text>{{title}}</text>
+ </view> -->
<!-- 婊氬姩鍖哄煙 -->
- <view style="width: 80%;height: 100%;display: inline-block;">
+ <!-- <view style="width: 80%;height: 100%;display: inline-block;"> -->
<!--鏄剧ずorder璁㈠崟缂栧彿 -->
- <text v-show="orderShow" style="display: block;font-size: 140rpx;" >{{orderNo}}</text>
+ <!-- <text v-show="orderShow" style="display: block;font-size: 140rpx;" >{{orderNo}}</text>
<swiper :class="swiper" circular="true" vertical="true" display-multiple-items="6" :autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item v-for="(item,index) in matList" :key="index">
<view style="font-size: 160rpx;">{{item}}</view>
</swiper-item>
</swiper>
- </view>
+ </view> -->
<!-- 绔欏彴鍙� -->
- <view style="width: 10%;height: 100%;display: inline-block;float: right;padding-top: 180px;">
+ <!-- <view style="width: 10%;height: 100%;display: inline-block;float: right;padding-top: 180px;">
<text>{{staNo}}</text>
- </view>
+ </view> -->
</view>
</view>
</view>
@@ -42,7 +76,7 @@
<view class="head">
<text @click="port()">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
<view class="time-tools">{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}} {{week}}</view>
- <view class="button-left" @click="url()"></view>
+ <view class="button-left" @click="ejected()"></view>
<view class="button-right" @click="ledId()"></view>
</view>
<view class="main">
@@ -155,7 +189,6 @@
<p class="english">Today</p>
</view>
<view class="sub-main">
- <!-- 鎶樼嚎鍥� -->
<view class="charts-box ring">
<qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
</view>
@@ -186,8 +219,8 @@
<view class="box-border box-border4"></view>
<!-- <text>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</text>
<text>褰撳墠鐗堟湰鍙�</text> -->
- <view @click="crn()">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</view>
- <image src="../../static/barcode.png" mode="aspectFit"></image>
+ <view @click="crn()">鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃</view>
+ <!-- <image src="../../static/barcode.png" mode="aspectFit"></image> -->
</view>
</view>
</view>
@@ -219,6 +252,46 @@
<uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆鍫嗗灈鏈�" :value="crnId"
placeholder="绀轰緥:1" @confirm="crnConfirm"></uni-popup-dialog>
</uni-popup>
+ </view>
+ <!-- 鑷畾涔夊脊鍑哄眰 -->
+ <view class="eject-mask" v-show="ejectShow">
+ <view class="eject">
+ <!-- 寮瑰嚭title -->
+ <view class="eject-title">淇敼 / 閰嶇疆</view>
+ <!-- input -->
+ <view class="eject-input">
+ <view class="item">
+ <view class="desc">ip锛�</view>
+ <view class="input">
+ <input type="text" v-model="baseIP">
+ </view>
+ </view>
+ <view class="item">
+ <view class="desc">port锛�</view>
+ <view class="input">
+ <input type="text" v-model="basePort">
+ </view>
+ </view>
+ <view class="item">
+ <view class="desc">ledId锛�</view>
+ <view class="input">
+ <input type="text" v-model="baseLedId">
+ </view>
+ </view>
+ <view class="item">
+ <view class="desc">CrnId锛�</view>
+ <view class="input">
+ <input type="text" v-model="baseCrnId">
+ </view>
+ </view>
+ </view>
+ <!-- button -->
+ <view class="eject-button">
+ <view class="button-item" @click="ejectClose">鍙� 娑�</view>
+ <view class="button-item" @click="ejectConfirm">纭� 璁�</view>
+ </view>
+ </view>
+
</view>
</view>
</template>
@@ -270,7 +343,7 @@
week:'鏄熸湡鍥�',
ani:'',
// move: 'upMove 1.5s 1;',
- move:true,
+ move:false,
topMove:'topUp',
floorMove:'',
version:'',
@@ -279,16 +352,28 @@
errorPaper:'',
title:'',
staNo:'',
+ matnr:'',
+ maknx:'',
+ specs:'',
+ count:'',
+ orderNo:null,
+ doneOfTray:'',
+ totalOfTray:'',
+ doneOfUnit:'',
+ totalOfUnit:'',
+ errorMsg:null,
+ width:'full-width',
errorShow:'',
pakinShow:'',
pakinGun:'',
orderShow:false,
- orderNo:null,
swiper:'swiper-here',
autoplay:true, // 鑷姩寰幆
interval:1000, // 璋冪敤鏃堕暱
duration:8000, // 绉诲姩閫熷害
matList:[], // 璁㈠崟鍒楄〃
+ ejectShow: false,
+
}
},
mounted() {
@@ -297,38 +382,105 @@
const BaseLedId = uni.getStorageSync('BaseLedId');
const BasePort = uni.getStorageSync('BasePort');
const BaseCrnId = uni.getStorageSync('BaseCrnId');
- if (BaseIP && BaseLedId) {
that.baseIP = BaseIP
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
- } else {
- that.baseUrl = ''
- that.baseLedId = ''
- }
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + this.baseUrl
+ this.getUrl()
+ },
+ onLoad() {
+
},
onReady() {
- // 鑾峰緱鍒濆鏁版嵁
- setTimeout(() => {
+ setInterval(() => {
+ // 鑾峰緱鍒濆鏁版嵁
this.initlineChart();
this.initPieChart();
- }, 0);
- setTimeout(() => {
+ // 涓婚〉淇℃伅
this.getServerData();
this.getOther();
- this.getPakin();
- }, 1000);
- setInterval(() => {
+ // 鍏朵粬淇℃伅
this.getDate();
this.getPakin();
this.getError();
// this.getYYY();
// this.getEEE();
- this.animation();
- },2000)
+ this.animation()
+ this.getUrl()
+ },1000)
},
methods: {
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + this.baseUrl
+ this.chartsDataLine1 = JSON.parse(JSON.stringify(demodata.Line))
+ },
+ // 鑾峰彇閿欒淇℃伅
+ getYYY() {
+ let that = this
+ var result = ycqdata.dataEEE
+ // 娴嬭瘯鐢� 鈫�
+ var res = result.data
+ // 娴嬭瘯鐢� 鈫�
+ // 杩斿洖缁撴灉鏈夊�� 涓斿�间笉绛変簬绌哄�� 灏辨槸鏈夐敊璇俊鎭渶瑕佸睍绀�
+ if (res.data && res.data !== "") {
+
+ that.errorMsg = res.data
+ that.errorShow = true
+ that.move = false // 鏄剧ず
+ } else {
+ that.errorPaper = ''
+ that.errorShow = false
+ if (that.pakinShow) {
+ return;
+ } else {
+ that.move = true // 闅愯棌
+ }
+ }
+ },
+ getEEE () {
+ let that = this
+ var newsData = ''
+ var str = ''
+ let result = ycqdata.dataYYY
+ // 娴嬭瘯鐢� 鈫�
+ let res = result.data
+ // 娴嬭瘯鐢� 鈫�
+ if(res.data && res.data !== null) {
+ if (res.data[0].ioType === 101) {
+ that.title = '鍏ㄦ澘鍑哄簱'
+ } else if(res.data[0].ioType === 103) {
+ that.title = '妫�鏂欏嚭搴�'
+ }
+ that.staNo = '鐩爣绔�:' + res.data[0].staNo
+ that.matnr = '鍟嗗搧缂栧彿锛�' + res.data[0].matDtos[0].matnr
+ that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].maknx
+ that.count = '鍑哄簱鏁伴噺锛�' + res.data[0].matDtos[0].count
+ if (res.data[0].orderNo) {
+ that.orderNo = "璁㈠崟鍙凤細" + res.data[0].orderNo
+ that.orderShow = true
+ that.width = 'half-width'
+ } else {
+ that.orderNo = null;
+ that.orderShow = false
+ that.width = 'full-width'
+ }
+ that.doneOfTray = '宸插嚭鎵樼洏鏁�:' + res.data[0].doneOfTray
+ that.totalOfTray = '鎵樼洏鎬绘暟閲忥細' + res.data[0].totalOfTray
+ that.doneOfUnit = '宸插嚭绠辨暟锛�' + res.data[0].doneOfUnit
+ that.totalOfUnit = '鎬荤鏁帮細' + res.data[0].totalOfUnit
+ if (that.errorShow) {
+ return;
+ } else {
+ that.newspaper = newsData
+ that.move = false
+ }
+ }else {
+ that.move = true
+ }
+
+
+ },
// 鑾峰彇閿欒淇℃伅
getError() {
let that = this
@@ -340,30 +492,18 @@
},
method:'GET',
success(result) {
- // res = result.data
- // 娴嬭瘯鐢� 鈫�
- result = ycqdata.dataEEE
- res = result.data
- // 娴嬭瘯鐢� 鈫�
- // 杩斿洖缁撴灉鏈夊�� 涓斿�间笉绛変簬绌哄�� 灏辨槸鏈夐敊璇俊鎭渶瑕佸睍绀�
+ res = result.data
if (res.data && res.data !== "") {
- that.matList = []
- that.orderNo = null
- that.matList.push(res.data)
- that.swiper = 'swiper-here-error'
- that.title = ''
- that.staNo = ''
- that.pakinShow = false
+ that.errorMsg = res.data
that.errorShow = true
that.move = false // 鏄剧ず
} else {
- that.errorPaper = ''
that.errorShow = false
- if (that.pakinShow) {
- return;
- } else {
- that.move = true // 闅愯棌
- }
+ // if (that.pakinShow) {
+ // return;
+ // } else {
+ // // that.move = true // 闅愯棌
+ // }
}
}
});
@@ -381,63 +521,48 @@
},
method:'GET',
success(result) {
- // res = result.data
- // 娴嬭瘯鐢� 鈫�
- result = ycqdata.dataYYY
- res = result.data
- // 娴嬭瘯鐢� 鈫�
- console.log(res)
+ res = result.data
+ if (that.errorShow) {
+ return; // 鏈夐敊璇俊鎭�
+ }
if(res.data && res.data !== null) {
- if (res.data[0].matDtos.length > 0) {
- that.pakinShow = true
- that.pakinGun = true
- if (res.data[0].ioType === 101) {
- that.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.title = '妫�鏂欏嚭搴�'
- }
- if (res.data[0].orderNo) {
- that.orderNo = "璁㈠崟鍙凤細" + res.data[0].orderNo
- that.swiper = 'swiper-here-oN'
- that.orderShow = true
- } else {
- that.orderNo = null;
- that.swiper = 'swiper-here'
- that.orderShow = false
- }
- that.staNo = '鐩爣绔�' + res.data[0].staNo
- for (var i = 0; i < res.data[0].matDtos.length; i++) {
- var matnr = res.data[0].matDtos[i].matnr + ' - ' + res.data[0].matDtos[i].batch
- that.matList.push(matnr)
- }
- if (that.errorShow) {
- // that.pakinShow = false
- return;
- } else {
- that.newspaper = newsData
- that.move = false
- }
- if (res.data[0].matDtos.length <= 8) {
- that.errorShow = true
- that.pakinShow = true
- that.pakinGun = false
- }
+ if (res.data[0].ioType === 101) {
+ that.title = '鍏ㄦ澘鍑哄簱'
+ } else if(res.data[0].ioType === 103) {
+ that.title = '妫�鏂欏嚭搴�'
+ } else
+ that.title = res.data[0].title
+ that.staNo = '鐩爣绔�:' + res.data[0].staNo
+ that.matnr = '鍟嗗搧缂栧彿锛�' + res.data[0].matDtos[0].matnr
+ that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].maknx
+ that.specs = '瑙勬牸锛�' + res.data[0].matDtos[0].specs
+ that.count = '鍑哄簱鏁伴噺锛�' + res.data[0].matDtos[0].count
+ if (res.data[0].orderNo) {
+ that.orderNo = "璁㈠崟鍙凤細" + res.data[0].orderNo
+ that.orderShow = true
+ that.width = 'half-width'
} else {
- that.move = true
- }
- } else {
+ that.orderNo = null;
+ that.orderShow = false
+ that.width = 'full-width'
+ }
+ that.doneOfTray = '宸插嚭鎵樼洏鏁�:' + res.data[0].doneOfTray
+ that.totalOfTray = '鎵樼洏鎬绘暟閲忥細' + res.data[0].totalOfTray
+ that.doneOfUnit = '宸插嚭绠辨暟锛�' + res.data[0].doneOfUnit
+ that.totalOfUnit = '鎬荤鏁帮細' + res.data[0].totalOfUnit
+ that.newspaper = newsData
+ that.move = false
+ }else {
that.move = true
}
}
});
},
animation() {
- if (this.move) {
- // 涓婂眰鍚戜笂 / 涓嬪眰鍚戜笂
+ if (this.move) {
this.topMove = 'topUp'
this.floorMove = 'floorUp'
} else {
- // 涓婂眰鍚戜笅 / 涓嬪眰鍚戜笅
this.topMove = 'topDown'
this.floorMove = 'floorDown'
}
@@ -458,6 +583,7 @@
method:'GET',
success(result) {
var res = result.data
+ console.log(result);
if (res.code === 200) {
that.chartsData.Line.categories = [
that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
@@ -497,6 +623,7 @@
ledId: 1,
},
success(result) {
+ console.log(result);
var res = result.data
if (res.code === 200) {
that.xDistance = res.data.xDistance
@@ -511,33 +638,21 @@
}
})
},
- port() {
- this.$refs.port.open()
+ ejected () {
+ this.ejectShow = true
},
- url() {
- this.$refs.url.open()
- },
- ledId() {
- this.$refs.ledId.open()
- },
- crn() {
- this.$refs.crnId.open()
- },
- baseUrlConfirm(val) {
- this.baseIp = val
- uni.setStorageSync('BaseIp', this.baseIp);
- },
- ledIdConfirm(val) {
- this.baseLedId = val
+ // 寮瑰嚭灞傜‘璁�
+ ejectConfirm() {
+ uni.setStorageSync('BaseIp', this.baseIP);
uni.setStorageSync('BaseLedId', this.baseLedId);
- },
- portConfirm(val) {
- this.basePort = val
uni.setStorageSync('BasePort',this.basePort);
- },
- crnConfirm(val) {
- this.baseCrnId = val
uni.setStorageSync('BaseCrnId',this.baseCrnId);
+ this.getUrl()
+ this.ejectShow = false
+ },
+ // 寮瑰嚭灞傚彇娑�
+ ejectClose() {
+ this.ejectShow = false
},
getServerData() {
this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
@@ -570,6 +685,106 @@
</script>
<style>
+ /* 寮瑰嚭:閰嶇疆鍖哄煙 */
+ .eject-mask {
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 999;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .eject{
+ position: relative;
+ width: 600px;
+ height: 350px;
+ background-color: #eaeaea;
+ border-radius: 25rpx;
+ }
+ .eject-title {
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+ font-size: 20px;
+ font-weight: 700;
+ color: #606266;
+ text-align: center;
+ }
+ .eject-input {
+
+ }
+ .item {
+ display: flex;
+ align-items: center;
+ margin: 10px 0 0 0;
+ }
+ .desc {
+ display: inline-block;
+ width: 40%;
+ text-align: right;
+ color: #606266;
+ font-size: 18px;
+ }
+ .input {
+ display: flex;
+ align-items: center;
+ padding-left: 5px;
+ padding-right: 5px;
+ width: 100%;
+ height: 30px;
+ border: 1px solid #C0C4CC;
+ margin-right: 50px;
+ }
+ .eject-input input {
+ width: 100%;
+
+
+ }
+ .eject-button {
+ display: flex;
+ align-items: center;
+ position: absolute;
+ bottom: 0;
+ height: 60px;
+ line-height: 60px;
+ width: 100%;
+ border-top: 1px solid #ccc;
+ }
+ .button-item {
+ width: 50%;
+ height: 100%;
+ font-size: 20px;
+ font-weight: bold;
+ text-align: center;
+ color: #909399;
+ }
+ .button-item:last-child {
+ color: #67C23A;
+
+ border-left: 1px solid #ccc;
+ }
+ .full-width {
+ width: 100%;
+ height: 100%;
+ display: inline-block;
+ float: left;
+ }
+ .half-width {
+ width: 50%;
+ height: 100%;
+ display: inline-block;
+ float: left;
+ }
+ .box-items {
+ height: 20%;
+ width: 100%;
+ /* background-color: #233751; */
+ line-height: 300rpx;
+ }
/* 褰撳墠椤甸潰鏃� orderNo */
.swiper-here {
display: inline-block;
@@ -708,7 +923,7 @@
position: relative;
color: #FFFFFF;
text-align: center;
- font-size: 200rpx;
+ font-size: 120rpx;
letter-spacing: 5rpx;
background-image: url(../../static/background.png);
}
--
Gitblit v1.9.1