|
@@ -5,9 +5,14 @@
|
|
|
<van-tab
|
|
|
:title="item.name"
|
|
|
:name="item.funcid"
|
|
|
- :key="item.id"
|
|
|
+ :key="item.id + '' + index"
|
|
|
v-for="(item, index) in titleList"
|
|
|
>
|
|
|
+ <div class="container-text" v-if="item.options">
|
|
|
+ <span>{{
|
|
|
+ item.funcid == "Tdb,RH" ? "温湿度逐时分布" : "浓度逐时分布"
|
|
|
+ }}</span>
|
|
|
+ </div>
|
|
|
<div class="chart-box">
|
|
|
<com-chart
|
|
|
:options="item.options"
|
|
@@ -26,19 +31,15 @@
|
|
|
<span>该空间数据未配置</span>
|
|
|
</template>
|
|
|
</div>
|
|
|
- <div class="container-text" v-if="item.options">
|
|
|
- <span>{{
|
|
|
- item.funcid == "Tdb,RH" ? "温湿度逐时分布" : "浓度逐时分布"
|
|
|
- }}</span>
|
|
|
- </div>
|
|
|
</div>
|
|
|
<div class="detail-desc clearfix">
|
|
|
- <div class="detail-title">
|
|
|
+ <!-- <div class="detail-title">
|
|
|
{{ item.name }}
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div class="detail-text">
|
|
|
- <p v-for="(textItem, idx) in item.text">
|
|
|
- <van-icon class="icon" name="success" v-if="idx % 2 == 0" />
|
|
|
+ <p v-for="(textItem, idx) in item.text" :key="idx">
|
|
|
+ <!-- <van-icon class="icon" name="success" v-if="idx % 2 == 0" /> -->
|
|
|
+ <span class="circle"></span>
|
|
|
<span class="tem-span">
|
|
|
{{ textItem }}
|
|
|
</span>
|
|
@@ -218,6 +219,7 @@ export default defineComponent({
|
|
|
* @param funcid
|
|
|
*/
|
|
|
getData(funcid: string = "") {
|
|
|
+ // debugger
|
|
|
let paramObj = {
|
|
|
spaceId: proxyData.query.spaceId,
|
|
|
funcid: funcid,
|
|
@@ -317,7 +319,7 @@ export default defineComponent({
|
|
|
let { chartData, chartMax } = await proxyData.getData(funcid);
|
|
|
proxyData.loadinngEnd();
|
|
|
let seriesData: any = chartData.map((item: any) => {
|
|
|
- return item.sales
|
|
|
+ return item.sales;
|
|
|
});
|
|
|
let xData: any = chartData.map((item: any) => {
|
|
|
return item.time;
|
|
@@ -329,10 +331,10 @@ export default defineComponent({
|
|
|
trigger: "axis",
|
|
|
},
|
|
|
grid: {
|
|
|
- top: 30,
|
|
|
- left: 22,
|
|
|
- right: 25,
|
|
|
- bottom: 50,
|
|
|
+ top: 20,
|
|
|
+ left: 5,
|
|
|
+ right: 20,
|
|
|
+ bottom: 20,
|
|
|
containLabel: true,
|
|
|
},
|
|
|
xAxis: [
|
|
@@ -345,7 +347,9 @@ export default defineComponent({
|
|
|
},
|
|
|
},
|
|
|
axisLabel: {
|
|
|
- fontSize: 14,
|
|
|
+ fontSize: 12,
|
|
|
+ interval: 8,
|
|
|
+ showMaxLabel: true,
|
|
|
color: "#C4C4C4",
|
|
|
},
|
|
|
data: xData,
|
|
@@ -364,7 +368,7 @@ export default defineComponent({
|
|
|
},
|
|
|
},
|
|
|
axisLabel: {
|
|
|
- fontSize: 14,
|
|
|
+ fontSize: 12,
|
|
|
color: "#C4C4C4",
|
|
|
},
|
|
|
splitLine: {
|
|
@@ -412,26 +416,59 @@ export default defineComponent({
|
|
|
showSymbol: false,
|
|
|
lineStyle: {
|
|
|
width: 2,
|
|
|
+ color: new (echarts as any).graphic.LinearGradient(
|
|
|
+ 1,
|
|
|
+ 0,
|
|
|
+ 0,
|
|
|
+ 0,
|
|
|
+ [
|
|
|
+ {
|
|
|
+ offset: 0,
|
|
|
+ color: "rgba(229, 87, 79, 1)",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 0.5,
|
|
|
+ color: "rgba(229, 87, 79, 1)",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 0.6,
|
|
|
+ color: "rgba(79, 128, 255, 1)",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 1,
|
|
|
+ color: "rgba(79, 128, 255, 1)",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ false
|
|
|
+ ),
|
|
|
},
|
|
|
areaStyle: {
|
|
|
color: new (echarts as any).graphic.LinearGradient(
|
|
|
0,
|
|
|
0,
|
|
|
- 0,
|
|
|
1,
|
|
|
+ 0,
|
|
|
[
|
|
|
{
|
|
|
offset: 0,
|
|
|
- color: "rgba(79, 128, 255, 0.165)",
|
|
|
+ color: "rgba(79, 128, 255, 0.1)",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 0.5,
|
|
|
+ color: "rgba(79, 128, 255, 0.3)",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 0.6,
|
|
|
+ color: "rgba(229, 87, 79, 0.1)",
|
|
|
},
|
|
|
{
|
|
|
- offset: 0.8,
|
|
|
- color: "rgba(79, 128, 255, 0)",
|
|
|
+ offset: 1,
|
|
|
+ color: "rgba(229, 87, 79, 0.3)",
|
|
|
},
|
|
|
],
|
|
|
false
|
|
|
),
|
|
|
- shadowColor: "rgba(79, 128, 255,0.1)",
|
|
|
+ shadowColor: "rgba(79, 128, 255, 0.1)",
|
|
|
shadowBlur: 10,
|
|
|
},
|
|
|
itemStyle: {
|
|
@@ -455,6 +492,7 @@ export default defineComponent({
|
|
|
}
|
|
|
},
|
|
|
async formatTowOptions(funcid: any) {
|
|
|
+ // debugger
|
|
|
proxyData.activeItem.options = null;
|
|
|
let funcidArr = funcid.split(",");
|
|
|
let chartData1: any = await proxyData.getData(funcidArr[0]);
|
|
@@ -487,9 +525,9 @@ export default defineComponent({
|
|
|
},
|
|
|
grid: {
|
|
|
top: 50,
|
|
|
- left: 22,
|
|
|
- right: 25,
|
|
|
- bottom: 50,
|
|
|
+ left: 5,
|
|
|
+ right: 15,
|
|
|
+ bottom: 20,
|
|
|
containLabel: true,
|
|
|
},
|
|
|
xAxis: [
|
|
@@ -502,7 +540,9 @@ export default defineComponent({
|
|
|
},
|
|
|
},
|
|
|
axisLabel: {
|
|
|
- fontSize: 14,
|
|
|
+ fontSize: 12,
|
|
|
+ interval: 8,
|
|
|
+ showMaxLabel: true,
|
|
|
color: "#C4C4C4",
|
|
|
},
|
|
|
data: xData,
|
|
@@ -521,7 +561,7 @@ export default defineComponent({
|
|
|
},
|
|
|
},
|
|
|
axisLabel: {
|
|
|
- fontSize: 14,
|
|
|
+ fontSize: 12,
|
|
|
color: "#C4C4C4",
|
|
|
},
|
|
|
splitLine: {
|
|
@@ -544,7 +584,7 @@ export default defineComponent({
|
|
|
},
|
|
|
},
|
|
|
axisLabel: {
|
|
|
- fontSize: 14,
|
|
|
+ fontSize: 12,
|
|
|
color: "#C4C4C4",
|
|
|
},
|
|
|
splitLine: {
|
|
@@ -690,13 +730,13 @@ export default defineComponent({
|
|
|
}
|
|
|
);
|
|
|
onMounted(() => {
|
|
|
- const route: any = useRoute();
|
|
|
- if (route.query) {
|
|
|
- proxyData.query = route.query;
|
|
|
- // 设置当前选中的tab
|
|
|
- proxyData.setActiveItem();
|
|
|
- proxyData.queryAllData();
|
|
|
- }
|
|
|
+ // const route: any = useRoute();
|
|
|
+ // if (route.query) {
|
|
|
+ // proxyData.query = route.query;
|
|
|
+ // // 设置当前选中的tab
|
|
|
+ // proxyData.setActiveItem();
|
|
|
+ // proxyData.queryAllData();
|
|
|
+ // }
|
|
|
});
|
|
|
return {
|
|
|
...toRefs(proxyData),
|
|
@@ -720,28 +760,28 @@ export default defineComponent({
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+.container-text {
|
|
|
+ font-family: PingFang SC;
|
|
|
+ padding-top: 17px;
|
|
|
+ background: #fff;
|
|
|
+ font-weight: 500;
|
|
|
+ font-size: 16px;
|
|
|
+ line-height: 22px;
|
|
|
+ text-align: center;
|
|
|
+ color: #000000;
|
|
|
+ text-align: center;
|
|
|
+}
|
|
|
.chart-box {
|
|
|
width: 100%;
|
|
|
height: 277px;
|
|
|
- padding-top: 40px;
|
|
|
+ padding-top: 20px;
|
|
|
background: #fff;
|
|
|
-
|
|
|
- .container-text {
|
|
|
- background: #fff;
|
|
|
- margin-top: -30px;
|
|
|
- text-align: center;
|
|
|
- font-family: PingFang SC;
|
|
|
- font-size: 12px;
|
|
|
- font-style: normal;
|
|
|
- font-weight: 400;
|
|
|
- line-height: 12px;
|
|
|
- color: #c4c4c4;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
.detail-desc {
|
|
|
- padding: 0 15px;
|
|
|
- margin-top: 35px;
|
|
|
+ // padding: 0 15px;
|
|
|
+ margin-top: 20px;
|
|
|
+ padding-left: 15px;
|
|
|
display: flex;
|
|
|
|
|
|
.detail-title {
|
|
@@ -769,6 +809,8 @@ export default defineComponent({
|
|
|
|
|
|
p {
|
|
|
position: relative;
|
|
|
+ margin-bottom: 10px;
|
|
|
+ // padding-bottom: 10px;
|
|
|
}
|
|
|
|
|
|
.icon {
|
|
@@ -780,12 +822,27 @@ export default defineComponent({
|
|
|
font-size: 12px;
|
|
|
}
|
|
|
|
|
|
+ .circle {
|
|
|
+ display: inline-block;
|
|
|
+ vertical-align: middle;
|
|
|
+ position: absolute;
|
|
|
+ left: 0;
|
|
|
+ top: 50%;
|
|
|
+ transform: translateY(-50%);
|
|
|
+ width: 6px;
|
|
|
+ height: 6px;
|
|
|
+ border-radius: 50%;
|
|
|
+ background: $elCircle;
|
|
|
+ }
|
|
|
.tem-span {
|
|
|
- display: block;
|
|
|
+ display: inline-block;
|
|
|
vertical-align: middle;
|
|
|
padding-bottom: 5px;
|
|
|
- font-size: 14px;
|
|
|
- line-height: 25px;
|
|
|
+ font-style: normal;
|
|
|
+ font-weight: 400;
|
|
|
+ font-size: 13px;
|
|
|
+ line-height: 20px;
|
|
|
+ color: #646c73;
|
|
|
padding-left: 15px;
|
|
|
}
|
|
|
}
|
|
@@ -793,6 +850,7 @@ export default defineComponent({
|
|
|
|
|
|
.detail-bottom {
|
|
|
padding: 0 15px;
|
|
|
+ padding-bottom: 30px;
|
|
|
padding-top: 40px;
|
|
|
width: 100%;
|
|
|
font-weight: 500;
|