From 410593e3cbd8084cde43610bde5d2089b105980f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 28 十二月 2023 10:16:02 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 76 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index f170774..456d233 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -317,6 +317,13 @@
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
</view>
+
+ <!-- 鐗堟湰鍙� -->
+ <!-- #ifdef APP-PLUS -->
+ <view class="version">
+ 褰撳墠鐗堟湰:{{version}}
+ </view>
+ <!-- #endif -->
</view>
</template>
<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
@@ -326,6 +333,7 @@
export default {
data() {
return {
+ version: '1231313',
newModeClass: 'slide-top',
errorBoardShow: false,
carInfo: [],
@@ -410,6 +418,7 @@
currDate: '',
textred: 'textred',
opts1: {
+ fontSize: 8,
dataLabel: true,
fontColor: "#ffffff",
legend: {
@@ -419,6 +428,7 @@
xAxis: {
disableGrid: true,
fontColor: "#ffffff",
+ fontSize: 8,
axisLineColor: "#ffffff",
},
yAxis: {
@@ -427,7 +437,7 @@
extra: {
column: {
type: "group",
- width: 40,
+ width: 30,
activeBgColor: "#000000",
activeBgOpacity: 0.08,
labelPosition: "center"
@@ -439,12 +449,14 @@
"#ea7ccc"
],
fontColor: "#ffffff",
+ fontSize: 8,
padding: [15, 15, 0, 5],
enableScroll: false,
legend: {},
xAxis: {
disableGrid: true,
fontColor: "#ffffff",
+ fontSize: 8,
axisLineColor: "#ffffff",
},
yAxis: {
@@ -463,30 +475,20 @@
},
},
opts3: {
+ fontSize: 8,
fontColor: "#ffffff",
xAxis: {
fontColor: "#ffffff",
+ fontSize: 8,
}
},
opts4: {
fontColor: "#ffffff",
+ fontSize: 8,
legend: {
show: true,
position: "bottom",
fontColor: "#FFFFFF",
- },
- title: {
- name: "",
- color: "#666666",
- offsetX: 0,
- offsetY: 0
- },
- subtitle: {
- name: "",
- fontSize: 25,
- color: "#7cb5ec",
- offsetX: 0,
- offsetY: 0
},
extra: {
pie: {
@@ -516,23 +518,21 @@
that.baseCrnId = BaseCrnId
-
+ this.getVersion()
this.getDate2()
setTimeout(() => {
+ this.getShuttle()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
setTimeout(() => {
this.getShuttle()
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
- setTimeout(() => {
- this.getShuttle()
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- }, 3000)
- }, 1000)
+ }, 2000)
}, 1000)
},
onLoad() {
@@ -559,8 +559,22 @@
this.initPieChart()
this.getOther()
}, 600000)
+
+ // #ifdef APP-PLUS
+ setTimeout(()=>{
+ plus.runtime.restart()
+ },28800000)
+ // #endif
+
+
},
methods: {
+ getVersion() {
+ let that = this
+ plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+ that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
+ })
+ },
getShuttleTest() {
let res = ycqdata.infoData2.data
this.shuttleInfoModel(res)
@@ -755,8 +769,8 @@
that.infoText.title = '鍏ㄦ澘鍑哄簱'
that.infoText.title2 = '鍏ㄦ澘鍑哄簱'
} else if (res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- that.infoText.title2 = '妫�鏂欏嚭搴�'
+ that.infoText.title = '鎷ｆ枡鍑哄簱'
+ that.infoText.title2 = '鎷ｆ枡鍑哄簱'
} else if (res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
that.infoText.title2 = '鐩樼偣鍑哄簱'
@@ -1105,7 +1119,15 @@
<style>
/* @import url("../../static/css/common.css"); */
@import url("home.css");
-
+ /* 鐗堟湰鍙� */
+ .version {
+ min-width: 100rpx;
+ position: fixed;
+ right: 20rpx;
+ bottom: 10rpx;
+ font-size: .1rem;
+ color: #909399;
+ }
/* 鍒� */
.flex-col {
display: flex;
@@ -1236,7 +1258,7 @@
.charts-box-ring {
width: 50%;
- height: 24vh;
+ height: 30vh;
/* background-color: #00ffff; */
}
--
Gitblit v1.9.1