diff --git a/src/views/sound/function/statistic/compare.vue b/src/views/sound/function/statistic/compare.vue deleted file mode 100644 index 174485f..0000000 --- a/src/views/sound/function/statistic/compare.vue +++ /dev/null @@ -1,502 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/sound/function/statistic/leq-compare.vue b/src/views/sound/function/statistic/leq-compare.vue deleted file mode 100644 index e5ad4b0..0000000 --- a/src/views/sound/function/statistic/leq-compare.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/sound/road/trend/index.vue b/src/views/sound/road/trend/index.vue index 6c62932..968b80e 100644 --- a/src/views/sound/road/trend/index.vue +++ b/src/views/sound/road/trend/index.vue @@ -24,13 +24,13 @@ - + - + @@ -63,7 +63,7 @@ queryParams: { startYear: 2020, endYear: 2021, - areaList: ['兴宁区','西乡塘区'], + areaList: [], placeList: [] }, trendData: [], @@ -78,12 +78,6 @@ this.drawTrend() }, methods: { - handleAreaChange(value) { - this.queryParams.areaList = Object.values(value) - }, - handlePlaceChange(value) { - this.queryParams.placeList = Object.values(value) - }, // 下拉列表 loadOptionData() { getColumnOptions("place").then((res) => { @@ -101,6 +95,7 @@ value: item, }; }); + this.areaOptions.unshift({ label: '南宁市', value: '南宁'}) }); getColumnOptions("monitor_year").then((res) => { this.yearOptions = res.data.data.map((item) => { @@ -124,6 +119,9 @@ }) }, initChart() { + this.trendData.yAxis[0].axisLabel = { + formatter: function (value) { return value.toFixed(1);} + }; echarts.init(document.getElementById("chartColumn")).dispose(); this.chartColumn = markRaw(echarts.init(document.getElementById('chartColumn'))) this.chartColumn.setOption({ diff --git a/src/views/water/drinking-water/statistic/city/overStandard.vue b/src/views/water/drinking-water/statistic/city/overStandard.vue index 5072771..28ca624 100644 --- a/src/views/water/drinking-water/statistic/city/overStandard.vue +++ b/src/views/water/drinking-water/statistic/city/overStandard.vue @@ -8,6 +8,7 @@ :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" + :visiable="visiable" @filterColumns="changeFilter" /> @@ -56,7 +57,10 @@ export default { default: function () { return [] }, - } + }, + visiable:{ + typeof:Boolean + } }, data() { return { diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue index e1ca11c..bb48dc4 100644 --- a/src/views/water/drinking-water/statistic/city/situation.vue +++ b/src/views/water/drinking-water/statistic/city/situation.vue @@ -123,7 +123,7 @@ export default { bill: {}, editableData:[], // 表格数据接口 - datasource:{}, + datasource:[], selection: [], columns:[ {key: "index",title:"序号",dataIndex: "index",width: 48,align: "center",customRender: ({ index }) => index + 1,}, diff --git a/src/views/water/drinking-water/statistic/city/waterCount.vue b/src/views/water/drinking-water/statistic/city/waterCount.vue index 46dd0d0..716b1b7 100644 --- a/src/views/water/drinking-water/statistic/city/waterCount.vue +++ b/src/views/water/drinking-water/statistic/city/waterCount.vue @@ -6,6 +6,7 @@ { + let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val; + this.emitData(isSearch) + },200) } }, diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue index f6bb3e4..8ea5126 100644 --- a/src/views/water/drinking-water/statistic/components/countySearch.vue +++ b/src/views/water/drinking-water/statistic/components/countySearch.vue @@ -174,8 +174,10 @@ export default { }, // 监听组件显示 visiable(val){ - console.log('change',val) - this.emitData(val) + window.setTimeout(()=>{ + let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val; + this.emitData(isSearch) + },200) } }, diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue index 54838f8..10e74f5 100644 --- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue +++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue @@ -174,8 +174,10 @@ export default { }, // 监听组件显示 visiable(val){ - console.log('change',val) - this.emitData(val) + window.setTimeout(()=>{ + let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val; + this.emitData(isSearch) + },200) } }, diff --git a/src/views/water/drinking-water/statistic/countryside/overStandard.vue b/src/views/water/drinking-water/statistic/countryside/overStandard.vue index 3de29fb..76414ae 100644 --- a/src/views/water/drinking-water/statistic/countryside/overStandard.vue +++ b/src/views/water/drinking-water/statistic/countryside/overStandard.vue @@ -8,6 +8,7 @@ :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" + :visiable="visiable" @filterColumns="changeFilter" /> @@ -56,7 +57,10 @@ export default { default: function () { return [] }, - } + }, + visiable:{ + typeof:Boolean + } }, data() { return { diff --git a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue index cc3a44b..4dcd416 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue @@ -68,7 +68,7 @@ export default { locale, bill: {}, // 表格数据接口 - datasource:{}, + datasource:[], selection: [], columns:[ {title:"城市名称",dataIndex:"city",}, diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue index 805d21d..cc915e0 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue @@ -69,7 +69,7 @@ export default { locale, bill: {}, // 表格数据接口 - datasource:{}, + datasource:[], selection: [], columns:[ {title:"年份",dataIndex:"year",}, diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue index dd5bf4e..14cb4ea 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue @@ -68,7 +68,7 @@ export default { locale, bill: {}, // 表格数据接口 - datasource:{}, + datasource:[], selection: [], columns:[ {title:"断面名称",dataIndex:"sectionName",}, diff --git a/src/views/water/drinking-water/statistic/county/overStandard.vue b/src/views/water/drinking-water/statistic/county/overStandard.vue index 307d13e..76af50a 100644 --- a/src/views/water/drinking-water/statistic/county/overStandard.vue +++ b/src/views/water/drinking-water/statistic/county/overStandard.vue @@ -6,6 +6,7 @@ index + 1,}, diff --git a/src/views/water/drinking-water/statistic/county/waterCount.vue b/src/views/water/drinking-water/statistic/county/waterCount.vue index 2a00a29..b15034d 100644 --- a/src/views/water/drinking-water/statistic/county/waterCount.vue +++ b/src/views/water/drinking-water/statistic/county/waterCount.vue @@ -6,6 +6,7 @@