develop #1

Merged
dashixiong merged 37 commits from develop into main 2026-02-11 02:07:35 +00:00
60 changed files with 16230 additions and 993 deletions
Showing only changes of commit de403e861d - Show all commits

View File

@ -1,5 +1,5 @@
{
"name": "EMS移动端",
"name" : "上动EMS",
"appid" : "__UNI__B330617",
"description" : "",
"versionName" : "1.2.0",
@ -44,7 +44,21 @@
"ios" : {
"dSYMs" : false
},
"sdkConfigs": {}
"sdkConfigs" : {},
"icons" : {
"android" : {
"hdpi" : "static/logo.png",
"xhdpi" : "static/logo.png",
"xxhdpi" : "static/logo.png",
"xxxhdpi" : "static/logo.png"
},
"ios" : {
"appstore" : ""
}
},
"splashscreen" : {
"androidStyle" : "common"
}
}
},
"quickapp" : {},
@ -68,7 +82,7 @@
"port" : 9090,
"https" : false
},
"title": "EMS-App",
"title" : "上动EMS",
"router" : {
"mode" : "hash",
"base" : "./"

View File

@ -1,7 +1,7 @@
<template>
<view class="about-container">
<view class="header-section text-center">
<image style="width: 150rpx;height: 150rpx;" src="/static/logo200.png" mode="widthFix">
<image style="width: 150rpx;height: 150rpx;" src="/static/logo.png" mode="widthFix">
</image>
<uni-title type="h2" title="EMS移动端"></uni-title>
</view>

View File

@ -75,7 +75,7 @@
<date-range-select ref="chartDateRangeSelect" @updateDate="updateChartDate"
style="margin-bottom: 10px;" />
<view class="chart-container">
<qiun-data-charts type="line" :reload="showChart" :optsWatch='false' :opts="options"
<qiun-data-charts type="area" :reload="showChart" :optsWatch='false' :opts="options"
:chartData="chartsData" :ontouch="true" :inScrollView="true" :pageScrollTop="pageScrollTop" />
</view>
</view>
@ -140,6 +140,7 @@
},
options: {
padding: [10, 5, 0, 10],
duration: 0,
animation: false,
dataLabel: false,
@ -149,6 +150,16 @@
itemCount: 3,
disableGrid: true
},
extra: {
area: {
type: "curve",
opacity: 0.2,
addLine: true,
width: 2,
gradient: true,
activeType: "hollow"
}
}
},
range: [],
end: Date.now(),

View File

@ -41,7 +41,7 @@
<uni-section title="一周充放曲线" type="line" class="sections-list">
<date-range-select ref="weekChartDateRangeSelect" @updateDate="updateWeekChartDate" />
<view style="width:100%;height: 250px;">
<qiun-data-charts type="line" :chartData="weekChartData" :optsWatch='false' :inScrollView="true"
<qiun-data-charts type="area" :chartData="weekChartData" :optsWatch='false' :inScrollView="true"
:pageScrollTop="pageScrollTop" :opts="options" :ontouch="true" />
</view>
</uni-section>
@ -49,7 +49,7 @@
<uni-section title="当日功率曲线" type="line" class="sections-list">
<date-range-select ref="activeChartDateRangeSelect" @updateDate="updateActiveChartDate" />
<view style="width:100%;height: 250px;">
<qiun-data-charts type="line" :chartData="activeChartData" :optsWatch='false' :inScrollView="true"
<qiun-data-charts type="area" :chartData="activeChartData" :optsWatch='false' :inScrollView="true"
:pageScrollTop="pageScrollTop" :opts="glqxOptions" :ontouch="true" />
</view>
</uni-section>
@ -78,6 +78,7 @@
activeChartData: {},
pageScrollTop: 0,
glqxOptions: {
padding: [10, 5, 0, 10],
dataLabel: false,
enableScroll: true,
xAxis: {
@ -85,6 +86,16 @@
itemCount: 3,
disableGrid: true
},
extra: {
area: {
type: "curve",
opacity: 0.2,
addLine: true,
width: 2,
gradient: true,
activeType: "hollow"
}
}
// update: true,
// duration: 2,
// animation: false,
@ -92,6 +103,7 @@
// padding: [10, 15, 10, 15]
},
options: {
padding: [10, 5, 0, 10],
dataLabel: false,
enableScroll: true,
xAxis: {
@ -99,6 +111,16 @@
itemCount: 5,
disableGrid: true
},
extra: {
area: {
type: "curve",
opacity: 0.2,
addLine: true,
width: 2,
gradient: true,
activeType: "hollow"
}
}
// update: true,
// duration: 2,
// animation: false,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB