From d306991caf17e3ba029f0f7d2c33d4aded6100cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 10 七月 2025 13:20:07 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 233 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 186 insertions(+), 47 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index d93dea0..1409115 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -6,8 +6,8 @@
<text>鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
</view>
<!-- 鏃ュ巻 -->
- <view class="time-tools">{{version}}</view>
- <view class="version">褰撳墠鐗堟湰:{{socketUrl}}</view>
+ <view class="time-tools">{{calendar}}</view>
+ <view class="version">V:{{version}}</view>
<view class="button-left" @click="ejected()"></view>
<view class="button-right" @click="ejected()"></view>
<!-- 涓昏鍥� -->
@@ -27,19 +27,16 @@
circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
- <swiper class="swiper-body-main" vertical="true"
- display-multiple-items="5"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
- <swiper-item class="swiper-item" v-for="(item,i) in locList" :key="i">
- <!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
- <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 50%; font-size: 1vw;">鐗╂枡鐮�: {{item.matnr}}</view>
- <view style="width: 50%; font-size: 1vw;">鏁伴噺: {{item.matnrCount}}</view>
+
+ <view style="width: 100%;display: flex;" v-for="(item,i) in locList" :key="i">
+
+ <view style="display: flex; justify-content: center;align-items: center;width: 48%; font-size: 1.3vw;">鐗╂枡鐮�: {{item.matnr}}</view>
+ <view style="display: flex; justify-content: center;align-items: center;width: 48%; font-size: 1.3vw;">鏁伴噺: {{item.matnrCount}}</view>
- </swiper-item>
- </swiper>
+ </view>
+
</view>
@@ -157,12 +154,13 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%;">
- <y-box>
- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
- 鏅鸿兘澶у睆鏄剧ず绯荤粺
- </view>
- </y-box>
+ <view style="height: 18%;display: flex;justify-content: space-around;align-items: center;">
+ <!-- <view style="font-size: 4vh">
+ 鑷姩浠撳簱WCS鐩戞帶骞冲彴
+ </view> -->
+ <view style="height: 50%;">
+ <image style="height: 100%;" src="../../static/img/logo-bai.png" mode="aspectFit"></image>
+ </view>
</view>
</view>
</view>
@@ -202,10 +200,10 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="2"
+ display-multiple-items="1"
circular="true" :autoplay="true" :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: 100%;">{{i+1}} / {{swiperList.length}}</view>
<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
<view style="width: 50%; font-size: 3vw;">鐗╂枡缂栫爜: {{item.matnr}}</view>
<view style="width: 50%; font-size: 3vw;">鍚嶇О: {{item.maknx}}</view>
@@ -265,27 +263,33 @@
</view>
</view>
<view class="item">
- <view class="desc">port锛�</view>
+ <view class="desc">Wcsport锛�</view>
<view class="input">
<input type="text" v-model="basePort">
+ </view>
+ </view>
+ <view class="item">
+ <view class="desc">WcsUrl锛�</view>
+ <view class="input">
+ <input type="text" v-model="baseUrl">
+ </view>
+ </view>
+ <view class="item">
+ <view class="desc">Wmsport锛�</view>
+ <view class="input">
+ <input type="text" v-model="wmsPort">
+ </view>
+ </view>
+ <view class="item">
+ <view class="desc">WmsUrl锛�</view>
+ <view class="input">
+ <input type="text" v-model="wmsUrl">
</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 class="item">
- <view class="desc">Url锛�</view>
- <view class="input">
- <input type="text" v-model="baseUrl">
</view>
</view>
</scroll-view>
@@ -295,6 +299,13 @@
<view class="button-item" @click="ejectConfirm">纭� 璁�</view>
</view>
</view>
+ </view>
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="upVersion" type="dialog">
+ <uni-popup-dialog :type="msgType" title="閫氱煡" :content="dialogContent" @confirm="dialogConfirm"
+ @close="dialogClose"></uni-popup-dialog>
+ </uni-popup>
</view>
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂锛屾鍦ㄩ噸鏂板缓绔嬮摼鎺�:: {{times}}
@@ -340,7 +351,7 @@
}]
},
},
- duration: 1000,
+ duration: 300,
calendar: '',
ringOpts:{},
chartsDataLine1: {},
@@ -378,8 +389,12 @@
socketClient: null,
messages: [],
version:'',
- socketUrl:''
-
+ socketUrl:'',
+ msgType: 'success',
+ filename: '',
+ dialogContent: '',
+ wmsUrl:'',
+ wmsPort:''
}
},
@@ -397,11 +412,15 @@
const BasePort = uni.getStorageSync('BasePort');
const BaseCrnId = uni.getStorageSync('BaseCrnId');
const PROJ = uni.getStorageSync('UPROJ');
+ const WMSURL = uni.getStorageSync('wmsUrl');
+ const WMSPORT = uni.getStorageSync('wmsPort');
that.baseUrl = PROJ
that.baseIP = BaseIP
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
+ that.wmsUrl = WMSURL
+ that.wmsPort = WMSPORT
// this.getUrl()
},
created() {
@@ -411,11 +430,15 @@
const BasePort = uni.getStorageSync('BasePort');
const BaseCrnId = uni.getStorageSync('BaseCrnId');
const PROJ = uni.getStorageSync('UPROJ');
+ const WMSURL = uni.getStorageSync('wmsUrl');
+ const WMSPORT = uni.getStorageSync('wmsPort');
that.baseUrl = PROJ
that.baseIP = BaseIP
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
+ that.wmsUrl = WMSURL
+ that.wmsPort = WMSPORT
that.uniWebSocket();
// that.webSockerInit()
},
@@ -444,6 +467,23 @@
},100)
},1000*60*60*4)
+
+ // 姣忓皬鏃惰Е鍙戜竴娆″瀮鍦惧洖鏀�
+ const memoryCleanerId = setInterval(() => {
+
+ if (plus.os.name.toLowerCase() === 'android') {
+ // 寮哄埗瑙﹀彂 GC
+ plus.android.importClass('java.lang.System');
+ plus.android.invoke('java.lang.System', 'gc');
+ console.log('鎵嬪姩瑙﹀彂 GC');
+ }
+
+
+ // 娓呯悊涓嶅啀闇�瑕佺殑澶у瀷鏁版嵁瀵硅薄
+ if (this.oldData && this.oldData.length > 100) {
+ this.oldData = [];
+ }
+ }, 3000*10); // 姣忓皬鏃舵墽琛屼竴娆�
// setInterval(()=> {
// setTimeout(()=>{
@@ -650,11 +690,8 @@
}
})
},
- timeOut() {
- console.log(this.times);
- },
getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
getServerData() {
this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
@@ -931,6 +968,8 @@
uni.setStorageSync('BasePort',this.basePort);
uni.setStorageSync('BaseCrnId',this.baseCrnId);
uni.setStorageSync('UPROJ',this.baseUrl);
+ uni.setStorageSync('wmsUrl',this.wmsUrl);
+ uni.setStorageSync('wmsPort',this.wmsPort);
this.getUrl()
this.ejectShow = false
},
@@ -1042,6 +1081,8 @@
if (res.platform == "android") {
that.AndroidCheckUpdate();
}
+ // that.AndroidCheckUpdate();
+
}
})
},
@@ -1051,9 +1092,107 @@
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
})
- // setTimeout(()=>{
- // that.getUpdateVersion()
- // },100)
+ setTimeout(()=>{
+ that.getUpdateVersion()
+ },100)
+ },
+ // 鏍￠獙鐗堟湰
+ getUpdateVersion() {
+ let that = this
+ let type = 1
+ if (that.baseUrl == 'http://undefined:undefined/undefined') {
+ return
+ }
+ const wms = 'http://'+ that.baseIP + ':' +that.wmsPort + "/" +that.wmsUrl
+ console.log(wms)
+ let url = wms + '/appVersion/checkUpdate/' + that.version + '/' + type
+ uni.request({
+ url: url,
+ method: 'GET',
+ success(res) {
+ console.log(res);
+ var res = res.data
+ if (res.data) {
+ that.filename = res.data.path
+ that.dialogContent = '鍙戠幇鏂扮増鏈�:' + res.data.version + ', 鏄惁绔嬪嵆鏇存柊'
+ that.$refs.upVersion.open()
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ })
+ },
+ dialogConfirm() {
+ this.$refs.upVersion.close()
+ this.downWgt()
+ },
+ dialogClose() {
+ this.$refs.upVersion.close()
+ },
+ downWgt() {
+ let that = this;
+ const wms = 'http://'+ that.baseIP + ':' +that.wmsPort + "/" +that.wmsUrl
+ const downloadUrl = wms + "/appVersion/downloadApp/" + that.filename
+ uni.showLoading({
+ title: '鏇存柊涓�︹��'
+ })
+ const downloadTask = uni.downloadFile({ //鎵ц涓嬭浇
+ url: downloadUrl, //涓嬭浇鍦板潃
+ timeout: 1000 * 30, //30绉掕秴鏃舵椂闂�
+ success: downloadResult => { //涓嬭浇鎴愬姛
+ console.log(downloadResult);
+ that.showdownLine = false
+ uni.hideLoading();
+ if (downloadResult.statusCode == 200) {
+ uni.showModal({
+ title: '',
+ content: '鏇存柊鎴愬姛锛岀‘瀹氱幇鍦ㄩ噸鍚悧锛�',
+ confirmText: '閲嶅惎',
+ confirmColor: '#EE8F57',
+ success: function(res) {
+ if (res.confirm == true) {
+ plus.runtime.install( //瀹夎
+ downloadResult.tempFilePath, {
+ force: true
+ },
+ function(res) {
+ utils.showToast('鏇存柊鎴愬姛锛岄噸鍚腑');
+ plus.runtime.restart();
+ }
+ );
+ }
+ }
+ });
+ } else {
+ uni.hideLoading();
+ that.showdownLine = false
+ uni.showToast({
+ title:'璇峰厛涓婁紶瀹夎鍖�',
+ icon: 'error'
+ })
+ }
+ },
+ fail: err => {
+ uni.hideLoading();
+ that.showdownLine = false
+ that.$u.toast(downloadResult.errMsg)
+ },
+ complete: com => {
+
+ console.log(com)
+ }
+ });
+
+ // 涓嬭浇杩涘害
+ downloadTask.onProgressUpdate(res => {
+ that.downloadNum = res.progress
+ console.log('涓嬭浇杩涘害' + that.downloadNum);
+ });
},
}
@@ -1228,8 +1367,8 @@
}
.version{
position: absolute;
- left: 2%;
- top: 2%;
+ left: 1%;
+ top: 1%;
font-size:1vw;
transform: scale(0.8);
}
@@ -1285,8 +1424,8 @@
}
.eject{
position: relative;
- width: 40vw;
- height: 40vh;
+ width: 45vw;
+ height: 45vh;
background-color: #fff;
border-radius: 2rem;
}
--
Gitblit v1.9.1