Lee
/
com.kailaimei.carbon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

足迹大小控制，报表日期修改

master
Lee 2023-02-16 11:16:07 +08:00
parent 98d89b9623
commit 501a70ea7f
7 changed files with 29 additions and 19 deletions
common
pages
unpackage/dist/dev/app-plus

11
common/style.css
View File

@ -483,7 +483,8 @@ image{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: flex-end; align-items: flex-end;
margin-top: -220px; height: 308px;
margin-top: -255px;
} }
.assess-contrast .item{ .assess-contrast .item{
text-align: center; text-align: center;
@ -497,16 +498,16 @@ image{
color: #327531; color: #327531;
} }
.assess-contrast .item:nth-of-type(1){ .assess-contrast .item:nth-of-type(1){
width: 104px; width: 130px;
} }
.assess-contrast .item:nth-of-type(2){ .assess-contrast .item:nth-of-type(2){
width: 134px; width: 130px;
} }
.assess-contrast .item:nth-of-type(3){ .assess-contrast .item:nth-of-type(3){
width: 176px; width: 168px;
} }
.assess-contrast .item:nth-of-type(4){ .assess-contrast .item:nth-of-type(4){
width: 138px; width: 130px;
} }
.assess-contrast .item:nth-of-type(5){ .assess-contrast .item:nth-of-type(5){
width: 262px; width: 262px;

2
pages/assess/assess.vue
View File

@ -86,7 +86,7 @@
<view class="line"></view> <view class="line"></view>
<view class="list"> <view class="list">
<view class="item"> <view class="item">
<image src="/static/footprint.png" mode="heightFix" :style="{height: averageHeight+'px'}"></image> <image src="/static/footprint.png" mode="heightFix" :style="{height:averageHeight>=235?'235px':averageHeight+'px'}"></image>
<view>您的碳足迹为</view> <view>您的碳足迹为</view>
<view><text>{{average}}</text>kg</view> <view><text>{{average}}</text>kg</view>
</view> </view>

2
pages/count/count.vue
View File

@ -120,7 +120,7 @@
'tag': 'a1' 'tag': 'a1'
}, },
{ {
'title': '洗衣服使用量', 'title': '洗衣粉使用量',
'company': '千克', 'company': '千克',
'carbon': 1.46, 'carbon': 1.46,
'num': '', 'num': '',

4
pages/eliminate/eliminate.vue
View File

@ -67,7 +67,7 @@
位体验者： 位体验者：
</view> </view>
<view class="item">感谢您参与“爱绿行碳普惠”平台互动，计算碳排放量，学习节能降碳等知识，践行低碳旅游和生活新风尚，用行动守护景区美丽环境。</view> <view class="item">感谢您参与“爱绿行碳普惠”平台互动，计算碳排放量，学习节能降碳等知识，践行低碳旅游和生活新风尚，用行动守护景区美丽环境。</view>
<view class="time">2023年2月15日</view> <view class="time">{{date}}</view>
</view> </view>
<view class="foot"> <view class="foot">
<view class="qr"> <view class="qr">
@ -107,6 +107,7 @@
code:'', //证书编码 code:'', //证书编码
experients:0, //体验者编号 experients:0, //体验者编号
difference:0, //补齐位数 difference:0, //补齐位数
date:'', //报告时间
} }
}, },
onLoad() { onLoad() {
@ -137,6 +138,7 @@
let minute = date.getMinutes(); let minute = date.getMinutes();
let second = date.getSeconds(); let second = date.getSeconds();
let random = Math.ceil(Math.random() * 99 + 1); let random = Math.ceil(Math.random() * 99 + 1);
this.date = `${year}年${month<10?'0'+month:month}月${day<10?'0'+day:day}日`;
this.code = `${year.toString().substr(2)}${month<10?'0'+month:month}${day<10?'0'+day:day}${hour<10?'0'+hour:hour}${minute<10?'0'+minute:minute}${second<10?'0'+second:second}${random<10?'0'+random:random}` this.code = `${year.toString().substr(2)}${month<10?'0'+month:month}${day<10?'0'+day:day}${hour<10?'0'+hour:hour}${minute<10?'0'+minute:minute}${second<10?'0'+second:second}${random<10?'0'+random:random}`
}, },
methods: { methods: {

2
pages/index/index.vue
View File

@ -9,7 +9,7 @@
data() { data() {
return { return {
macStr:'', //设备mac macStr:'', //设备mac
allowMac:['B0:CC:FE:9E:D3:4A','F2:6E:B1:A7:3B:B1','00:81:d2:63:0F:80','00:DB:19:F0:1A:F6','00:DB:8A:DB:71:69'], //允许设备mac allowMac:['00:DB:19:F0:1A:F6','00:DB:8A:DB:71:69'], //允许设备mac
} }
}, },
onLoad() { onLoad() {

23
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long