From f645ce9c5579a8309de66507e88a41ea00feb118 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 05 十月 2023 11:00:03 +0800
Subject: [PATCH] #
---
Monitor-APP/App.vue | 164 +++++++++++++++++++++++++++++++++++++++++
Monitor-APP/pages/home/home.vue | 24 +++++-
2 files changed, 184 insertions(+), 4 deletions(-)
diff --git a/Monitor-APP/App.vue b/Monitor-APP/App.vue
index 8c2b732..617a0db 100644
--- a/Monitor-APP/App.vue
+++ b/Monitor-APP/App.vue
@@ -5,9 +5,173 @@
},
onShow: function() {
console.log('App Show')
+ const BaseIP = uni.getStorageSync('BaseIp');
+ const BasePort = uni.getStorageSync('BasePort');
+ this.baseUrl = 'http://' + BaseIP + ':' + BasePort + '/jfwms'
+ setInterval(()=>{
+ this.getVersion()
+ },3000)
},
onHide: function() {
console.log('App Hide')
+ },
+ data() {
+ return {
+ version: '',
+ baseUrl: '',
+ filename: '',
+ downloadFlag: false
+ }
+ },
+ methods: {
+ //妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊
+ getVersion() {
+ let that = this;
+ console.log(this.downloadFlag);
+ if (this.downloadFlag) {
+ return
+ }
+ uni.getSystemInfo({
+ success: (res) => {
+ if (res.platform == "android") {
+ that.AndroidCheckUpdate();
+ }
+ }
+ })
+ },
+ // 鑾峰彇褰撳墠鐗堟湰鍙�
+ AndroidCheckUpdate() {
+ let that = this;
+ plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+ that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
+ })
+ setTimeout(()=>{
+ that.getUpdateVersion()
+ },100)
+ },
+ // 鏍￠獙鐗堟湰
+ getUpdateVersion() {
+ let that = this
+ let type = 1
+ if (that.baseUrl == 'http://undefined:undefined/undefined') {
+ return
+ }
+ let url = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
+ uni.request({
+ url: url,
+ method: 'GET',
+ success(res) {
+ var res = res.data
+ console.log(res);
+ if (res.code === 200 ){
+ that.filename = res.data.path
+ // 鏈夋柊鐗堟湰鐩存帴涓嬭浇
+ that.downWgt()
+ }
+
+ }
+ })
+ },
+ dialogConfirm() {
+ this.$refs.upVersion.close()
+ this.downWgt()
+ },
+ dialogClose() {
+ this.$refs.upVersion.close()
+ },
+ downWgt() {
+ let that = this;
+ this.downloadFlag = true
+ const downloadUrl = that.baseUrl + "/appVersion/downloadApp/" + that.filename
+ uni.showLoading({
+ title: '鏇存柊涓�︹��'
+ })
+ const downloadTask = uni.downloadFile({
+ url: downloadUrl,
+ timeout: 1000 * 30,
+ success(downloadResult) {
+ uni.hideLoading();
+ if (downloadResult.statusCode == 200) {
+
+ plus.runtime.install( //瀹夎
+ downloadResult.tempFilePath, {
+ force: true
+ },
+ function(res) {
+ utils.showToast('鏇存柊鎴愬姛锛岄噸鍚腑');
+ plus.runtime.restart();
+ }
+ );
+ }
+ }
+ })
+ // 涓嬭浇杩涘害
+ downloadTask.onProgressUpdate(res => {
+ that.downloadNum = res.progress
+ console.log('涓嬭浇杩涘害' + that.downloadNum);
+ });
+ },
+ downWgt2() {
+ let that = this;
+ this.downloadFlag = true
+ const downloadUrl = that.baseUrl + "/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) {
+ console.log();
+ 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);
+ });
+ }
}
}
</script>
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 7d387f6..b84ac6c 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -442,10 +442,10 @@
this.initPieChart()
this.getOther()
this.getDate2()
- // this.getInfo()
- // this.getError()
- this.getInfo2()
- this.getError2()
+ this.getInfo()
+ this.getError()
+ // this.getInfo2()
+ // this.getError2()
this.getUrl()
this.controller()
},1000)
@@ -722,6 +722,9 @@
// 鏃ュ巻 鏈嶅姟鍣�
getDate2() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/date",
method:"GET",
@@ -729,7 +732,11 @@
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
+ },
+ fail(res) {
+ console.log(res);
}
+
})
},
@@ -766,6 +773,9 @@
/*************** 鎶樼嚎鍥� *****************************************************************************************************/
initlineChart() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/line/charts",
method:'GET',
@@ -784,6 +794,9 @@
/*************** 楗煎浘 *****************************************************************************************************/
initPieChart() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/loc/rep",
method:'GET',
@@ -802,6 +815,9 @@
},
getOther() {
let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
uni.request({
url: that.commonUrl + "/monitor/other",
data: {
--
Gitblit v1.9.1