bug fixed

src/pages/index/components/parking_area.vue

@@ -281,7 +281,7 @@ export default {
             coordinateSystem: 'amap',
             data: convertData(data.sort(function (a, b) {
               return b.value - a.value;
-            }).slice(0, 6)),
+            }).slice(0, 5)),
             symbolSize: function (val) {
               return val[2] / 10;
             },
@@ -299,7 +299,7 @@ export default {
               show: false
             },
             itemStyle: {
-              color: '#fff',
+              color: '#f00',
               shadowBlur: 10,
               shadowColor: '#333'
             },

src/pages/index/components/parking_lot_situation.vue

@@ -111,7 +111,8 @@ export default {
       formInline: {
         parkId: '',
         regionCode: '',
-        keyAreas: ''
+        keyAreas: '',
+        streetName: ''
       },
       queryParams: {},
       formInline2: {
@@ -120,8 +121,8 @@ export default {
         keyAreas: ''
       },
       queryParams2: {},
-      districtOptions: options.districtOptions,
       carOptions: [],
+      districtOptions: options.districtOptions,
       keyAreaOptions: options.keyAreaOptions,
       activeName: '实时概况',
       columns: [

src/pages/index/components/saturation_warning.vue

@@ -1,7 +1,29 @@
 <template>
   <div class="body-wrapper">
-    <div style="color: #3498db;font-size: 23px;margin-bottom: 20px">全市停车饱和度</div>
-    <div class="body-wrapper" style="height: 300px;">
+    <el-form class="form-wrapper" :inline="true" ref="formInline" :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.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="重点区域">
+        <el-select clearable filterable v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in keyAreaOptions" :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.streetName" placeholder="请输入"></el-input>
+      </el-form-item>
+      <el-form-item label="停车场">
+        <el-select clearable filterable 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>
+        <el-button type="primary" @click="queryAll">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div style="width: 100%; height: 300px">
       <linechart
         :autoStop="false"
         :top="30"
@@ -12,22 +34,22 @@
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'month', y: 'thisAmount', seriesName: '预警值',col:'red' },
-              { x: 'month', y: 'lastAmount', seriesName: '饱和度',bool:'true' },
+              { x: 'mouth', y: 'thisAmount', seriesName: '预警值',col:'red' },
+              { x: 'mouth', y: 'lastAmount', seriesName: '饱和度',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
-      <div class="body-wrapper" style=" height: 450px">
-        <div style="color: #3498db;font-size: 23px;margin-bottom: 20px">网格化停车饱和预警</div>
-        <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
-          <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
-          </el-table-column>
-        </el-table>
-        <div class="table-pagination">
-          <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
-                         :current-page.sync="pageNum" :page-size.sync="pageSize">
-          </el-pagination>
-        </div>
+    </div>
+    <div class="body-wrapper" style=" height: 450px">
+      <div style="color: #3498db;font-size: 23px;margin-bottom: 20px">网格化停车饱和预警</div>
+      <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
+        <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
+        </el-table-column>
+      </el-table>
+      <div class="table-pagination">
+        <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
+                       :current-page.sync="pageNum" :page-size.sync="pageSize">
+        </el-pagination>
       </div>
     </div>
   </div>
@@ -36,6 +58,7 @@
 import linechart from "@/components/lineChart";
 import vtable from "@/components/vtableNew";
 import api from '@/api/audit'
+import options from '@/util/options'
 
 export default {
   components: {
@@ -45,11 +68,14 @@ export default {
   data() {
     return {
       formInline: {
-        region0: '',
-        region1: '',
-        region2: '',
-        region3: '',
+        parkId: '',
+        regionCode: '',
+        streetName: '',
+        keyAreas: ''
       },
+      carOptions: [],
+      districtOptions: options.districtOptions,
+      keyAreaOptions: options.keyAreaOptions,
       linedata: [],
       columns: [
         {
@@ -71,23 +97,34 @@ export default {
     }
   },
   mounted() {
-    this.getTcbhyj()
-    this.getTableData()
+    this.getParkDic()
+    this.queryAll()
   },
   watch: {
   },
   methods: {
+    queryAll() {
+      this.pageNum = 1;
+      this.queryParams = {...this.formInline}
+      this.getTcbhyj()
+      this.getTableData()
+    },
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.carOptions = res.data || [];
+      })
+    },
     getTcbhyj() {
-      api.tcbhyj().then(res => {
-        this.linedata = res.data.map(item => ({...item, thisAmount: 30})) || []
+      api.tcbhyj({...this.queryParams}).then(res => {
+        this.linedata = res.data.map(item => ({...item, thisAmount: 80})) || []
       })
     },
     handlePageChange() {
       this.getTableData()
     },
     getTableData() {
-      const {pageNum, pageSize} = this
-      api.wghtcbhyj({current: pageNum, size: pageSize}).then(res => {
+      const {pageNum, pageSize, queryParams} = this
+      api.wghtcbhyj({current: pageNum, size: pageSize, ...queryParams}).then(res => {
         this.tableData = res.data.records || []
         this.total = res.data.total
       })