添加查询参数

src/pages/index/components/access_data_analysis.vue

@@ -1,23 +1,34 @@
 <template>
   <div class="body-wrapper">
-<!--      <el-form class="form-wrapper" :inline="true" :model="formInline">-->
-<!--        <el-form-item label="所在区">-->
-<!--          <el-select v-model="formInline.region" placeholder="请选择所在区">-->
-<!--            <el-option-->
-<!--              v-for="item in districtOptions"-->
-<!--              :key="item.value"-->
-<!--              :label="item.label"-->
-<!--              :value="item.value">-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="停车场名称">-->
-<!--          <el-input v-model="formInline.interfaceName" placeholder="请输入停车场名称"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item>-->
-<!--          <el-button type="primary" @click="onSubmit">查询</el-button>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
+    <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
+      <el-form-item label="行政区">
+        <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item clearable label="具体道路">
+        <el-input v-model="formInline.streetName" placeholder="请输入"></el-input>
+      </el-form-item>
+      <el-form-item label="停车场">
+        <el-select clearable v-model="formInline.parkId" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in carOptions" :key="item.parkId" :label="item.carParkName" :value="item.parkId"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="查询日期">
+        <el-date-picker
+          clearable
+          v-model="formInline.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="queryAll">查询</el-button>
+      </el-form-item>
+    </el-form>
     <div style="display: flex; justify-content: space-between;">
       <div style="width: 50%; height: 300px">
         <barchart
@@ -67,11 +78,14 @@ export default {
   },
   data() {
     return {
+      districtOptions: options.districtOptions,
+      carOptions: [],
       formInline: {
-        interfaceName: '',
-        region: ''
+        regionCode: '',
+        streetName: '',
+        parkId: '',
+        time: [],
       },
-      districtOptions: options.districtOptions,
       value: '',
       modelPieColor: ["#4382f6", "#9078f8", "#79a7db", "#FF9800", "#9C27B0"],
       modelData: {
@@ -81,11 +95,31 @@ export default {
     }
   },
   mounted() {
-    this.dashAccessDataAnalysisStat1()
-    this.dashAccessDataAnalysisStat2()
+    this.getParkDic()
+    this.queryAll()
   },
   watch: {},
   methods: {
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.carOptions = res.data || [];
+      })
+    },
+    queryAll() {
+      let params = {...this.formInline}
+      if (
+        this.formInline.time && this.formInline.time.length === 2 &&
+        this.formInline.time[1] !== ""
+      ) {
+        this.formInline.time[0] = this.formInline.time[0].substring(0, 10) + " 00:00:00";
+        this.formInline.time[1] = this.formInline.time[1].substring(0, 10) + " 23:59:59";
+        params.begin= this.formInline.time[0]
+        params.end = this.formInline.time[1]
+      }
+      delete params.time
+      this.dashAccessDataAnalysisStat1(params)
+      this.dashAccessDataAnalysisStat2(params)
+    },
     tooltipFormat(params) {
       const type = params[0].seriesType;
       const data = params[0].data;
@@ -104,13 +138,13 @@ export default {
       }
       return nameArr.join('\n');
     },
