src/assets/css/map/map-panel-style.less | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/DayData.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/Detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/HourData.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/WasteGasIndex.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/WasteGasRealChart.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteWater/Detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteWater/WasteWaterDayChart.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteWater/WasteWaterIndex.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteWater/WasteWaterRealChart.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; } 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>查询</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> 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> 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> 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; 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; 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"--> src/components/BaseNav/WasteWater/WasteWaterDayChart.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" type="datetime"> </el-date-picker> <el-date-picker v-model="formData.timeStart" value-format="yyyy-MM-dd" type="datetime" size="mini"></el-date-picker> <span class="demonstration">结束时间:</span> <el-date-picker v-model="formData.timeEnd" value-format="yyyy-MM-dd" type="datetime"> </el-date-picker> <el-date-picker v-model="formData.timeEnd" value-format="yyyy-MM-dd" 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="echartsDay"></div> <div ref="echartsDay"></div> </div> <span class="time-select">{{ formData.timeStart }}日—{{ formData.timeEnd }}日</span> </div> </template> 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: '', 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; 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>