接口联调

src/api/audit.js

@@ -212,7 +212,121 @@ export default {
   // 经营情况_列表
   jyqk(params) {
     return axios.get('/dash/business/conditions/page', {params})
-  }
-
-
+  },
+  // 停车热力图_当前
+  tcrlt1() {
+    return axios.post('/opt/parking/heatmap/stat1')
+  },
+  //  停车热力图_预计未来一周
+  tcrlt2() {
+    return axios.post('/opt/parking/heatmap/stat2')
+  },
+  // 停车场分析报表
+  tccfxbbListByPage(params) {
+    return axios.get('/opt/parking/analysis/report/page', {params})
+  },
+  // 停车时段分析_停车高峰时段分析
+  tcsdfx1() {
+    return axios.post('/opt/parking/period/analysis/stat1')
+  },
+  // 停车时段分析_出入场压力分析
+  tcsdfx2() {
+    return axios.post('/opt/parking/period/analysis/stat2')
+  },
+  // 停车时段分析_停车饱和度分析
+  tcsdfx3() {
+    return axios.post('/opt/parking/period/analysis/stat3')
+  },
+  // 停车实况分析_泊位占用率
+  tcskfx1() {
+    return axios.post('/opt/parking/live/stat1')
+  },
+  // 停车实况分析_在场会员车占比
+  tcskfx2() {
+    return axios.post('/opt/parking/live/stat2')
+  },
+  // 停车实况分析_进出场趋势
+  tcskfx3() {
+    return axios.post('/opt/parking/live/stat3')
+  },
+  // 泊位利用分析_泊位利用率变化趋势
+  bwlyfx(params) {
+    return axios.get('/opt/berth/use/list1', {params})
+  },
+  // 停车总分析_停车利用率
+  tclyl(params) {
+    return axios.get('/opt/access/parking/analysis/page1', {params})
+  },
+  // 停车总分析_停车记录
+  tcjl(params) {
+    return axios.get('/opt/access/parking/analysis/page', {params})
+  },
+  // 停车总分析_停车难易指数变化趋势
+  tczfx1(params) {
+    return axios.post('/opt/access/parking/analysis/stat1', params)
+  },
+  // 停车总分析_停车利用率
+  tczfx2(params) {
+    return axios.post('/opt/access/parking/analysis/stat2', params)
+  },
+  // 停车总分析_停车场总览
+  tczfx3(params) {
+    return axios.get('/opt/access/parking/analysis/view', {params})
+  },
+  // 停车时长分析
+  tcscfx(params) {
+    return axios.post('/opt/parking/time/analysis/stat1', params)
+  },
+  // 停车时长分析_周转次数排行
+  tcscfxList1(params) {
+    return axios.get('/opt/parking/time/analysis/list1', {params})
+  },
+  // 停车时长分析_停车时长排行
+  tcscfxList2(params) {
+    return axios.get('/opt/parking/time/analysis/list2', {params})
+  },
+  // 临时停车统计_临时停车统计
+  lstctj1(params) {
+    return axios.post('/opt/parking/temp/stat1', params)
+  },
+  // 临时停车统计_过去30日临时停车趋势
+  lstctj2(params) {
+    return axios.post('/opt/parking/temp/stat2', params)
+  },
+  // 泊位周转分析_车流量趋势
+  bwzzfx1(params) {
+    return axios.post('/opt/berth/turnover/stat1', params)
+  },
+  // 泊位周转分析_泊位周转率变化趋势
+  bwzzfx2(params) {
+    return axios.post('/opt/berth/turnover/stat2', params)
+  },
+  // 停车场泊位分析
+  tccbwfx(params) {
+    return axios.post('/opt/parking/lot/stat1', params)
+  },
+  // 夜间停车统计_日夜间停车总小时数
+  yjtctj1(params) {
+    return axios.post('/opt/parking/night/stat1', params)
+  },
+  // 夜间停车统计_停车时长
+  yjtctjListByPage(params) {
+    return axios.get('/opt/parking/night/page', {params})
+  },
+  // 车辆类型_新能源车占比
+  cllx1(params) {
+    return axios.post('/opt/vehicle/type/stat1', params)
+  },
+  // 车辆类型_车型分类
+  cllx2(params) {
+    return axios.post('/opt/vehicle/type/stat2', params)
+  },
+  // 车辆类型_新能源趋势
+  cllx3(params) {
+    return axios.post('/opt/vehicle/type/stat3', params)
+  },
+  // 车辆类型_新能源车排名
+  cllx4(params) {
+    return axios.post('/opt/vehicle/type/stat4', params)
+  },
 }

src/pages/index/components/berth_turnover.vue

@@ -10,34 +10,33 @@
           legendIcon="react"
           v-if="activeName === '车流量趋势'"
           :bottom="30"
-          :xlabelFormat="xLabelFormat"
           :top="60"
-          yAxisName="(元)"
+          yAxisName="(辆)"
           :tooltip="tooltipFormat"
           :dataset="bardata"
           :encode="[
-            {x: 'month', y: 'hs', seriesName: '入场车辆'},
-            {x: 'month', y: 'cs', seriesName: '出场车辆'}]"
+            {x: 'mouth', y: 'hs', seriesName: '入场车辆'},
+            {x: 'mouth', y: 'cs', seriesName: '出场车辆'}]"
           :labelSize="15"
           id="fxdqhszzt"
         />
         </div>
       </el-tab-pane>
       <el-tab-pane label="泊位周转率变化趋势" name="泊位周转率变化趋势">
-        <div style="width: 100%;height: 300px">
+        <div style="width: 100%;height: 580px">
         <linechart
           :autoStop="false"
           :top="30"
-          :bottom="30"
+          :bottom="180"
           :left="40"
           :legendTop="0"
-          yAxisName="辆"
+          yAxisName="%"
+          :xlabelFormat="xLabelFormat"
           v-if="activeName === '泊位周转率变化趋势'"
           :dataset="linedata"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'rc', seriesName: '入场',bool:'true' },
-              { x: 'month', y: 'cc', seriesName: '出场',bool:'true' },
+              { x: 'mouth', y: 'lastAmount', seriesName: '泊位周转率',bool:'true' },
             ]"
           id="sxcyfzqk"
         />
@@ -47,88 +46,25 @@
   </div>
 </template>
 <script>
