From 6a6e940cc87ad0813998f89ac83447c3d6915d29 Mon Sep 17 00:00:00 2001
From: QibolinCzp <qibolin02429@126.com>
Date: 星期五, 14 五月 2021 15:20:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/Detail.vue | 59 ++---------
src/components/BaseNav/WasteWater/Detail.vue | 65 +++----------
src/components/BaseNav/WasteWater/WasteWaterIndex.vue | 1
src/components/BaseNav/WasteWater/WasteWaterRealChart.vue | 18 +--
src/assets/css/map/map-panel-style.less | 25 ++++-
src/components/BaseNav/WasteGas/DayData.vue | 18 +--
src/components/BaseNav/WasteGas/WasteGasRealChart.vue | 38 +------
src/components/BaseNav/WasteGas/WasteGasIndex.vue | 2
src/components/BaseNav/WasteGas/HourData.vue | 23 +---
src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue | 20 +--
10 files changed, 77 insertions(+), 192 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index dd70774..8ba44f8 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -738,7 +738,7 @@
display: flex;
align-items: center;
justify-content: space-between;
-
+ padding: 5px 0;
.time-select {
cursor: pointer;
padding: 5px;
@@ -752,9 +752,6 @@
}
.echarts-form {
- height: 0.3rem;
- line-height: 0.3rem;
-
.demonstration {
color: #00fff6;
font-size: 12px;
@@ -762,7 +759,6 @@
}
.el-input__inner {
- height: 0.15rem;
background-color: #2e4967;
color: #fff;
font-size: 12px;
@@ -808,3 +804,22 @@
.leaflet-tooltip-left::before{border-left-color: @background-color;}
.leaflet-tooltip-right::before{border-right-color: @background-color;}
.leaflet-tooltip-bottom::before{border-bottom-color: @background-color;}
+
+
+.el-date-editor.el-input, .el-date-editor.el-input__inner{
+ width: 160px;
+ height: 30px;
+}
+.el-select.el-select--mini{
+ width: 80px;
+}
+.time-select{
+ display:block;text-align: center;
+}
+.public-bounced-content-left{
+ width: 5rem;
+}
+.echarts-chart>div{
+ width: 100%;
+ height: 1.5rem;
+}
diff --git a/src/components/BaseNav/WasteGas/DayData.vue b/src/components/BaseNav/WasteGas/DayData.vue
index 59a87ce..d51e218 100644
--- a/src/components/BaseNav/WasteGas/DayData.vue
+++ b/src/components/BaseNav/WasteGas/DayData.vue
@@ -2,31 +2,23 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.timeStart }}鏃モ�攞{ formData.timeEnd }}鏃�</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.timeStart"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.timeStart" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.timeEnd"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.timeEnd" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch">鏌ヨ</el-button>
<el-button>鏄庣粏琛�</el-button>
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="wastegasday"></div>
+ <div ref="wastegasday"></div>
</div>
+ <span class="time-select">{{ formData.timeStart }}鏃モ�攞{ formData.timeEnd }}鏃�</span>
</div>
</template>
diff --git a/src/components/BaseNav/WasteGas/Detail.vue b/src/components/BaseNav/WasteGas/Detail.vue
index 4ba715c..a89c99c 100644
--- a/src/components/BaseNav/WasteGas/Detail.vue
+++ b/src/components/BaseNav/WasteGas/Detail.vue
@@ -1,55 +1,24 @@
<template>
- <div class="wastegas" style="width: 5rem;height: 1.5rem">
+ <div class="wastegas" style="width: 5rem;height: 2.07rem">
<el-table
:data="tableData"
style="width: 100%;height: 100%">
- <el-table-column
- prop="LabMonTime"
- label="妫�娴嬫椂闂�">
+ <el-table-column prop="LabMonTime" label="妫�娴嬫椂闂�"></el-table-column>
+ <el-table-column label="姘哀鍖栫墿">
+ <el-table-column prop="NOMonTime" label="鐩戞祴鍊�" width="70"></el-table-column>
+ <el-table-column prop="NOEndTime" label="鏍囧噯鍊�" width="70"></el-table-column>
</el-table-column>
- <el-table-column
- label="姘哀鍖栫墿">
- <el-table-column
- prop="NOMonTime"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="NOEndTime"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="浜屾哀鍖栫～">
+ <el-table-column prop="SOMontime" label="鐩戞祴鍊�" width="70"></el-table-column>
+ <el-table-column prop="SoEndTime" label="鏍囧噯鍊�" width="70"></el-table-column>
</el-table-column>
- <el-table-column
- label="浜屾哀鍖栫～">
- <el-table-column
- prop="SOMontime"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="SoEndTime"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="鐑熷皹">
+ <el-table-column prop="MonItemId" label="鐩戞祴鍊�" width="70"></el-table-column>
+ <el-table-column prop="EndMonTime" label="鏍囧噯鍊�" width="70"></el-table-column>
</el-table-column>
- <el-table-column
- label="鐑熷皹">
- <el-table-column
- prop="MonItemId"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="EndMonTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="闈炵敳鐑锋�荤儍">
- <el-table-column
- prop="MonItemId"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="MonItemId"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="闈炵敳鐑锋�荤儍">
+ <el-table-column prop="MonItemId" label="鐩戞祴鍊�" width="70"></el-table-column>
+ <el-table-column prop="MonItemId" label="鏍囧噯鍊�" width="70"></el-table-column>
</el-table-column>
</el-table>
</div>
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index d9b6357..593e75f 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -2,36 +2,25 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.timeStart }}鏃垛�攞{ formData.timeEnd }}鏃�</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.timeStart"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.timeStart" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.timeEnd"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.timeEnd" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini" >
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch">鏌ヨ</el-button>
<el-button @click="ScheduleShow">鏄庣粏琛�</el-button>
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="wastegashour"></div>
+ <div ref="wastegashour"></div>
</div>
+ <span class="time-select">{{ formData.timeStart }}鏃垛�攞{ formData.timeEnd }}鏃�</span>
<!-- 鏄庣粏寮规-->
- <el-dialog :visible.sync="showSchedule"
- :modal="false"
- v-dialogDrag
- >
+ <el-dialog :visible.sync="showSchedule" :modal="false" v-dialogDrag>
<div class="el-dialog-div" style="height: 200px">
<Scheduleof></Scheduleof>
</div>
diff --git a/src/components/BaseNav/WasteGas/WasteGasIndex.vue b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
index 183cc28..d86efc6 100644
--- a/src/components/BaseNav/WasteGas/WasteGasIndex.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
@@ -146,7 +146,7 @@
.public-part {
position: relative;
- margin-bottom: 0.1rem;
+
background-color: @background-color;
font-size: 0.06rem;
font-weight: normal;
diff --git a/src/components/BaseNav/WasteGas/WasteGasRealChart.vue b/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
index de4951a..ed164f5 100644
--- a/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
@@ -2,29 +2,21 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.startTime }}鈥攞{ formData.endTime }}</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.startTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini" ></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.endTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch">鏌ヨ</el-button>
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="echarts"></div>
+ <div ref="echarts"></div>
+ <span class="time-select">{{ formData.startTime }}鈥攞{ formData.endTime }}</span>
<!-- <public-chart :propsData="propsData"></public-chart>-->
</div>
</div>
@@ -612,27 +604,7 @@
<style scoped lang="less">
.echarts-box {
- .tab-scroll {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .time-select {
- cursor: pointer;
- padding: 5px;
- border: 1px solid #2b87c8;
- border-radius: 4px;
- text-align: center;
- color: #fff;
- font-size: 11px;
- width: 280px;
- }
- }
-
.echarts-form {
- height: 0.3rem;
- line-height: 0.3rem;
-
.demonstration {
color: #00fff6;
font-size: 12px;
diff --git a/src/components/BaseNav/WasteWater/Detail.vue b/src/components/BaseNav/WasteWater/Detail.vue
index e156d44..5dc823d 100644
--- a/src/components/BaseNav/WasteWater/Detail.vue
+++ b/src/components/BaseNav/WasteWater/Detail.vue
@@ -1,57 +1,22 @@
<template>
- <div class="detail" style="width: 5.5rem">
- <el-table
- :data="tableData"
- style="width: 100%;"
- height="280px"
- >
- <el-table-column
- prop="LabMonTime"
- label="妫�娴嬫椂闂�">
+ <div class="detail" style="width: 5rem">
+ <el-table :data="tableData" style="width: 100%;" height="2.07rem">
+ <el-table-column prop="LabMonTime" label="妫�娴嬫椂闂�"></el-table-column>
+ <el-table-column label="COD">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
- <el-table-column
- label="COD">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="LabMonValue"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="姘ㄦ爱">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
- <el-table-column
- label="姘ㄦ爱">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="LabMonValue"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="鎬荤７">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
- <el-table-column
- label="鎬荤７">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="LabMonValue"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="鎬绘爱">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="LabMonValue"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="鎬绘爱">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
diff --git a/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue b/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue
index 4a33b5e..765f402 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue
@@ -2,31 +2,23 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.startTime }}鏃垛�攞{ formData.endTime }}鏃�</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.startTime"
- value-format="yyyy-MM-dd HH"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.startTime" value-format="yyyy-MM-dd HH" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.endTime"
- value-format="yyyy-MM-dd HH"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.endTime" value-format="yyyy-MM-dd HH" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch()">鏌ヨ</el-button>
<el-button>鏄庣粏琛�</el-button>
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="echartsHour"></div>
+ <div ref="echartsHour"></div>
</div>
+ <span class="time-select">{{ formData.startTime }}鏃垛�攞{ formData.endTime }}鏃�</span>
</div>
</template>
@@ -77,7 +69,7 @@
{
current: {
name: '搴熸皵娴侀噺',
- val: 120
+ val: 123
},
standard: {
name: '',
diff --git a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
index f891ef9..ca2be94 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
@@ -146,7 +146,6 @@
.public-part {
position: relative;
- margin-bottom: 0.1rem;
background-color: @background-color;
font-size: 0.06rem;
font-weight: normal;
diff --git a/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue b/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
index b5be07f..2c7a925 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
@@ -2,31 +2,23 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.startTime }}鈥攞{ formData.endTime }}</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.startTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.endTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch()">鏌ヨ</el-button>
<!-- <el-button>鏄庣粏琛�</el-button>-->
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="echarts"></div>
+ <div ref="echarts"></div>
</div>
+ <span class="time-select">{{ formData.startTime }}鈥攞{ formData.endTime }}</span>
</div>
</template>
--
Gitblit v1.8.0