-    dashAccessDataAnalysisStat1(){
-      api.dashAccessDataAnalysisStat1().then(res =>{
+    dashAccessDataAnalysisStat1(params){
+      api.dashAccessDataAnalysisStat1(params).then(res =>{
         this.bardata = res.data
       })
     },
-    dashAccessDataAnalysisStat2(){
-      api.dashAccessDataAnalysisStat2().then(res =>{
+    dashAccessDataAnalysisStat2(params){
+      api.dashAccessDataAnalysisStat2(params).then(res =>{
         this.modelData.list = res.data
       })
     },

src/pages/index/components/berth_peration_nalysis.vue

@@ -1,5 +1,35 @@
 <template>
   <div class="body-wrapper">
+    <el-form class="form-wrapper" :inline="true" :model="formInline">
+      <el-form-item label="行政区">
+        <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item clearable label="具体道路">
+        <el-input v-model="formInline.streetName" placeholder="请输入"></el-input>
+      </el-form-item>
+      <el-form-item label="停车场">
+        <el-select clearable v-model="formInline.parkId" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in carOptions" :key="item.parkId" :label="item.carParkName" :value="item.parkId"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="查询日期">
+        <el-date-picker
+          clearable
+          v-model="formInline.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="queryAll">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <br>
     <div class="page-container">
       <h2 style="color: #3498db;">泊位运营分析</h2>
       <div style="width: 99%; height: 480px">
@@ -42,6 +72,7 @@
 <script>
 import linechart from "@/components/lineChart";
 import api from "@/api/article_z";
+import options from '@/util/options'
 
 
 export default {
@@ -50,31 +81,58 @@ export default {
   },
   data() {
     return {
-      linedata: [{month: '市图书馆停车场', lastAmount: 15}, {month: '中山公园停车场', lastAmount:32}
-        , {month: '天地广场停车场', lastAmount:22}, {month: '市中心医院停车场', lastAmount:64}, {month: '建设路停车场', lastAmount:18}],
-      linedata1: [{month: '市图书馆停车场', lastAmount: 2.3}, {month: '中山公园停车场', lastAmount:3.1}
-        , {month: '天地广场停车场', lastAmount:3.8}, {month: '市中心医院停车场', lastAmount:4.2}, {month: '建设路停车场', lastAmount:1.7}],
+      districtOptions: options.districtOptions,
+      keyAreaOptions: options.keyAreaOptions,
+      carOptions: [],
+      linedata: [],
+      linedata1: [],
+      formInline: {
+        regionCode: '',
+        streetName: '',
+        parkId: '',
+        time: [],
+      },
     }
   },
   mounted() {
-    this.getLinedata1Data()
-    this.getLinedataData()
+    this.getParkDic()
+    this.queryAll()
   },
   watch: {
 
   },
   methods: {
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.carOptions = res.data || [];
+      })
+    },
+    queryAll() {
+      let params = {...this.formInline}
+      if (
+        this.formInline.time && this.formInline.time.length === 2 &&
+        this.formInline.time[1] !== ""
+      ) {
+        this.formInline.time[0] = this.formInline.time[0].substring(0, 10) + " 00:00:00";
+        this.formInline.time[1] = this.formInline.time[1].substring(0, 10) + " 23:59:59";
+        params.begin= this.formInline.time[0]
+        params.end = this.formInline.time[1]
+      }
+      delete params.time
+      this.getLinedata1Data(params)
+      this.getLinedataData(params)
+    },
     taskFinishXFormat(name) {
       var str = name.split("");
       return str.join("\n");
     },
-    getLinedata1Data(){
-      api.queryBerthPerationNalysis_Bwzzlfx().then(res=>{
+    getLinedata1Data(params){
+      api.queryBerthPerationNalysis_Bwzzlfx(params).then(res=>{
         this.linedata1=res.data;
       })
     },
-    getLinedataData(){
-      api.queryBerthPerationNalysis_Bwyyqk().then(res=>{
+    getLinedataData(params){
+      api.queryBerthPerationNalysis_Bwyyqk(params).then(res=>{
         this.linedata=res.data;
       })
     },
@@ -96,13 +154,64 @@ export default {
 }
 </script>
 <style  lang="scss" scoped>
+.form-wrapper {
+  margin-bottom: 20px;
+}
+/deep/ .el-input__inner {
+  background: #2d3744;
+  border: none;
+  border-radius: 0;
+}
+/deep/ .el-select {
+  height: 40px;
+  .el-input__inner {
+    height: 40px;
+  }
+  .el-input__prefix, .el-input__suffix {
+    height: 40px;
+  }
+
+  /* 下面设置右侧按钮居中 */
+  .el-input__suffix {
+    top: 0px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    align-content: flex-start;
+  }
+  /* 输入框加上上下边是 32px + 2px =34px */
+  .el-input__icon {
+    line-height: 0px;
+  }
+}
+/deep/ .form-wrapper .el-button {
+  background: linear-gradient(90deg,#0158d9,#3c97e4);
+  width: 100px;
+  height: 40px;
+}
 .body-wrapper {
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
+  padding: 20px;
   background: #0c0c0c;
+  .button-block{
+    text-align: right;
+    margin-bottom: 20px;
+  }
+  .table-pagination{
+    text-align: right;
+  }
+}
+.audit-dialog{
+  .mg-bt{
+    margin-bottom: 24px;
+  }
+  .label{
+    text-align: right;
+  }
+}
+/deep/ .el-textarea.is-disabled .el-textarea__inner {
+  background: #2a2a2a;
+  color: #fff;
 }
-
 </style>

src/pages/index/components/berths_revenue.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="body-wrapper">
-    <h4 style="color: #FFFFFF">泊位营收情况</h4>.
-    <br>
-    <br>
+    <h4 style="color: #FFFFFF">泊位营收情况</h4>
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-form-item label="行政区">
         <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
@@ -34,12 +32,10 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="primary" @click="queryAll">查询</el-button>
       </el-form-item>
     </el-form>
     <br>
-    <br>
-    <br>
     <div style="width: 100%;">
       <div style="width: 100%;height: 400px;">
         <h4 style="color: white">按小时统计</h4>

src/pages/index/components/charge_business_analysis.vue

@@ -1,26 +1,40 @@
 <template>
   <div class="body-wrapper">
     <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="查询日期:">
-            <el-date-picker
-              v-model="formInline.time"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              value-format="yyyy-MM-dd"
-              end-placeholder="结束日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item>
-            <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="行政区">
+        <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item clearable label="重点区域">
+        <el-select clearable v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
+          <el-option  v-for="item in keyAreaOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item clearable label="具体道路">
+        <el-input v-model="formInline.streetName" placeholder="请输入"></el-input>
+      </el-form-item>
+      <el-form-item label="停车场">
+        <el-select clearable v-model="formInline.parkId" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in carOptions" :key="item.parkId" :label="item.carParkName" :value="item.parkId"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="查询日期">
+        <el-date-picker
+          clearable
+          v-model="formInline.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="queryAll">查询</el-button>
+      </el-form-item>
     </el-form>
+    <br>
     <div style="width: 99%; height: 480px">
       <h4 style="color: white">收费数据分析</h4>
       <barchart
@@ -74,6 +88,7 @@
 import piechart from "@/components/pieChart";
 import barchart from "@/components/barChart";
 import api from "@/api/article_liao";
+import options from '@/util/options'
 
 export default {
   components: {
@@ -82,6 +97,9 @@ export default {
   },
   data() {
     return {
+      districtOptions: options.districtOptions,
+      keyAreaOptions: options.keyAreaOptions,
+      carOptions: [],
       modelPieColor: ["#4382f6","#9078f8", "#79a7db", "#FF9800", "#9C27B0"],
       modelPieColor1: ["#4382f6","#9078f8", "#6aa1e1", "#FF9800", "#9C27B0"],
       modelData: {
@@ -90,33 +108,28 @@ export default {
       },
       bardata: [],
       formInline: {
-        time: ''
+        regionCode: '',
+        keyAreas: '',
+        streetName: '',
+        parkId: '',
+        time: [],
       }
     }
   },
   mounted() {
-    this.businessAnalysisStat()
-    this.businessAnalysisStat2()
-    this.businessAnalysisStat3()
+    this.getParkDic()
+    this.queryAll()
   },
   watch: {
 
   },
   methods: {
-    onSubmit() {
-      this.businessAnalysisStat()
-      this.businessAnalysisStat2()
-      this.businessAnalysisStat3()
-    },
-    tooltipFormat(params) {
-      const type = params[0].seriesType;
-      const data = params[0].data;
-      return `<div class="line-tooltip">
-<div>${params[0].seriesName}: ${
-        params[0].data.hs || 0}元</div>
-</div>`;
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.carOptions = res.data || [];
+      })
     },
-    businessAnalysisStat(){
+    queryAll() {
       let params = {...this.formInline}
       if (
         this.formInline.time && this.formInline.time.length === 2 &&
@@ -128,38 +141,29 @@ export default {
         params.end = this.formInline.time[1]
       }
       delete params.time
+      this.businessAnalysisStat(params)
+      this.businessAnalysisStat2(params)
+      this.businessAnalysisStat3(params)
+    },
+    tooltipFormat(params) {
+      const type = params[0].seriesType;
+      const data = params[0].data;
+      return `<div class="line-tooltip">
+<div>${params[0].seriesName}: ${
+        params[0].data.hs || 0}元</div>
+</div>`;
+    },
+    businessAnalysisStat(params){
       api.businessAnalysisStat(params).then(res =>{
         this.bardata = res.data
       })
     },
-    businessAnalysisStat2(){
-      let params = {...this.formInline}
-      if (
-        this.formInline.time && this.formInline.time.length === 2 &&
-        this.formInline.time[1] !== ""
-      ) {
-        this.formInline.time[0] = this.formInline.time[0].substring(0, 10) + " 00:00:00";
-        this.formInline.time[1] = this.formInline.time[1].substring(0, 10) + " 23:59:59";
-        params.begin= this.formInline.time[0]
-        params.end = this.formInline.time[1]
-      }
-      delete params.time
+    businessAnalysisStat2(params){
       api.businessAnalysisStat2(params).then(res =>{
         this.modelData.list = res.data
       })
     },
-    businessAnalysisStat3(){
-      let params = {...this.formInline}
-      if (
-        this.formInline.time && this.formInline.time.length === 2 &&
-        this.formInline.time[1] !== ""
-      ) {
-        this.formInline.time[0] = this.formInline.time[0].substring(0, 10) + " 00:00:00";
-        this.formInline.time[1] = this.formInline.time[1].substring(0, 10) + " 23:59:59";
-        params.begin= this.formInline.time[0]
-        params.end = this.formInline.time[1]
-      }
-      delete params.time
+    businessAnalysisStat3(params){
       api.businessAnalysisStat3(params).then(res =>{
         this.modelData.list1 = res.data
       })