From 0b24b02de1d7ba24275376a20fa172f188294551 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 15 八月 2023 12:35:35 +0800
Subject: [PATCH] #
---
Monitor-APP/static/font-family/DS-DIGI-1.ttf | 0
Monitor-APP/static/font-family/HFDigits.ttf | 0
Monitor-APP/pages.json | 2
Monitor-APP/static/font-family/DS-DIGII-3.ttf | 0
Monitor-APP/pages/home/home.vue | 94 +++++++++++++++++-----------------------------
Monitor-APP/static/font-family/DS-DIGIB-2.ttf | 0
Monitor-APP/static/font-family/DS-DIGIT-4.ttf | 0
7 files changed, 36 insertions(+), 60 deletions(-)
diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index e8a6a03..130066d 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -1,7 +1,7 @@
{
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
{
- "path": "pages/home/home2",
+ "path": "pages/home/home",
"style": {
"navigationStyle": "custom",
// 鍘绘帀椤堕儴瀵艰埅鏍�
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 7cedcd9..07cbaa4 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -23,54 +23,18 @@
<view class="box-item">
<text class="item-title">浠撳簱鏁版嵁</text>
<text class="item-subTitle">warehouse data</text>
- <view class="img-box">
-
- <view class="item-img">
- <image src="../../static/a1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/b1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/c1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/d1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
- </view>
- </view>
-
+ <view style="width: 100%;">
+ <table style="width: 100%;font-size:1vw;">
+ <tr><th>鎺掑悕</th><th>鏂欏彿</th><th>鍚嶇О</th><th>鏁伴噺</th></tr>
+ <tr v-for="(item,i) in tableList" :key="i">
+ <td>top {{i+1}}</td>
+ <td>{{item.matnr}}</td>
+ <td>{{item.maktx}}</td>
+ <td>{{item.anfme}}</td>
+ </tr>
+ </table>
</view>
- </view>
+ </view>
<view class="box-item">
<view class="flex-row" style="width: 100%;">
<!-- 宸︿晶 -->
@@ -381,7 +345,8 @@
count: "",
error: ""
},
- swiperList: []
+ swiperList: [],
+ tableList: []
}
},
onShow() {
@@ -418,7 +383,7 @@
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
-
+ this.getTop()
},1000)
},
methods: {
@@ -681,6 +646,10 @@
}
this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
},
+ // 鏃ュ巻
+ getDate2() {
+
+ },
getDateFormat(value) {
var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
@@ -749,6 +718,16 @@
}
})
},
+ // 鑾峰彇top鍦ㄥ簱
+ getTop() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + '/monitor/loc/top',
+ success(res) {
+ that.tableList = res.data.data
+ }
+ })
+ }
}
}
@@ -756,6 +735,11 @@
<style>
/* @import url("../../static/css/common.css"); */
+ @font-face {
+ font-style: normal;
+ font-family: DS-DIGI-1;
+ src: url('../../static/font-family/DS-DIGI-1.ttf');
+ }
@import url("home.css");
/* 鍒� */
.flex-col {
@@ -807,7 +791,7 @@
right: 2%;
top: 2%;
font-size:1vw;
- transform: scale(0.8);
+ font-family: DS-DIGI-1;
}
.button-left {
position: absolute;
@@ -828,15 +812,7 @@
width: 13.5%;
height: 8.5%;
}
- .img-box {
- width: 100%;
- /* background-color: #666666; */
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- flex-wrap: wrap;
- font-size: 1vw;
- }
+
.item-img {
width: 50%;
margin-top: 5%;
diff --git a/Monitor-APP/static/font-family/DS-DIGI-1.ttf b/Monitor-APP/static/font-family/DS-DIGI-1.ttf
new file mode 100644
index 0000000..0925877
--- /dev/null
+++ b/Monitor-APP/static/font-family/DS-DIGI-1.ttf
Binary files differ
diff --git a/Monitor-APP/static/font-family/DS-DIGIB-2.ttf b/Monitor-APP/static/font-family/DS-DIGIB-2.ttf
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/Monitor-APP/static/font-family/DS-DIGIB-2.ttf
Binary files differ
diff --git a/Monitor-APP/static/font-family/DS-DIGII-3.ttf b/Monitor-APP/static/font-family/DS-DIGII-3.ttf
new file mode 100644
index 0000000..2aae3d8
--- /dev/null
+++ b/Monitor-APP/static/font-family/DS-DIGII-3.ttf
Binary files differ
diff --git a/Monitor-APP/static/font-family/DS-DIGIT-4.ttf b/Monitor-APP/static/font-family/DS-DIGIT-4.ttf
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/Monitor-APP/static/font-family/DS-DIGIT-4.ttf
Binary files differ
diff --git a/Monitor-APP/static/font-family/HFDigits.ttf b/Monitor-APP/static/font-family/HFDigits.ttf
new file mode 100644
index 0000000..3beb8e4
--- /dev/null
+++ b/Monitor-APP/static/font-family/HFDigits.ttf
Binary files differ
--
Gitblit v1.9.1