From d9462ce72f9994510a28f7f27ec96dab31439f6a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 30 七月 2024 12:59:22 +0800
Subject: [PATCH] #
---
Monitor-APP/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js | 4 +++-
Monitor-APP/pages/home/home.css | 4 ++--
Monitor-APP/pages/home/home.vue | 25 ++++++++++++-------------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 758aeeb..c9457b5 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: 44rpx;
+ font-size: 2vw;
/* background-color: aliceblue; */
}
.swiper-head {
@@ -28,7 +28,7 @@
flex-wrap: wrap;
align-items: center;
text-align: start;
- border-bottom: 2px solid #000;
+ border-bottom: 0.1vw solid #000;
background-color: rgba(0, 0, 0, .2);
}
.swiper-item:nth-child(2n-1) {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 3b8679d..ac2912f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -229,12 +229,12 @@
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
display-multiple-items="3"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ circular="true" :autoplay="true" :interval="5000" :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.matnr}}</view>
- <view style="width: 30%;">澶囨敞: {{item.orderNo}}</view>
+ <view style="width: 30%;">瑙勬牸: {{item.specs}}</view>
<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
@@ -416,20 +416,20 @@
// this.getUrl()
},
onLoad() {
- this.ws()
+ // this.ws()
setInterval(()=>{
- // this.getServerData()
- // this.initlineChart()
- // this.initPieChart()
- // this.getOther()
- // this.getDate()
- // this.getDate2()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ this.getDate()
+ this.getDate2()
this.getInfo()
- // this.getError()
+ this.getError()
// this.getInfo2()
// this.getError2()
- // this.getUrl()
- // this.controller()
+ this.getUrl()
+ this.controller()
// 娴嬭瘯鐢�
@@ -827,7 +827,6 @@
ledId: that.baseLedId,
},
success(result) {
- console.log(result);
var res = result.data
if (res.code === 200) {
that.baseInfo.xDistance = res.data.xDistance
diff --git a/Monitor-APP/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/Monitor-APP/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
index 48d6c18..0bf8609 100644
--- a/Monitor-APP/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
+++ b/Monitor-APP/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
@@ -293,6 +293,8 @@
},
"legend": {
"bottom": 'left',
+ "itemWidth": 10,
+ "itemHeight": 8,
"textStyle": {
"color": '#cccccc'
}
@@ -309,7 +311,7 @@
"position": 'top',
},
"labelLine": {
- "show": true
+ "show": false
},
},
},
--
Gitblit v1.9.1