-import piechart from "@/components/pieChart";
 import linechart from "@/components/lineChart";
 import barchart from "@/components/barChart";
+import api from '@/api/audit'
 
 export default {
     components: {
-      piechart,
       linechart,
       barchart
     },
     data() {
       return {
-        linedata: [{"month":"周一","rc":50,"cc":30}],
+        linedata: [],
         activeName: '车流量趋势',
-        bardata: [],
-        tableData1: [],
-        total1: 0,
-        pageSize1: 10,
-        pageNum1: 1,
-        formInline1: {
-          plateNo: ''
-        },
-        columns2: [
-          {
-            label: '车牌号',
-            key: 'plateNo'
-          },
-          {
-            label: '停车场',
-            key: 'carParkName'
-          },
-          {
-            label: '行为',
-            key: 'behavior'
-          },
-          {
-            label: '时间',
-            key: 'behaviorTime'
-          }
-        ],
-        tableData2: [],
-        total2: 0,
-        pageSize2: 10,
-        pageNum2: 1,
-        formInline2: {
-          plateNo: ''
-        },
-        columns3: [
-          {
-            label: '车牌号',
-            key: 'plateNo'
-          },
-          {
-            label: '停车场',
-            key: 'carParkName'
-          },
-          {
-            label: '泊位号',
-            key: 'parkingNo'
-          },
-          {
-            label: '入场时间',
-            key: 'inTime'
-          },
-          {
-            label: '出场时间',
-            key: 'outTime'
-          }
-        ],
-        tableData3: [],
-        total3: 0,
-        pageSize3: 10,
-        pageNum3: 1,
-        formInline3: {
-          plateNo: ''
-        }
+        bardata: []
       }
     },
     mounted() {
-      this.getTableData1()
-      this.getTableData2()
-      this.getTableData3()
+      this.getBarData()
+      this.getLineData()
     },
     watch: {
     },
@@ -136,10 +72,7 @@ export default {
       lineTooltipFormat(params) {
         return `<div class="line-tooltip">
         <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-          params[0].data.lastYearAmount || "--"
-        }</div>
-        <div style="color: ${params[1].color}">${params[1].seriesName}: ${
-          params[1].data.thisYearAmount || "--"
+          params[0].data.lastAmount || "--"
         }</div>
       </div>`;
       },
@@ -154,55 +87,19 @@ export default {
 </div>`;
       },
       xLabelFormat(name) {
-        const nameArr = []
-        for(let i=0; i<name.length; i+=7) {
-          nameArr.push(name.substring(i, i+7))
-        }
-        return nameArr.join('\n');
+        var str = name.split("");
+        return str.join("\n");
       },
-      onSubmit1() {
-        this.pageNum1 = 1
-        this.getTableData1()
-      },
-      onSubmit2() {
-        this.pageNum2 = 1
-        this.getTableData2()
-      },
-
-      onSubmit3() {
-        this.pageNum3 = 1
-        this.getTableData3()
-      },
-      handlePageChange1() {
-        this.getTableData1()
-      },
-      getTableData1() {
-        const {pageNum1, pageSize1} = this
-        api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
-          this.tableData1 = (res.data.records || []).map(item => ({...item, carType: item.plateNo.length === 7 ? '燃油汽车' : '新能源车', }))
-          this.total1 = res.data.total
+      getBarData() {
+        api.bwzzfx1().then(res => {
+          this.bardata = res.data || []
         })
       },
-      handlePageChange2() {
-        this.getTableData2()
-      },
-      getTableData2() {
-        const {pageNum2, pageSize2} = this
-        api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-          this.tableData2 = res.data.records || []
-          this.total2 = res.data.total
+      getLineData() {
+        api.bwzzfx2().then(res => {
+          this.linedata = res.data || []
         })
       },
-      handlePageChange3() {
-        this.getTableData3()
-      },
-      getTableData3() {
-        const {pageNum3, pageSize3} = this
-        api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
-          this.tableData3 = res.data.records || []
-          this.total3 = res.data.total
-        })
-      }
     }
 }
 </script>

src/pages/index/components/berth_use.vue

@@ -1,28 +1,28 @@
 <template>
   <div class="body-wrapper">
-    <el-form class="form-wrapper" :inline="true" :model="formInline">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="停车场名称:">
-            <el-input v-model="formInline.parkingName" placeholder="请输入"></el-input>
-          </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>
-    <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
+<!--    <el-form class="form-wrapper" :inline="true" :model="formInline">-->
+<!--      <el-row>-->
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="停车场名称:">-->
+<!--            <el-input v-model="formInline.parkingName" placeholder="请输入"></el-input>-->
+<!--          </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>-->
+    <el-table :data="tableData" height="800" 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 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>
 </template>
 <script>
@@ -35,35 +35,35 @@ export default {
       columns: [
         {
           label: '停车场名称',
-          key: 'parkingName'
+          key: 'carParkName'
         },
         {
           label: '星期一',
-          key: ''
+          key: 'day1Rate'
         },
         {
           label: '星期二',
-          key: ''
+          key: 'day2Rate'
         },
         {
           label: '星期三',
-          key: ''
+          key: 'day3Rate'
         },
         {
           label: '星期四',
-          key: ''
+          key: 'day4Rate'
         },
         {
           label: '星期五',
-          key: ''
+          key: 'day5Rate'
         },
         {
           label: '星期六',
-          key: ''
+          key: 'day6Rate'
         },
         {
           label: '星期天',
-          key: ''
+          key: 'day7Rate'
         },
       ],
       tableData: [],
@@ -77,24 +77,24 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData()
+    this.getTableData()
   },
   watch: {
   },
   methods: {
     getTableData() {
       const {pageNum, pageSize} = this
-      api.ipListByPage({current: pageNum, size: pageSize, ipAddr: this.formInline.ipAddr}).then(res => {
-        this.tableData = res.data.records || []
-        this.total = res.data.total
+      api.bwlyfx({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
+        this.tableData = res.data || []
+        // this.total = res.data.total
       })
     },
-    onSubmit () {
-      this.getTableData()
-    },
-    handlePageChange() {
-      this.getTableData()
-    },
+    // onSubmit () {
+    //   this.getTableData()
+    // },
+    // handlePageChange() {
+    //   this.getTableData()
+    // },
   }
 }
 </script>

src/pages/index/components/night_parking_statistics.vue

@@ -11,10 +11,11 @@
           :legendTop="0"
           yAxisName="(小时)"
           :dataset="linedata"
-          :xlabelFormat="taskFinishXFormat"
+          :xlabelFormat="xLabelFormat"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'lastAmount', seriesName: '泊位盈余情况',bool:'true' },
+              { x: 'month', y: 'lastYearAmount', seriesName: '夜间',bool:'true' },
+              { x: 'month', y: 'thisYearAmount', seriesName: '日间',bool:'true' },
             ]"
           id="sxcyfzqk"
         />
@@ -41,7 +42,7 @@
 </template>
 <script>
 import linechart from "@/components/lineChart";
-import api from "@/api/article_z";
+import api from "@/api/audit";
 
 
 export default {
@@ -65,11 +66,11 @@ export default {
         },
         {
           label: '日间停车总时长',
-          key: 'dayTime'
+          key: 'light'
         },
         {
           label: '夜间停车总时长',
-          key: 'nightTime'
+          key: 'night'
         }
       ],
     }
@@ -82,26 +83,29 @@ export default {
 
   },
   methods: {
-    taskFinishXFormat(name) {
+    xLabelFormat(name) {
       var str = name.split("");
       return str.join("\n");
     },
     getLinedata(){
-      api.queryBerthPerationNalysis_Bwyyqk().then(res=>{
-        this.linedata=res.data;
+      api.yjtctj1().then(res=>{
+        this.linedata=res.data || [];
       })
     },
     lineTooltipFormat(params) {
       const data = params[0].data;
       return `<div class="line-tooltip">
         <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-        params[0].data.lastAmount || "--"
-      }</div>`;
+        params[0].data.lastYearAmount || "--"
+      }</div>
+        <div style="color: ${params[1].color}">${params[1].seriesName}: ${
+        params[0].data.thisYearAmount || "--"
+      }</div>
+    </div>`;
     },
     getTabledata() {
       const {pageNum, pageSize} = this;
-      // todo
-      api.queryList({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
+      api.yjtctjListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
         this.tableData = res.data.records || []
         this.total = res.data.total || 0
       })

src/pages/index/components/parking_analysis.vue

@@ -1,13 +1,22 @@
-@ -0,0 +1,257 @@
 <template>
   <div class="body-wrapper">
     <div>
       <h2 style="color: #3498db;margin-bottom: 20px;display: inline-block;width: 90%">停车总分析</h2>
     </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 style="display: flex;justify-content: space-around;color: #fff;">
+      <div style="width: 25%;display: flex;">
+        <h4 class="h4font">车场总数：</h4><h3 class="h4font">{{viewData.totalPark}}</h3>
+      </div>
+      <div style="width: 25%;display: flex;">
+        <h4 class="h4font">本月新增车场：</h4><h3 class="h4font">{{viewData.monthPark}}</h3>
+      </div>
+      <div style="width: 25%;display: flex;">
+        <h4 class="h4font">车位总数：</h4><h3 class="h4font">{{viewData.totalBerth}}</h3>
+      </div>
+      <div style="width: 25%;display: flex;">
+        <h4 class="h4font">本月新增车位：</h4><h3 class="h4font">{{viewData.monthBerth}}</h3>
+      </div>
+    </div>
     <br>
     <br>
     <div align="center" style="color: #3498db;font-size: 23px;margin-bottom: 20px">停车难易指数变化趋势</div>
@@ -21,8 +30,8 @@
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'mouth', y: 'in', seriesName: '入场',bool:'true' },
-              { x: 'mouth', y: 'out', seriesName: '出场',bool:'true' },
+              { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
@@ -30,18 +39,19 @@
     <br>
     <br>
     <div align="center" style="color: #3498db;font-size: 23px;margin-bottom: 20px">停车利用率</div>
-    <div style="height: 300px">
+    <div style="height: 580px">
       <linechart
         :autoStop="false"
         :top="30"
-        :bottom="30"
+        :bottom="180"
         :left="40"
         :legendTop="0"
         :dataset="linedata2"
         :tooltipFormat="lineTooltipFormat"
+        :xlabelFormat="xLabelFormat"
         :encode="[
-              { x: 'mouth', y: 'in', seriesName: '占用中',bool:'true' },
-              { x: 'mouth', y: 'out', seriesName: '车位总数',bool:'true' },
+              { x: 'mouth', y: 'lastYearAmount', seriesName: '占用中',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '车位总数',bool:'true' },
             ]"
         id="tclyl"
       />
@@ -51,12 +61,22 @@
       <el-table-column v-for="(item, index) in columns2" :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="total2" @current-change="handlePageChange2"
+                     :current-page.sync="pageNum2" :page-size.sync="pageSize2">
+      </el-pagination>
+    </div>
     <br>
     <br>
     <el-table :data="tableData3" style="background: #2a2a2a;border-color: #333;">
       <el-table-column v-for="(item, index) in columns3" :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="total3" @current-change="handlePageChange3"
+                     :current-page.sync="pageNum3" :page-size.sync="pageSize3">
+      </el-pagination>
+    </div>
   </div>
 </template>
 <script>
@@ -71,74 +91,48 @@ export default {
     return {
       linedata: [],
       linedata2: [],
-      columns: [
-        {
-          label: '车场总数',
-          key: 'noticeTitle'
-        },
-        {
-          label: '本月新增车场',
-          key: 'createTime'
-        },
-        {
-          label: '车位总数',
-          key: 'noticeTitle'
-        },
-        {
-          label: '本月新增车位',
-          key: 'createTime'
-        }
-      ],
       columns2: [
         {
           label: '停车场名称',
-          key: 'noticeTitle'
-        },
-        {
-          label: '占用率',
-          key: 'createTime'
+          key: 'carParkName'
         },
         {
-          label: '百分比',
-          key: 'noticeTitle2'
+          label: '利用率',
+          key: 'used'
         }
       ],
       columns3: [
-        {
-          label: '用户姓名',
-          key: 'noticeTitle'
-        },
         {
           label: '车牌号',
-          key: 'createTime'
+          key: 'plateNo'
         },
         {
           label: '行为',
-          key: 'noticeTitle2'
-        },
-        {
-          label: '日期',
-          key: 'noticeTitle2'
+          key: 'action'
         },
       ],
-      formInline1: {
-        plateNo: ''
-      },
-      tableData: [{"publicTitle":'预警提示',"publicTime":'2023-12-29 10:00:00',"publicPerson":'李玉'},
-        {"publicTitle":'停车时限',"publicTime":'2023-12-31 11:00:00',"publicPerson":'张玮'},
-        {"publicTitle":'设备故障',"publicTime":'2023-12-30 10:00:00',"publicPerson":'李玉'},],
-      tableData2:[{"noticeTitle":'预警提示',"createTime":'2023-12-29 10:00:00',"noticeTitle2":'李玉'}],
+      tableData2:[],
       tableData3:[],
-      total: 3,
-      pageSize: 10,
-      pageNum: 1,
-      dialogVisible: false,
-      formLabelAlign: {},
-      title: ''
+      pageNum2: 1,
+      pageSize2: 5,
+      total2: 0,
+      pageNum3: 1,
+      pageSize3: 5,
+      total3: 0,
+      viewData: {
+        totalPark: 0,
+        monthPark: 0,
+        totalBerth: 0,
+        monthBerth: 0
+      }
     }
   },
   mounted() {
-    this.getTableData()
+    this.getView()
+    this.getLineData1()
+    this.getLineData2()
+    this.getTableData2()
+    this.getTableData3()
   },
   watch: {
   },
@@ -151,50 +145,48 @@ export default {
       }</div>
       </div>`;
     },
-    handlePageChange() {
-      this.getTableData()
+    getView() {
+      api.tczfx3().then(res => {
+        this.viewData = res.data
+      })
     },
-    handleDetail(row) {
-      this.title = '查看详情'
-      this.formLabelAlign = row
-      this.dialogVisible = true
+    getTableData2() {
+      const {pageNum2, pageSize2} = this
+      api.tclyl({current: pageNum2, size: pageSize2}).then(res => {
+        this.tableData2 = res.data.records || []
+        this.total2 = res.data.total
+      })
     },
-    handleAdd () {
-      this.title = '发布公告'
-      this.formLabelAlign.publicTitle = ''
-      // this.formLabelAlign.publicTime = ''
-      this.formLabelAlign.publicPerson = ''
-      this.dialogVisible = true
+    getTableData3() {
+      const {pageNum3, pageSize3} = this
+      api.tcjl({current: pageNum3, size: pageSize3}).then(res => {
+        this.tableData3 = res.data.records || []
+        this.total3 = res.data.total
+      })
     },
-    handleConfirm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.title === '发布公告') {
-            api.announcementSave(this.formLabelAlign).then(res => {
-              if(res.code === 200) {
-                this.dialogVisible = false
-                this.$message({
-                  message: '发布成功!',
-                  type: 'success'
-                })
-                this.getTableData()
-              }
-            })
-          } else {
-            this.dialogVisible = false;
-          }
-        } else {
-          return false
-        }
+    getLineData1() {
+      api.tczfx1().then(res => {
+        this.linedata = res.data || []
       })
     },
-    getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.announcementListByPage({current: pageNum, size: pageSize}).then(res => {
-        this.tableData = res.data.records || []
-        this.total = res.data.total
+    getLineData2() {
+      api.tczfx2().then(res => {
+        this.linedata2 = res.data || []
       })
     },
+    xLabelFormat(name) {
+      var str = name.split("");
+      return str.join("\n");
+    },
+    handlePageChange2() {
+      this.getTableData2()
+    },
+    handlePageChange3() {
+      this.getTableData3()
+    },
+    handlePageChange() {
+      this.getTableData()
+    }
   }
 }
 </script>

src/pages/index/components/parking_analysis_report.vue

@@ -2,31 +2,27 @@
   <div class="body-wrapper">
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-row>
-        <el-col :span="5">
+        <el-col :span="6">
           <el-form-item label="停车场名称:">
-            <el-input v-model="formInline.parkingName" placeholder="请输入"></el-input>
+            <el-input v-model="formInline.carParkName" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
-          <el-form-item label="停车状态:">
-            <el-select clearable v-model="formInline.parkingType" placeholder="停车状态" popper-class="cur-select">
-              <el-option label="全部" value=""></el-option>
-              <el-option label="空闲" value="空闲"></el-option>
-              <el-option label="占用" value="占用"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
+        <el-col :span="6">
           <el-form-item label="车牌号:">
             <el-input v-model="formInline.plateNo" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="8">
           <el-form-item label="入场时间:">
             <el-date-picker
               v-model="formInline.inTime"
-              type="date"
-              placeholder="选择日期">
+              type="daterange"
+              align="right"
+              unlink-panels
+              range-separator="-"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -56,25 +52,17 @@ export default {
   data() {
     return {
       columns: [
-        {
-          label: '会员姓名',
-          key: ''
-        },
         {
           label: '车牌号',
-          key: ''
+          key: 'plateNo'
         },
         {
           label: '停车场',
-          key: ''
+          key: 'carParkName'
         },
         {
           label: '入场日期',
-          key: ''
-        },
-        {
-          label: '状态',
-          key: ''
+          key: 'inTime'
         },
       ],
       tableData: [],
@@ -83,27 +71,37 @@ export default {
       pageNum: 1,
       dialogVisible: false,
       formInline: {
-        parkingName: '',
-        parkingType: '',
+        carParkName: '',
         plateNo: '',
         inTime: '',
       },
     }
   },
   mounted() {
-    // this.getTableData()
+    this.getTableData()
   },
   watch: {
   },
   methods: {
     getTableData() {
       const {pageNum, pageSize} = this
-      api.ipListByPage({current: pageNum, size: pageSize, ipAddr: this.formInline.ipAddr}).then(res => {
+      let params = {...this.formInline}
+      if (
+        this.formInline.inTime && this.formInline.inTime.length === 2 &&
+        this.formInline.inTime[1] !== ""
+      ) {
+        this.formInline.inTime[1] = this.formInline.inTime[1].substring(0, 10) + " 23:59:59";
+        params.startInTime = this.formInline.inTime[0]
+        params.endInTime = this.formInline.inTime[1]
+      }
+      delete params.inTime
+      api.tccfxbbListByPage({current: pageNum, size: pageSize, ...params}).then(res => {
         this.tableData = res.data.records || []
         this.total = res.data.total
       })
     },
     onSubmit () {
+      this.pageNum = 1
       this.getTableData()
     },
     handlePageChange() {

src/pages/index/components/parking_heatmap.vue

@@ -34,7 +34,7 @@ export default {
           textStyle: {
             color: "white",
           },
-          text: ["(%)"],
+          text: ["(辆)"],
           min: 0,
           max: 100,
           inRange: {
@@ -106,7 +106,7 @@ export default {
 
   mounted() {
     this.zxt()
-    api.dtnyzs().then(res => {
+    api.tcrlt1().then(res => {
       let arr = []
       let dataSoure = res.data
       for (const key in dataSoure) {
@@ -147,7 +147,7 @@ export default {
         this.setIntervalMap(chart);
       });
     })
-    api.dtnyzs().then(res => {
+    api.tcrlt2().then(res => {
       let arr = []
       let dataSoure = res.data
       for (const key in dataSoure) {
@@ -218,7 +218,7 @@ export default {
     },
     mapTooltip(data) {
       return `<div class="map-tooltip">
-        <div class="map-tooltip-name">${data.name}:<span class="map-tooltip-value">${data.value}%</span></div>
+        <div class="map-tooltip-name">${data.name}:<span class="map-tooltip-value">${data.value}辆</span></div>
       </div>`;
     },
   },

src/pages/index/components/parking_live.vue

@@ -14,9 +14,9 @@
             :dataset="linedata"
             :tooltipFormat="lineTooltipFormat"
             :encode="[
-              { x: 'month', y: 'lastYearAmount', seriesName: '泊位利用率',bool:'true' },
+              { x: 'mouth', y: 'lastAmount', seriesName: '泊位利用率',bool:'true' },
             ]"
-            id="sxcyfzqk"
+            id="sxcyfzqk1"
           />
         </div>
       </el-tab-pane>
@@ -30,7 +30,7 @@
               :radiusArr="['30%', '70%']"
               :colorArr="modelPieColor"
               :labelFormat="['{name|{b}}', '{sub|{@value}万元 {d}%}', '{hr|}']"
-              :dataset="modelData.list"
+              :dataset="modelData"
               :encode="{ itemName: 'name', value: 'value' }"
             />
           </div>
@@ -49,7 +49,7 @@
               { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
               { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
-              id="sxcyfzqk"
+              id="sxcyfzqk2"
             />
           </div>
         </div>
@@ -60,6 +60,7 @@
 <script>
 import linechart from "@/components/lineChart";
 import piechart from "@/components/pieChart";
+import api from '@/api/audit'
 
 export default {
   components: {
@@ -69,37 +70,41 @@ export default {
   data() {
     return {
       activeName: '泊位占用率',
-      linedata: [{month: '建业智慧港停车场', lastYearAmount: 52}
-        , {month: '长申玉购物广场（螺湾店）', lastYearAmount: 20}
-        , {month: '昌建东外滩西南停车场', lastYearAmount: 60}
-        , {month: '漯河长申玉停车场', lastYearAmount: 12}
-        , {month: '万宝手机城新西店', lastYearAmount: 40}],
+      linedata: [],
 
       modelPieColor: ["#db6749", "#f8cd55", "#3c97d6", "#989bf8"],
-      modelData: {
-        list: [{name: '长期车', value: 100}, {name: '临停车', value: 100}, {name: '会员车', value: 100}]
-      },
-      linedata1: [{month: '0:00-3:00', lastYearAmount: 2, thisYearAmount: 1}
-        , {month: '3:00-6:00', lastYearAmount: 6, thisYearAmount: 8}
-        , {month: '6:00-9:00', lastYearAmount: 20, thisYearAmount: 60}
-        , {month: '9:00-12:00', lastYearAmount: 60, thisYearAmount: 22}
-        , {month: '12:00-15:00', lastYearAmount: 12, thisYearAmount: 34}
-        , {month: '15:00-18:00', lastYearAmount: 40, thisYearAmount: 60}
-        , {month: '18:00-21:00', lastYearAmount: 100, thisYearAmount: 91}
-        , {month: '21:00-0:00', lastYearAmount: 60, thisYearAmount: 20}],
+      modelData: [],
+      linedata1: [],
     }
   },
   mounted() {
+    this.getLineData()
+    this.getModelData()
+    this.getLineData1()
   },
   watch: {
   },
   methods: {
-
+    getLineData() {
+      api.tcskfx1().then(res => {
+        this.linedata = res.data || []
+      })
+    },
+    getModelData() {
+      api.tcskfx2().then(res => {
+        this.modelData = res.data || []
+      })
+    },
+    getLineData1() {
+      api.tcskfx3().then(res => {
+        this.linedata1 = res.data || []
+      })
+    },
     lineTooltipFormat(params) {
       const data = params[0].data;
       return `<div class="line-tooltip">
         <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-        params[0].data.lastYearAmount || "--"
+        params[0].data.lastAmount || "--"
       }(%)</div>
       </div>`;
     },

src/pages/index/components/parking_lot.vue

@@ -2,18 +2,19 @@
   <div class="body-wrapper">
 
     <div style="width: 100%;">
-      <div style="width: 100%;height: 400px;">
+      <div style="width: 100%;height: 580px;">
         <h4 style="color: white">停车场泊位分析</h4>
         <br>
         <linechart
           :autoStop="false"
           :top="30"
-          :bottom="30"
+          :bottom="180"
           :left="40"
           :legendTop="0"
           yAxisName="(%)"
           :dataset="linedata"
           :tooltipFormat="lineTooltipFormat"
+          :xlabelFormat="xLabelFormat"
           :encode="[
               { x: 'mouth', y: 'lastYearAmount', seriesName: '利用率',bool:'true' },
             ]"
@@ -26,7 +27,7 @@
   </div>
 </template>
 <script>
-import api from "@/api/article_liao";
+import api from "@/api/audit";
 import linechart from "@/components/lineChart";
 import options from '@/util/options'
 
@@ -53,12 +54,28 @@ export default {
     }
   },
   mounted() {
-
+    this.getLineData()
   },
   watch: {
   },
   methods: {
-
+    xLabelFormat(name) {
+      var str = name.split("");
+      return str.join("\n");
+    },
+    lineTooltipFormat(params) {
+      const data = params[0].data;
+      return `<div class="line-tooltip">
+        <div style="color: ${params[0].color}">${params[0].seriesName}: ${
+        params[0].data.lastAmount || "--"
+      }%</div>
+      </div>`;
+    },
+    getLineData() {
+      api.tccbwfx().then(res => {
+        this.linedata = res.data || []
+      })
+    }
   }
 }
 </script>

src/pages/index/components/parking_period_analysis.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="body-wrapper">
-    <div style="display: flex; justify-content: space-between;height: 300px">
-      <h5 style="color: white">停车高峰时段分析</h5>
+    <h4 style="color: white">停车高峰时段分析</h4>
+    <br>
+    <div style="width: 100%; height: 400px">
       <linechart
         :autoStop="false"
         :top="30"
@@ -12,25 +13,26 @@
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
+              { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
     </div>
-    <div style="display: flex; justify-content: space-between;height: 300px">
-      <h5 style="color: white">出入场压力分析</h5>
+    <h4 style="color: white">出入场压力分析</h4>
+    <br>
+    <div style="width: 100%; height: 580px">
       <barchart
         class="side-chart"
         :autoStop="false"
         :colorArr="['#ffd201', '#00eacb', '#01b4ff', '#5d78ff']"
         legendIcon="react"
-        :bottom="30"
+        :bottom="180"
         :xlabelFormat="xLabelFormat"
         :top="60"
         yAxisName="(辆)"
         :tooltip="tooltipFormat"
-        :dataset="modelData"
+        :dataset="bardata1"
         :encode="[
             {x: 'month', y: 'hs', seriesName: '入场'},
             {x: 'month', y: 'cs', seriesName: '出场'}]"
@@ -38,19 +40,20 @@
         id="fxdqhszzt"
       />
     </div>
-    <div style="display: flex; justify-content: space-between;height: 300px">
-      <h5 style="color: white">停车饱和度分析</h5>
+    <h4 style="color: white">停车饱和度分析</h4>
+    <br/>
+    <div  style="width: 100%; height: 580px">
       <barchart
         class="side-chart"
         :autoStop="false"
         :colorArr="['#ffd201', '#00eacb', '#01b4ff', '#5d78ff']"
         legendIcon="react"
-        :bottom="30"
-        :xlabelFormat="xLabelFormat1"
+        :bottom="180"
+        :xlabelFormat="xLabelFormat"
         :top="60"
-        yAxisName="(个)"
+        yAxisName="(辆)"
         :tooltip="tooltipFormat1"
-        :dataset="modelData1"
+        :dataset="bardata2"
         :encode="[
             {x: 'month', y: 'hs', seriesName: '占用'},
             {x: 'month', y: 'cs', seriesName: '空闲'}]"
@@ -63,6 +66,7 @@
 <script>
 import linechart from "@/components/lineChart";
 import barchart from "@/components/barChart";
+import api from '@/api/audit'
 
 export default {
   components: {
@@ -71,50 +75,33 @@ export default {
   },
   data() {
     return {
-      modelData: [{
-        "mouth": "市图书馆停车场",
-        "hs": 6053,
-        "cs": 1921
-      },
-        {
-          "mouth": "中山公园停车场",
-          "hs": 6033,
-          "cs": 3766
-        },
-        {
-          "mouth": "天地广场停车场",
-          "hs": 2258,
-          "cs": 2513
-        }],
-      modelData1: [{
-        "mouth": "市图书馆停车场",
-        "hs": 6053,
-        "cs": 1921
-      },
-        {
-          "mouth": "中山公园停车场",
-          "hs": 6033,
-          "cs": 3766
-        },
-        {
-          "mouth": "天地广场停车场",
-          "hs": 2258,
-          "cs": 2513
-        }],
-      linedata: [{month: '0:00-3:00', lastYearAmount: 2, thisYearAmount: 1}
-        , {month: '3:00-6:00', lastYearAmount: 6, thisYearAmount: 8}
-        , {month: '6:00-9:00', lastYearAmount: 20, thisYearAmount: 60}
-        , {month: '9:00-12:00', lastYearAmount: 60, thisYearAmount: 22}
-        , {month: '12:00-15:00', lastYearAmount: 12, thisYearAmount: 34}
-        , {month: '15:00-18:00', lastYearAmount: 40, thisYearAmount: 60}
-        , {month: '18:00-21:00', lastYearAmount: 100, thisYearAmount: 91}
-        , {month: '21:00-0:00', lastYearAmount: 60, thisYearAmount: 20}],
+      linedata: [],
+      bardata1: [],
+      bardata2: []
     }
   },
   mounted() {
+    this.getLineData()
+    this.getBarData1()
+    this.getBarData2()
   },
   watch: {},
   methods: {
+    getLineData() {
+      api.tcsdfx1().then(res => {
+        this.linedata = res.data || []
+      })
+    },
+    getBarData1() {
+      api.tcsdfx2().then(res => {
+        this.bardata1 = res.data || []
+      })
+    },
+    getBarData2() {
+      api.tcsdfx2().then(res => {
+        this.bardata2 = res.data || []
+      })
+    },
     lineTooltipFormat(params) {
       const data = params[0].data;
       return `<div class="line-tooltip">
@@ -137,13 +124,6 @@ export default {
         params[0].data.cs || "--"}辆</div>
 </div>`;
     },
-    xLabelFormat(name) {
-      const nameArr = []
-      for (let i = 0; i < name.length; i += 7) {
-        nameArr.push(name.substring(i, i + 7))
-      }
-      return nameArr.join('\n');
-    },
     tooltipFormat1(params) {
       const type = params[0].seriesType;
       const data = params[0].data;
@@ -155,12 +135,9 @@ export default {
         params[0].data.cs || "--"}个</div>
 </div>`;
     },
-    xLabelFormat1(name) {
-      const nameArr = []
-      for (let i = 0; i < name.length; i += 7) {
-        nameArr.push(name.substring(i, i + 7))
-      }
-      return nameArr.join('\n');
+    xLabelFormat(name) {
+      var str = name.split("");
+      return str.join("\n");
     },
   }
 }

src/pages/index/components/parking_time_analysis.vue

@@ -8,7 +8,7 @@
       <piechart
         class="model-pie-body"
         id="chart1"
-        :radiusArr="['30%', '70%']"
+        :radiusArr="['30%', '60%']"
         :roseType = "false"
         :colorArr="modelPieColor"
         :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
@@ -18,27 +18,29 @@
     </div>
     <br>
     <br>
-
-
     <br>
-    <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
+    <div>
+      <h2 style="color: #3498db;margin-bottom: 20px;display: inline-block;width: 90%">周转次数排行</h2>
+    </div>
+    <el-table :data="tableData2" style="background: #2a2a2a;border-color: #333;">
       <el-table-column
         label="日均周转次数排行"
         type="index"
-        width="300"
-        :index="indexMethod">
+        width="300">
       </el-table-column>
       <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
       </el-table-column>
     </el-table>
     <br>
     <br>
-    <el-table :data="tableData2" style="background: #2a2a2a;border-color: #333;">
+    <div>
+      <h2 style="color: #3498db;margin-bottom: 20px;display: inline-block;width: 90%">停车时长排行</h2>
+    </div>
+    <el-table :data="tableData3" style="background: #2a2a2a;border-color: #333;">
       <el-table-column
         label="平均停车时长排行"
         width="300"
-        type="index"
-        :index="indexMethod">
+        type="index">
       </el-table-column>
       <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
       </el-table-column>
@@ -57,129 +59,69 @@ export default {
   },
   data() {
     return {
-      linedata: [],
-      linedata2: [],
-      columns: [
-        {
-          label: '停车场名称',
-          key: 'noticeTitle'
-        },
-        {
-          label: '日均周转次数',
-          key: 'createTime'
-        },
-        {
-          label: '车位总数',
-          key: 'noticeTitle'
-        }
-      ],
       columns2: [
         {
-          label: '车牌号',
-          key: 'noticeTitle'
+          label: '停车场',
+          key: 'carParkName'
         },
         {
-          label: '停车时长（小时）',
-          key: 'createTime'
+          label: '日均泊位周转次数',
+          key: 'number'
         }
       ],
       columns3: [
-        {
-          label: '用户姓名',
-          key: 'noticeTitle'
-        },
         {
           label: '车牌号',
-          key: 'createTime'
-        },
-        {
-          label: '行为',
-          key: 'noticeTitle2'
+          key: 'plateNo'
         },
         {
-          label: '日期',
-          key: 'noticeTitle2'
+          label: '总停车时长',
+          key: 'avgTime'
         },
       ],
-      formInline1: {
-        plateNo: ''
-      },
-      tableData: [{"publicTitle":'预警提示',"publicTime":'2023-12-29 10:00:00',"publicPerson":'李玉'},
-        {"publicTitle":'停车时限',"publicTime":'2023-12-31 11:00:00',"publicPerson":'张玮'},
-        {"publicTitle":'设备故障',"publicTime":'2023-12-30 10:00:00',"publicPerson":'李玉'},],
-      tableData2:[{"noticeTitle":'预警提示',"createTime":'2023-12-29 10:00:00',"noticeTitle2":'李玉'}],
+      tableData2:[],
       tableData3:[],
       modelData:[],
       modelPieColor: ["#4382f6","#9078f8","#DAA520","#2E8B57"],
-      total: 3,
-      pageSize: 10,
-      pageNum: 1,
-      dialogVisible: false,
-      formLabelAlign: {},
-      title: ''
+      total2: 0,
+      pageSize2: 10,
+      pageNum2: 1,
+      total3: 0,
+      pageSize3: 10,
+      pageNum3: 1
     }
   },
   mounted() {
-    this.getTableData()
+    this.getPieData()
+    this.getTableData2()
+    this.getTableData3()
   },
   watch: {
   },
   methods: {
-    lineTooltipFormat(params) {
-      const data = params[0].data;
-      return `<div class="line-tooltip">
-        <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-        params[0].data.lastAmount || "--"
-      }</div>
-      </div>`;
-    },
-    indexMethod(index) {
-      return this.pageSize * (this.pageNum - 1) + index + 1
-    },
-    handlePageChange() {
-      this.getTableData()
+    getPieData() {
+      api.tcscfx().then(res => {
+        this.modelData = res.data || []
+      })
     },
-    handleDetail(row) {
-      this.title = '查看详情'
-      this.formLabelAlign = row
-      this.dialogVisible = true
+    handlePageChange2() {
+      this.getTableData2()
     },
-    handleAdd () {
-      this.title = '发布公告'
-      this.formLabelAlign.publicTitle = ''
-      // this.formLabelAlign.publicTime = ''
-      this.formLabelAlign.publicPerson = ''
-      this.dialogVisible = true
+    handlePageChange3() {
+      this.getTableData3()
     },
-    handleConfirm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.title === '发布公告') {
-            api.announcementSave(this.formLabelAlign).then(res => {
-              if(res.code === 200) {
-                this.dialogVisible = false
-                this.$message({
-                  message: '发布成功!',
-                  type: 'success'
-                })
-                this.getTableData()
-              }
-            })
-          } else {
-            this.dialogVisible = false;
-          }
-        } else {
-          return false
-        }
+    getTableData2() {
+      const {pageNum2, pageSize2} = this
+      api.tcscfxList1({current: pageNum2, size: pageSize2}).then(res => {
+        this.tableData2 = res.data || []
       })
     },
-    getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.announcementListByPage({current: pageNum, size: pageSize}).then(res => {
-        this.tableData = res.data.records || []
-        this.total = res.data.total
+    getTableData3() {
+      const {pageNum3, pageSize3} = this
+      api.tcscfxList2({current: pageNum3, size: pageSize3}).then(res => {
+        this.tableData3 = res.data || []
       })
-    },
+    }
   }
 }
 </script>

src/pages/index/components/temp_parking-statistics.vue

@@ -17,9 +17,10 @@
     </div>
     <br>
     <br>
-
-
     <br>
+    <div>
+      <h2 style="color: #3498db;margin-bottom: 20px;display: inline-block;width: 90%">过去30天临时停车趋势</h2>
+    </div>
     <div style="height: 400px;width: 100%">
       <linechart
         :autoStop="false"
@@ -27,12 +28,12 @@
         :bottom="30"
         :left="40"
         :legendTop="0"
-        yAxisName="(过去30日临时停车趋势)"
+        yAxisName="(辆)"
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'month', y: 'cq', seriesName: '长期',bool:'true' },
-              { x: 'month', y: 'ls', seriesName: '临时',bool:'true' },
+              { x: 'mouth', y: 'lastYearAmount', seriesName: '临期',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '长期',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
@@ -41,7 +42,7 @@
   </div>
 </template>
 <script>
-import api from "@/api/audit.js";
+import api from "@/api/audit";
 import linechart from "@/components/lineChart";
 import piechart from "@/components/pieChart";
 
@@ -57,17 +58,12 @@ export default {
         plateNo: ''
       },
       modelData:[],
-      modelPieColor: ["#4382f6","#9078f8"],
-      total: 3,
-      pageSize: 10,
-      pageNum: 1,
-      dialogVisible: false,
-      formLabelAlign: {},
-      title: ''
+      modelPieColor: ["#4382f6","#9078f8"]
     }
   },
   mounted() {
-    this.getTableData()
+    this.getPieData()
+    this.getLineData()
   },
   watch: {
   },
@@ -76,33 +72,21 @@ export default {
       const data = params[0].data;
       return `<div class="line-tooltip">
         <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-        params[0].data.lastAmount || "--"
+        params[0].data.lastYearAmount || "--"
+      }</div>
+        <div style="color: ${params[1].color}">${params[1].seriesName}: ${
+        params[0].data.thisYearAmount || "--"
       }</div>
       </div>`;
     },
-    indexMethod(index) {
-      return this.pageSize * (this.pageNum - 1) + index + 1
-    },
-    handlePageChange() {
-      this.getTableData()
-    },
-    handleDetail(row) {
-      this.title = '查看详情'
-      this.formLabelAlign = row
-      this.dialogVisible = true
-    },
-    handleAdd () {
-      this.title = '发布公告'
-      this.formLabelAlign.publicTitle = ''
-      // this.formLabelAlign.publicTime = ''
-      this.formLabelAlign.publicPerson = ''
-      this.dialogVisible = true
+    getPieData() {
+      api.lstctj1().then(res => {
+        this.modelData = res.data || []
+      })
     },
-    getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.announcementListByPage({current: pageNum, size: pageSize}).then(res => {
-        this.tableData = res.data.records || []
-        this.total = res.data.total
+    getLineData() {
+      api.lstctj2().then(res => {
+        this.linedata = res.data || []
       })
     },
   }

src/pages/index/components/vehicle_type.vue

@@ -13,9 +13,9 @@
           :radiusArr="['30%', '70%']"
           :roseType = "false"
           :colorArr="modelPieColor"
-          :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
+          :labelFormat="['{mouth|{b}}', '{sub|{@lastAmount}辆 {d}%}', '{hr|}']"
           :dataset="modelData"
-          :encode="{ itemName: 'name', value: 'value' }"
+          :encode="{ itemName: 'mouth', value: 'lastAmount' }"
         />
       </div>
       <div style="width: 50%;height: 500px;">
@@ -25,10 +25,10 @@
           id="chart3"
           :radiusArr="['30%', '70%']"
           :roseType = "false"
-          :colorArr="modelPieColor4"
-          :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
-          :dataset="modelData4"
-          :encode="{ itemName: 'name', value: 'value' }"
+          :colorArr="modelPieColor2"
+          :labelFormat="['{mouth|{b}}', '{sub|{@lastAmount}辆 {d}%}', '{hr|}']"
+          :dataset="modelData2"
+          :encode="{ itemName: 'mouth', value: 'lastAmount' }"
         />
       </div>
       <br>
@@ -69,7 +69,7 @@
 <script>
 import piechart from "@/components/pieChart";
 import linechart from "@/components/lineChart";
-import api from "@/api/article_liao";
+import api from "@/api/audit";
 export default {
   components: {
     piechart,
@@ -80,27 +80,16 @@ export default {
       linedata: [],
       modelPieColor: ["#4382f6","#9078f8","#DAA520","#2E8B57"],
       modelData: [],
-      modelPieColor4: ["#4382f6","#9078f8"],
-      modelData4: [],
-      modelPieColor5: ["#4382f6","#9078f8"],
-      modelData5: [],
-      progresslist: [{
-        label: '比亚迪',
-        value: 30
-      },{
-        label: '特斯拉',
-        value: 50
-      },{
-        label: '特斯拉',
-        value: 70
-      }]
+      modelPieColor2: ["#4382f6","#9078f8"],
+      modelData2: [],
+      progresslist: []
     }
   },
   mounted() {
-    this.parkBehaviorDuration()
-    this.parkBehaviorRange()
-    this.parkBehaviorTemporary()
-    this.parkBehaviorNight()
+    this.getPieData1()
+    this.getPieData2()
+    this.getLineData()
+    this.getProgresslist()
   },
   watch: {
   },
@@ -112,26 +101,26 @@ export default {
       }</div>
       </div>`;
     },
-    parkBehaviorDuration() {
-      api.parkBehaviorDuration().then(res =>{
+    getPieData1() {
+      api.cllx1().then(res =>{
         this.modelData = res.data
       })
     },
-    parkBehaviorRange(){
-      api.parkBehaviorRange().then(res =>{
-        this.linedata = res.data
+    getPieData2(){
+      api.cllx2().then(res =>{
+        this.modelData2 = res.data || []
       })
     },
-    parkBehaviorTemporary(){
-      api.parkBehaviorTemporary().then(res =>{
-        this.modelData4 = res.data
+    getLineData() {
+      api.cllx3().then(res => {
+        this.linedata = res.data || []
       })
     },
-    parkBehaviorNight(){
-      api.parkBehaviorNight().then(res =>{
-        this.modelData5 = res.data
+    getProgressList() {
+      api.cllx4().then(res => {
+        this.progresslist = res.data || []
       })
-    },
+    }
   }
 }
 </script>

src/util/dictionary.js

@@ -25,8 +25,8 @@ export default {
     '411104': '召陵区',
     '411121': '舞阳县',
     '411122': '临颍县',
-    '462003': '经济技术开发区',
-    '462033': '西城区',
-    '462300': '城乡一体化示范区'
+    '411171"': '经济技术开发区',
+    '411123': '西城区',
+    '411124': '城乡一体化示范区'
   }
 }