页面整理

src/api/article.js

@@ -1,66 +0,0 @@
-// 文章
-import axios from "../../util/ajax";
-
-//分页获取文章列表
-const queryIndexContent = (page, limit, params) =>
-  axios.post(`/xyjc/index-content/query/${page}/${limit}`, params);
-
-// 增加内容
-const addIndexContent = params => axios.post(`/xyjc/index-content/add`, params);
-
-// 编辑内容
-const editIndexContent = params =>
-  axios.post(`/xyjc/index-content/update`, params);
-
-// 删除内容
-const deleteIndexContent = id =>
-  axios.delete(`/xyjc/index-content/delete/${id}`);
-
-// 下架内容
-const downOffIndexContent = (id, status) =>
-  axios.post(`/xyjc/index-content/downOff/${id}?status=${status}`);
-
-// 根据id查询内容
-const detailIndexContent = id => axios.post(`/xyjc/index-content/detail/${id}`);
-
-// 获取算法商城文章列表
-const queryAlgorithmList = (page, limit, params) =>
-  axios.post(`/xyjc/algorithm-mall/query/${page}/${limit}`, params);
-
-// 删除算法信息
-const deleteAlgorithm = (id) => axios.delete(`/xyjc/algorithm-mall/delete/${id}`)
-
-// 增加具体算法信息
-const addAlgorithm = (params) => axios.post(`/xyjc/algorithm-mall/add`, params)
-
-// 根据ID查询具体算法信息
-const getAlgorithmDetail = (id, hasGetChild) => axios.post(`/xyjc/algorithm-mall/detail/${id}?hasGetChild=${hasGetChild}`)
-
-// 上下架算法信息 status=0正常 1下架
-const downOffAlgorithm = (id, status) => axios.post(`/xyjc/algorithm-mall/downOff/${id}?status=${status}`)
-
-// 获取算法名称列表下拉框
-const getDropDownList = (params) => axios.get(`/xyjc/algorithm-mall/queryName`, { params })
-
-// 编辑具体算法信息
-const updateAlgorithm = (params) => axios.post(`/xyjc/algorithm-mall/update`, params)
-
-// 下载文件
-const downloadFile= (id) => axios.get(`/xyjc/index-files/download/${id}`, {responseType: 'blob'})
-
-export default {
-  queryIndexContent,
-  addIndexContent,
-  editIndexContent,
-  deleteIndexContent,
-  downOffIndexContent,
-  detailIndexContent,
-  queryAlgorithmList,
-  deleteAlgorithm,
-  addAlgorithm,
-  getAlgorithmDetail,
-  downOffAlgorithm,
-  getDropDownList,
-  updateAlgorithm,
-  downloadFile
-};

src/api/article_liao.js

@@ -1,44 +1,49 @@
 // 文章
 import axios from "../util/ajax";
 
-const qualificationExamine = (params) => axios.post('/dash/employee/qualification/examine',params)
-
-//收费数据分析
-const businessAnalysisStat = (params) =>axios.post('/dash/charge/business/analysis/stat1',params)
-
-//支付渠道分析
-const businessAnalysisStat2 = (params) =>axios.post('/dash/charge/business/analysis/stat2',params)
-
-//催缴情况分析
-const businessAnalysisStat3 = (params) =>axios.post('/dash/charge/business/analysis/stat3',params)
-
-//资源利用分析
-const parkMonitorStat = (params) =>axios.post('/dash/park/monitor/stat',params)
-
-//停车时长分析
-const parkBehaviorDuration = (params) =>axios.post('/dash/park/behavior/duration',params)
-
-//停车时段分析
-const parkBehaviorRange = (params) =>axios.post('/dash/park/behavior/range',params)
-
-//临时停车分析
-const parkBehaviorTemporary = (params) =>axios.post('/dash/park/behavior/temporary',params)
-
-//泊位饱和度
-const dashBerthRoadStat1 = (params) =>axios.post('/dash/berth/road/stat1',params)
-
-//路段泊位周转率
-const dashBerthRoadStat2 = (params) =>axios.post('/dash/berth/road/stat2',params)
-
 export default {
-  qualificationExamine,
-  businessAnalysisStat,
-  businessAnalysisStat2,
-  businessAnalysisStat3,
-  parkMonitorStat,
-  parkBehaviorDuration,
-  parkBehaviorRange,
-  parkBehaviorTemporary,
-  dashBerthRoadStat1,
-  dashBerthRoadStat2
-};
+  qualificationExamine(params) {
+    return axios.post('/dash/employee/qualification/examine', params)
+  },
+  //收费数据分析
+  businessAnalysisStat(params) {
+    return axios.post('/dash/charge/business/analysis/stat1', params)
+  },
+  //支付渠道分析
+  businessAnalysisStat2(params) {
+    return axios.post('/dash/charge/business/analysis/stat2', params)
+  },
+  //催缴情况分析
+  businessAnalysisStat3(params) {
+    return axios.post('/dash/charge/business/analysis/stat3', params)
+  },
+  //资源利用分析
+  parkMonitorStat(params) {
+    return axios.post('/dash/park/monitor/stat', params);
+  },
+  //停车时长分析
+  parkBehaviorDuration(params) {
+    return axios.post('/dash/park/behavior/duration', params)
+  },
+  //停车时段分析
+  parkBehaviorRange(params) {
+    return axios.post('/dash/park/behavior/range', params)
+  },
+  //临时停车分析
+  parkBehaviorTemporary(params) {
+    return axios.post('/dash/park/behavior/temporary', params)
+  },
+  // 夜间停车分析 dash/park/behavior/night
+  parkBehaviorNight(params) {
+    return axios.post('/dash/park/behavior/night', params)
+  },
+  //泊位饱和度
+  dashBerthRoadStat1(params) {
+    return axios.post('/dash/berth/road/stat1', params)
+  },
+  //路段泊位周转率
+  dashBerthRoadStat2(params) {
+    return axios.post('/dash/berth/road/stat2', params)
+  }
+
+}

src/api/article_z.js

@@ -1,30 +1,17 @@
 // 文章
 import axios from "../util/ajax";
 
-//分页获取文章列表
-// const queryIndexContent =  (params) => axios.post(`/dash/charge/business/analysis/stat1/`, params);
-
-//停车盲点挖掘
-const queryBlindContext =  (params) => axios.post(`/dash/blind/spot/digging/stat1`, params);
-//路内泊位设置推荐
-const queryBerthContext =  (params) => axios.post(`/dash/berth/recommend/page`, params);
-//路内泊位设置推荐
-const queryGapMapContext =  (params) => axios.post(`/dash/gap/analysis/stat1`, params);
-
-// 增加内容
-// const addIndexContent = params => axios.post(`/xyjc/index-content/add`, params);
-//
-// // 编辑内容
-// const editIndexContent = params =>
-//   axios.post(`/xyjc/index-content/update`, params);
-//
-// // 删除内容
-// const deleteIndexContent = id =>
-//   axios.delete(`/xyjc/index-content/delete/${id}`);
-
 export default {
-  // queryIndexContent,
-  queryBlindContext,
-  queryBerthContext,
-  queryGapMapContext
-};
+  //停车盲点挖掘
+  queryBlindContext(params) {
+    return axios.post(`/dash/blind/spot/digging/stat1`, params)
+  },
+  //路内泊位设置推荐
+  queryBerthContext(params) {
+    return axios.post(`/dash/berth/recommend/page`, params)
+  },
+  //路内泊位设置推荐
+  queryGapMapContext(params) {
+    return axios.post(`/dash/gap/analysis/stat1`, params)
+  }
+}

src/api/audit.js

@@ -1,12 +1,76 @@
 import axios from "@/util/ajax";
 
 export default {
-    // 申请列表
-    applyList(params) {
-        return axios.get('/resourceApply/selectBackedApplyList', { params });
-    },
-    // 审核
-    applyResource(params) {
-        return axios.post('/resourceApply/approveApply', params);
-    }
-}
+  // 停车缺口分析-停车缺口分析
+  tcqkfx(params) {
+    return axios.post('/dash/gap/analysis/stat1', params)
+  },
+  // 停车缺口分析-停车缺口变化趋势
+  tcqkbhqs(params) {
+    return axios.post('/dash/gap/analysis/stat2', params)
+  },
+  // 停车饱和预警-饱和度
+  tcbhyj(params) {
+    return axios.post('/dash/saturation/warning/stat1', params)
+  },
+  // todo 停车饱和预警-网格化停车饱和预警
+  wghtcbhyj(params) {
+    return axios.post('/dash/saturation/warning/page', params)
+  },
+  // 全局停车诱导-地图难易指数
+  nyzs(params) {
+    return axios.post('/dash/park/guidance/stat', params)
+  },
+  // todo 全局停车诱导-统计
+  nyzstj(params) {
+    return axios.post('/dash/park/guidance/page', params)
+  },
+  // 其他分析-区域分析
+  qyfx(params) {
+    return axios.post('/dash/other/analyse/stat1', params)
+  },
+  // todo 其他分析-重点车辆分析
+  zdclfx(params) {
+    return axios.post('/dash/other/analyse/stat10', params)
+  },
+  // 其他分析-车场数量
+  ccsl(params) {
+    return axios.post('/dash/other/analyse/stat2', params)
+  },
+  // 其他分析-停车分布分析
+  tcfbfx(params) {
+    return axios.post('/dash/other/analyse/stat3', params)
+  },
+  // 其他分析-余位分析
+  ywfx(params) {
+    return axios.post('/dash/other/analyse/stat4', params)
+  },
+  // 其他分析-停车热点分析
+  tcrdfx(params) {
+    return axios.post('/dash/other/analyse/stat5', params)
+  },
+  // 其他分析-车流量分析
+  cllfx(params) {
+    return axios.post('/dash/other/analyse/stat6', params)
+  },
+  // 其他分析-低利用率停车场分析图表配置
+  dlyltcc(params) {
+    return axios.post('/dash/other/analyse/stat7', params)
+  },
+  // 其他分析-高峰路线分析
+  gflxfx(params) {
+    return axios.post('/dash/other/analyse/stat8', params)
+  },
+  // 其他分析-重点车辆进厂占比
+  zdcljcfx(params) {
+    return axios.post('/dash/other/analyse/stat9', params)
+  },
+  // 申请列表
+  applyList(params) {
+    return axios.get('/resourceApply/selectBackedApplyList', {params});
+  },
+  // 审核
+  applyResource(params) {
+    return axios.post('/resourceApply/approveApply', params);
+  }
+}

src/api/dataOrganizeApi.js

@@ -1,21 +0,0 @@
-// 数据组织管理
-import axios from "../../util/ajax";
-
-//查询组织树信息
-const queryIndexDept = params => axios.get(`/xyjc/index-dept/query`, params);
-
-// 增加组织信息
-const addIndexDept = params => axios.post("/xyjc/index-dept/add", params);
-
-// 编辑组织信息
-const editIndexDept = params => axios.post("/xyjc/index-dept/update", params);
-
-//删除组织信息
-const deleteIndexDept = id => axios.delete(`/xyjc/index-dept/delete/${id}`);
-
-export default {
-  queryIndexDept,
-  addIndexDept,
-  editIndexDept,
-  deleteIndexDept
-};

src/api/directoryMaintainApi.js

@@ -1,25 +0,0 @@
-// 目录维护
-import axios from "../../util/ajax";
-
-// 获取栏目列表
-const indexCategoryList = params =>
-  axios.get(`/xyjc/index-category/list`, params);
-
-// 增加首页栏目
-const addIndexCategory = params =>
-  axios.post(`/xyjc/index-category/add`, params);
-
-// 编辑首页栏目
-const editIndexCategory = params =>
-  axios.post(`/xyjc/index-category/update`, params);
-
-// 删除首页栏目
-const deleteIndexCategory = params =>
-  axios.delete(`/xyjc/index-category/delete`, params);
-
-export default {
-  indexCategoryList,
-  addIndexCategory,
-  editIndexCategory,
-  deleteIndexCategory
-};

src/api/homepage.js

@@ -1,38 +0,0 @@
-// 前台首页
-import axios from "@/util/ajax";
-
-export default {
-    // 获取资源数据
-    resourceData(params) {
-        return axios.get('/resourceDirectory/homeStatisticalTotal', { params });
-    },
-    // 获取我的收藏总量数据
-    collectTotal(params) {
-        return axios.get('/resourceDirectory/allCollectTotal', { params });
-    },
-    // 获取主题、专题、指标资产数据
-    themeSpecialIndex(params) {
-        return axios.get('/resourceDirectory/assetNumStatistics', { params });
-    },
-    // 获取api排行数据
-    apiRank(params) {
-        return axios.get('/resourceDirectory/serviceCallNum', { params });
-    },
-    // 访问量数据
-    visits(params) {
-        return axios.get('/resourceApply/selectResourceViews', { params });
-    },
-
-    // 获取用户名
-    getUserName() {
-        return axios.get('/xyjc/cas/getUserName')
-    },
-    // 获取用户头像
-    getUserAvatar(id) {
-        return axios.get(`/xyjc/cas/getUserAvatar/${id}`)
-    },
-    // 用户登出
-    logout() {
-        return axios.get('/xyjc/cas/system/logout')
-    }
-}

src/api/search.js

@@ -1,13 +0,0 @@
-// 后台搜索页
-import axios from "@/util/ajax";
-
-export default {
-    // 批量上架
-    batchUpShelves(params) {
-        return axios.post('/resourceDirectory/batchUpShelves', params);
-    },
-    // 批量下架
-    batchDownShelves(params) {
-        return axios.post('/resourceDirectory/batchDownShelves', params);
-    }
-}

src/pages/index/components/berth_recommend.vue

@@ -33,12 +33,11 @@
 </template>
 <script>
 import linechart from "@/components/lineChart";
-// import article_z from "../../../api/article_z";
+// import api from "@/api/article_z";
 
 export default {
   components: {
-    linechart,
-    // article_z
+    linechart
   },
   data() {
     return {
@@ -126,7 +125,7 @@ export default {
     },
     //初始化
     // linedataData(){
-    //   article_z.queryBerthContext().then(res=>{
+    //   api.queryBerthContext().then(res=>{
     //     const lastA=res.data;
     //     this.linedata=res.data.map(item=>({...item,thisAmount: 30}));
     //     console.log(res.data)

src/pages/index/components/berth_road.vue

@@ -106,7 +106,7 @@ import piechart from "@/components/pieChart";
 import linechart from "@/components/lineChart";
 import barchart from "@/components/barChart";
 import vtable from "@/components/vtableNew";
-import article_liao from "../../../api/article_liao";
+import api from "@/api/article_liao";
 
 
 export default {
@@ -114,8 +114,7 @@ export default {
     piechart,
     linechart,
     barchart,
-    vtable,
-    article_liao
+    vtable
   },
   data() {
     return {
@@ -189,12 +188,12 @@ export default {
 </div>`;
     },
     dashBerthRoadStat1(){
-      article_liao.dashBerthRoadStat1().then(res =>{
+      api.dashBerthRoadStat1().then(res =>{
         this.bardata = res.data
       })
     },
     dashBerthRoadStat2(){
-      article_liao.dashBerthRoadStat2().then(res =>{
+      api.dashBerthRoadStat2().then(res =>{
         this.linedata1 = res.data
       })
     },

src/pages/index/components/blind_spot_digging.vue

@@ -33,18 +33,15 @@
 </template>
 <script>
 import linechart from "@/components/lineChart";
-import article_z from "../../../api/article_z";
+import api from "@/api/article_z";
 
 export default {
   components: {
-    linechart,
-    article_z
+    linechart
   },
   data() {
     return {
-      linedata: [{month: '老街街道',thisAmount: 30, lastAmount: 20}, {month: '马路街街道', thisAmount:30, lastAmount:50}
-        , {month: '顺河街街道', thisAmount:30, lastAmount:30}, {month: '干河陈街道', thisAmount:30, lastAmount:30}
-        , {month: '大刘镇', thisAmount:30, lastAmount:0}, {month: '阴阳赵镇', thisAmount:30, lastAmount:0}],
+      linedata: [],
       columns: [
         {
           label: '街道名称',
@@ -75,8 +72,7 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData(),
-    this.linedataData()
+    this.getLineData()
   },
   watch: {
   },
@@ -125,8 +121,8 @@ export default {
       })
     },
     //初始化
-    linedataData(){
-      article_z.queryBlindContext().then(res=>{
+    getLineData(){
+      api.queryBlindContext().then(res=>{
         this.linedata=res.data.map(item=>({...item,thisAmount: 30}));
       })
     },

src/pages/index/components/charge_business_analysis.vue

@@ -54,13 +54,12 @@
 <script>
 import piechart from "@/components/pieChart";
 import barchart from "@/components/barChart";
-import article_liao from "../../../api/article_liao";
+import api from "@/api/article_liao";
 
 export default {
   components: {
     piechart,
-    barchart,
-    article_liao
+    barchart
   },
   data() {
     return {
@@ -93,17 +92,17 @@ export default {
 </div>`;
     },
     businessAnalysisStat(){
-      article_liao.businessAnalysisStat().then(res =>{
+      api.businessAnalysisStat().then(res =>{
         this.bardata = res.data
       })
     },
     businessAnalysisStat2(){
-      article_liao.businessAnalysisStat2().then(res =>{
+      api.businessAnalysisStat2().then(res =>{
         this.modelData.list = res.data
       })
     },
     businessAnalysisStat3(){
-      article_liao.businessAnalysisStat3().then(res =>{
+      api.businessAnalysisStat3().then(res =>{
         this.modelData.list1 = res.data
       })
     },

src/pages/index/components/gap_analysis.vue

@@ -23,6 +23,7 @@
           :left="40"
           :legendTop="0"
           :dataset="linedata"
+          yAxisName="%"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
               { x: 'month', y: 'thisYearAmount', seriesName: '缺口程度',bool:'true' },
@@ -37,6 +38,7 @@
 import * as echarts from 'echarts'
 import * as geoJson from '../../../util/411100.json'
 import linechart from "@/components/lineChart";
+import api from '@/api/audit'
 
 export default {
   components: {
@@ -44,12 +46,7 @@ export default {
   },
   data() {
     return {
-      linedata: [{month: '8:00', thisYearAmount: 21}, {month: '10:00', thisYearAmount:22}
-        , {month: '12:00', thisYearAmount:23}, {month: '14:00', thisYearAmount:25}
-        , {month: '16:00', thisYearAmount:28}, {month: '18:00', thisYearAmount:31}
-        , {month: '20:00', thisYearAmount:34}, {month: '22:00', thisYearAmount:36}
-        , {month: '0:00', thisYearAmount:38}, {month: '2:00', thisYearAmount:39}
-        , {month: '4:00', thisYearAmount:40}, {month: '6:00', thisYearAmount:41}],
+      linedata: [],
       options: [{
         value: '日间时段',
         label: '日间时段'
@@ -137,17 +134,66 @@ export default {
           },
         ],
       },
-      curData: {},
-      dataSource: null,
-      totalAll: '0',
     };
   },
+
+  mounted() {
+    this.getTcqkbhqs()
+    api.tcqkfx().then(res => {
+      let arr = []
+      let dataSoure = res
+      for (const key in dataSoure) {
+        if (key !== 411100) {
+          console.log(dataSoure[key].zb, '222')
+          arr.push({
+            name: dataSoure[key].quyuName,
+            value: Number(dataSoure[key].zb),
+          });
+        }
+      }
+      let mapMax = Math.max(...arr.map(item => item.value))
+      let mapMin = Math.min(...arr.map(item => item.value))
+      let chart = echarts.init(document.getElementById("map"));
+      echarts.registerMap("luohe", geoJson);
+      this.option.series[0].data = arr;
+      this.option.visualMap.min = mapMin;
+      this.option.visualMap.max = mapMax;
+      chart.setOption(this.option);
+      this.dqIndex = -1;
+      this.setIntervalMap(chart);
+      //鼠标移入静止播放
+      chart.on("mouseover", (e) => {
+        clearInterval(this.timer);
+        chart.dispatchAction({
+          type: "showTip",
+          seriesIndex: 0,
+          dataIndex: e.dataIndex,
+        });
+      });
+      chart.on("mouseout", (e) => {
+        clearInterval(this.timer);
+        //鼠标移出后先把上次的高亮取消
+        chart.dispatchAction({
+          type: "downplay",
+          seriesIndex: 0,
+          dataIndex: e.dataIndex,
+        });
+        this.setIntervalMap(chart);
+      });
+    })
+  },
+
   methods: {
+    getTcqkbhqs() {
+      api.tcqkbhqs().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.thisYearAmount || "--"
+        params[0].data.lastAmount || "--"
       }</div>
       </div>`;
     },
@@ -169,55 +215,8 @@ export default {
         <div class="map-tooltip-name">${data.name}:<span class="map-tooltip-value">${data.value}%</span></div>
       </div>`;
     },
-  },
-  mounted() {
-    let arr = []
-    let dataSoure = {
-      '411102': {quyuName: '源汇区', zb: 40},
-      '411103': {quyuName: '郾城区', zb: 60},
-      '411104': {quyuName: '召陵区', zb: 40},
-      '411121': {quyuName: '舞阳县', zb: 50},
-      '411122': {quyuName: '临颍县', zb: 30}}
-    for (const key in dataSoure) {
-      if (key !== '411100') {
-        arr.push({
-          name: dataSoure[key].quyuName,
-          value: Number(dataSoure[key].zb),
-        });
-      }
-    }
-    let mapMax = Math.max(...arr.map(item => item.value))
-    let mapMin = Math.min(...arr.map(item => item.value))
-    console.log(mapMin, '111')
-    console.log(mapMax, '222')
-    let chart = echarts.init(document.getElementById("map"));
-    echarts.registerMap("luohe", geoJson);
-    this.option.series[0].data = arr;
-    this.option.visualMap.min = mapMin;
-    this.option.visualMap.max = mapMax;
-    chart.setOption(this.option);
-    this.dqIndex = -1;
-    this.setIntervalMap(chart);
-    //鼠标移入静止播放
-    chart.on("mouseover", (e) => {
-      clearInterval(this.timer);
-      chart.dispatchAction({
-        type: "showTip",
-        seriesIndex: 0,
-        dataIndex: e.dataIndex,
-      });
-    });
-    chart.on("mouseout", (e) => {
-      clearInterval(this.timer);
-      //鼠标移出后先把上次的高亮取消
-      chart.dispatchAction({
-        type: "downplay",
-        seriesIndex: 0,
-        dataIndex: e.dataIndex,
-      });
-      this.setIntervalMap(chart);
-    });
-  },
+
+  }
 };
 </script>
 

src/pages/index/components/park_bahavior.vue

@@ -14,7 +14,7 @@
           :roseType = "false"
           :colorArr="modelPieColor"
           :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
-          :dataset="modelData.list"
+          :dataset="modelData"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
@@ -27,7 +27,7 @@
           :bottom="30"
           :left="40"
           :legendTop="0"
-          yAxisName="(亿元)"
+          yAxisName="辆"
           :dataset="linedata"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
@@ -51,11 +51,10 @@
           :roseType = "false"
           :colorArr="modelPieColor4"
           :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
-          :dataset="modelData4.list"
+          :dataset="modelData4"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
-
       <div style="width: 50%;height: 500px;">
         <h4 style="color: white">夜间停车分析</h4>
         <piechart
@@ -65,120 +64,62 @@
           :roseType = "false"
           :colorArr="modelPieColor5"
           :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
-          :dataset="modelData5.list"
+          :dataset="modelData5"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
-
       <br>
     </div>
-
-
-
   </div>
 </template>
 <script>
-import api from "@/api/audit.js";
 import piechart from "@/components/pieChart";
 import linechart from "@/components/lineChart";
-import article_liao from "../../../api/article_liao";
+import api from "@/api/article_liao";
 export default {
   components: {
     piechart,
-    linechart,
-    article_liao
+    linechart
   },
   data() {
     return {
-      options: [{
-        value: '源汇区',
-        label: '源汇区'
-      }, {
-        value: '召陵区',
-        label: '召陵区'
-      }],
-      options2: [{
-        value: '违规停车高发区',
-        label: '违规停车高发区'
-      }, {
-        value: '事故高发区',
-        label: '事故高发区'
-      }],
-      options3: [{
-        value: '团结路',
-        label: '团结路'
-      }, {
-        value: '人民东路',
-        label: '人民东路'
-      }],
       linedata: [],
       modelPieColor: ["#4382f6","#9078f8","#DAA520","#2E8B57"],
-      modelData: {
-        list: []
-      },
-      modelData2: {
-        list: [{name: '占用位', value: 200}, {name: '空闲位', value: 800}]
-      },
-      modelData3: {
-        list: [{name: '占用位', value: 100}, {name: '空闲位', value: 900}]
-      },
+      modelData: [],
       modelPieColor4: ["#4382f6","#9078f8"],
-      modelData4: {
-        list: []
-      },
+      modelData4: [],
       modelPieColor5: ["#4382f6","#9078f8"],
-      modelData5: {
-        list: [{name: '日间停车', value: 600}, {name: '夜间停车', value: 800}]
-      },
-      bardata: [{month: '01', hs: 100, cs: 200},{month: '02', hs: 300, cs: 200},{month: '03', hs: 400, cs: 200},],
-      tableData: [],
-      tableData2: [],
-      tableData3: [],
-      tableData4: [],
-      total: 0,
-      pageSize: 10,
-      pageNum: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
+      modelData5: []
     }
   },
   mounted() {
     this.parkBehaviorDuration()
     this.parkBehaviorRange()
     this.parkBehaviorTemporary()
+    this.parkBehaviorNight()
   },
   watch: {
   },
   methods: {
-    handlePageChange() {
-      this.getTableData()
-    },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
     parkBehaviorDuration() {
-      article_liao.parkBehaviorDuration().then(res =>{
-        this.modelData.list = res.data
+      api.parkBehaviorDuration().then(res =>{
+        this.modelData = res.data
       })
     },
     parkBehaviorRange(){
-      article_liao.parkBehaviorRange().then(res =>{
+      api.parkBehaviorRange().then(res =>{
         this.linedata = res.data
       })
     },
     parkBehaviorTemporary(){
-      article_liao.parkBehaviorTemporary().then(res =>{
-        this.modelData4.list = res.data
+      api.parkBehaviorTemporary().then(res =>{
+        this.modelData4 = res.data
       })
     },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
+    parkBehaviorNight(){
+      api.parkBehaviorNight().then(res =>{
+        this.modelData5 = res.data
+      })
     }
   }
 }

src/pages/index/components/park_easy.vue

@@ -25,7 +25,7 @@
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'month', y: 'thisYearAmount', seriesName: '缺口程度',bool:'true' },
+              { x: 'month', y: 'thisYearAmount', seriesName: '难易指数',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
@@ -37,6 +37,7 @@
 import * as echarts from 'echarts'
 import * as geoJson from '../../../util/411100.json'
 import linechart from "@/components/lineChart";
+import api from '@/api/audit'
 
 export default {
   components: {
@@ -137,9 +138,6 @@ export default {
           },
         ],
       },
-      curData: {},
-      dataSource: null,
-      totalAll: '0',
     };
   },
   methods: {
@@ -171,52 +169,47 @@ export default {
     },
   },
   mounted() {
-    let arr = []
-    let dataSoure = {
-      '411102': {quyuName: '源汇区', zb: 40},
-      '411103': {quyuName: '郾城区', zb: 60},
-      '411104': {quyuName: '召陵区', zb: 40},
-      '411121': {quyuName: '舞阳县', zb: 50},
-      '411122': {quyuName: '临颍县', zb: 30}}
-    for (const key in dataSoure) {
-      if (key !== '411100') {
-        arr.push({
-          name: dataSoure[key].quyuName,
-          value: Number(dataSoure[key].zb),
-        });
+    api.nyzs().then(res => {
+      let arr = []
+      let dataSoure = res.data
+      for (const key in dataSoure) {
+        if (key !== 411100) {
+          arr.push({
+            name: dataSoure[key].quyuName,
+            value: Number(dataSoure[key].zb),
+          });
+        }
       }
-    }
-    let mapMax = Math.max(...arr.map(item => item.value))
-    let mapMin = Math.min(...arr.map(item => item.value))
-    console.log(mapMin, '111')
-    console.log(mapMax, '222')
-    let chart = echarts.init(document.getElementById("map"));
-    echarts.registerMap("luohe", geoJson);
-    this.option.series[0].data = arr;
-    this.option.visualMap.min = mapMin;
-    this.option.visualMap.max = mapMax;
-    chart.setOption(this.option);
-    this.dqIndex = -1;
-    this.setIntervalMap(chart);
-    //鼠标移入静止播放
-    chart.on("mouseover", (e) => {
-      clearInterval(this.timer);
-      chart.dispatchAction({
-        type: "showTip",
-        seriesIndex: 0,
-        dataIndex: e.dataIndex,
+      let mapMax = Math.max(...arr.map(item => item.value))
+      let mapMin = Math.min(...arr.map(item => item.value))
+      let chart = echarts.init(document.getElementById("map"));
+      echarts.registerMap("luohe", geoJson);
+      this.option.series[0].data = arr;
+      this.option.visualMap.min = mapMin;
+      this.option.visualMap.max = mapMax;
+      chart.setOption(this.option);
+      this.dqIndex = -1;
+      this.setIntervalMap(chart);
+      //鼠标移入静止播放
+      chart.on("mouseover", (e) => {
+        clearInterval(this.timer);
+        chart.dispatchAction({
+          type: "showTip",
+          seriesIndex: 0,
+          dataIndex: e.dataIndex,
+        });
       });
-    });
-    chart.on("mouseout", (e) => {
-      clearInterval(this.timer);
-      //鼠标移出后先把上次的高亮取消
-      chart.dispatchAction({
-        type: "downplay",
-        seriesIndex: 0,
-        dataIndex: e.dataIndex,
+      chart.on("mouseout", (e) => {
+        clearInterval(this.timer);
+        //鼠标移出后先把上次的高亮取消
+        chart.dispatchAction({
+          type: "downplay",
+          seriesIndex: 0,
+          dataIndex: e.dataIndex,
+        });
+        this.setIntervalMap(chart);
       });
-      this.setIntervalMap(chart);
-    });
+    })
   },
 };
 </script>

src/pages/index/components/park_monitor.vue

@@ -12,8 +12,8 @@
           id="chart1"
           :radiusArr="['30%', '70%']"
           :colorArr="modelPieColor"
-          :labelFormat="['{mouth|{b}}', '{sub|{@thisYearAmount}-{d}%}', '{hr|}']"
-          :dataset="modelData.list"
+          :labelFormat="['{mouth|{b}}', '{sub|{@thisYearAmount}辆 {d}%}','{hr|}']"
+          :dataset="modelData"
           :roseType="false"
           :encode="{ itemName: 'mouth', value: 'thisYearAmount' }"
         />
@@ -56,31 +56,19 @@
   </div>
 </template>
 <script>
-import api from "@/api/audit.js";
 import piechart from "@/components/pieChart";
 import vtable from "@/components/vtableNew";
-import article_liao from "../../../api/article_liao";
+import api from "@/api/article_liao";
 
 export default {
   components: {
     piechart,
-    vtable,
-    article_liao
+    vtable
   },
   data() {
     return {
       modelPieColor: ["#4382f6","#9078f8"],
-      modelData: {
-        list: []
-      },
-      linedata: [{month: '11', lastYearAmount: 20, thisYearAmount: 30}, {month: '12', lastYearAmount: 40, thisYearAmount: 50}],
-      bardata: [{month: '01', hs: 100, cs: 200},{month: '02', hs: 300, cs: 200},{month: '03', hs: 400, cs: 200},],
-      riskColumns: [
-        { name: "", rowIdx: "name", width: "40%" },
-        { name: "预警信息", rowIdx: "yjxx", origin: true },
-        { name: "停车场", rowIdx: "tcc", origin: true },
-        { name: "预警时间", rowIdx: "yjsj" },
-      ],
+      modelData: [],
       columns: [
         {
           label: '预警信息',
@@ -95,78 +83,6 @@ export default {
           key: 'userName'
         }
       ],
-      columns2: [
-        {
-          label: '停车场',
-          key: 'tcc'
-        },
-        {
-          label: '泊位号',
-          key: 'bwh'
-        },
-        {
-          label: '泊位状态',
-          key: 'bwzt'
-        },
-        {
-          label: '是否潮汐车位',
-          key: 'sfcxcw'
-        },
-        {
-          label: '是否充电泊位',
-          key: 'sfcdcw'
-        },
-        {
-          label: '是否共享泊位',
-          key: 'sfgxcw'
-        }
-        ,
-        {
-          label: '是否异常',
-          key: 'sfyc'
-        }
-      ],
-      riskData: [{
-        yjxx: '饱和度大于80%',
-        tcc: "建业智慧港停车场",
-        yjsj: "2023-05-12 11:25:15",
-      },{
-        yjxx: '饱和度大于90%',
-        tcc: "双汇华府停车场",
-        yjsj: "2023-11-03 21:15:35",
-      },{
-        yjxx: '饱和度大于95%',
-        tcc: "漯河长申玉停车场",
-        yjsj: "2023-09-02 12:25:45",
-      }],
-      riskColumns2: [
-        { name: "", rowIdx: "name", width: "40%" },
-        { name: "停车场", rowIdx: "tcc", origin: true },
-        { name: "泊位号", rowIdx: "bwh", origin: true },
-        { name: "泊车状态", rowIdx: "bczt" },
-        { name: "是否潮汐车位", rowIdx: "sfcxcw" },
-        { name: "是否充电泊位", rowIdx: "sfcdbw" },
-        { name: "是否共享泊位", rowIdx: "sfgxbw" },
-        { name: "是否异常", rowIdx: "sfyc" },
-      ],
-      riskData2: [{
-        tcc: '双汇华府停车场',
-        bwh: "A023",
-        bczt: "占用中",
-        sfcxcw: "否",
-        sfcdbw:"否",
-        sfgxbw:"否",
-        sfyc:"否",
-      },{
-        tcc: '丽晶商务快捷-停车场',
-        bwh: "A024",
-        bczt: "占用中",
-        sfcxcw: "否",
-        sfcdbw:"否",
-        sfgxbw:"否",
-        sfyc:"否",
-      }],
-      mapData: {},
       tableData: [],
       total: 0,
       pageSize: 10,
@@ -174,9 +90,6 @@ export default {
       total2: 0,
       pageSize2: 10,
       pageNum2: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
     }
   },
   mounted() {
@@ -185,36 +98,10 @@ export default {
   watch: {
   },
   methods: {
-    handlePageChange() {
-      this.getTableData()
-    },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
     parkMonitorStat(){
-      article_liao.parkMonitorStat().then(res =>{
-        this.modelData.list = res.data
+      api.parkMonitorStat().then(res =>{
+        this.modelData = res.data || []
       })
-    },
-    getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
-        this.tableData = []
-        res.data.records.map((item, index) => {
-          const newItem = {...item}
-          newItem.applyTypeText = this.getApplyTypeText(item.applyType)
-          this.tableData.push(newItem)
-        })
-        this.total = res.data.total
-      })
-    },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
     }
   }
 }
@@ -223,11 +110,7 @@ export default {
 .body-wrapper {
   padding: 20px;
   background: #0c0c0c;
-  width: 80%;
-  .button-block{
-    text-align: right;
-    margin-bottom: 20px;
-  }
+  width: 100%;
   .table-pagination{
     text-align: right;
   }
@@ -253,7 +136,7 @@ export default {
   margin-top: 100px;
 }
 .charts2{
-  width: 55%;
+  width: 50%;
   height: 600px;
 }
 .btn_save{

src/pages/index/components/saturation_warning.vue

@@ -49,8 +49,8 @@
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'month', y: 'lastYearAmount', seriesName: '预警值',col:'red' },
-              { x: 'month', y: 'thisYearAmount', seriesName: '饱和度',bool:'true' },
+              { x: 'month', y: 'thisAmount', seriesName: '预警值',col:'red' },
+              { x: 'month', y: 'lastAmount', seriesName: '饱和度',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
@@ -72,6 +72,7 @@
 <script>
 import linechart from "@/components/lineChart";
 import vtable from "@/components/vtableNew";
+import api from '@/api/audit'
 
 export default {
   components: {
@@ -86,12 +87,7 @@ export default {
         region2: '',
         region3: '',
       },
-      linedata: [{month: '8:00',lastYearAmount: 80, thisYearAmount: 90}, {month: '10:00', lastYearAmount:80, thisYearAmount:70}
-        , {month: '12:00', lastYearAmount:80, thisYearAmount:60}, {month: '14:00', lastYearAmount:80, thisYearAmount:75}
-        , {month: '16:00', lastYearAmount:80, thisYearAmount:60}, {month: '18:00', lastYearAmount:80, thisYearAmount:90}
-        , {month: '20:00', lastYearAmount:80, thisYearAmount:70}, {month: '22:00', lastYearAmount:80, thisYearAmount:60}
-        , {month: '0:00', lastYearAmount:80, thisYearAmount:75}, {month: '2:00', lastYearAmount:80, thisYearAmount:60}
-        , {month: '4:00', lastYearAmount:80, thisYearAmount:73}, {month: '6:00', lastYearAmount:80, thisYearAmount:60}],
+      linedata: [],
       columns: [
         {
           label: '街道名称',
@@ -115,56 +111,44 @@ export default {
       pageNum: 1,
       radio: '2',
       dialogVisible: false,
-      selRow: {},
-      searchWords: undefined
+      selRow: {}
     }
   },
   mounted() {
+    this.getTcbhyj()
     this.getTableData()
   },
   watch: {
   },
   methods: {
+    getTcbhyj() {
+      api.tcbhyj().then(res => {
+        this.linedata = res.data.map(item => ({...item, thisAmount: 30})) || []
+      })
+    },
     handlePageChange() {
       this.getTableData()
     },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
-    handleConfirm() {
-      const {id} = this.selRow
-      console.log('radio', this.radio)
-      api.applyResource({id, applyType: this.radio}).then(res => {
-        if(res.success) {
-          this.dialogVisible = false
-          this.$message({
-            message: '审核成功!',
-            type: 'success'
-          })
-          this.getTableData()
-        }
-      })
-    },
     getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
-        this.tableData = []
-        res.data.records.map((item, index) => {
-          const newItem = {...item}
-          newItem.applyTypeText = this.getApplyTypeText(item.applyType)
-          this.tableData.push(newItem)
-        })
-        this.total = res.data.total
-      })
+      const {pageNum, pageSize} = this
+      // api.applyList({pageNum, pageSize}).then(res => {
+      //   this.tableData = []
+      //   res.data.records.map((item, index) => {
+      //     const newItem = {...item}
+      //     newItem.applyTypeText = this.getApplyTypeText(item.applyType)
+      //     this.tableData.push(newItem)
+      //   })
+      //   this.total = res.data.total
+      // })
     },
     lineTooltipFormat(params) {
       const data = params[0].data;
       return `<div class="line-tooltip">
         <div style="color: ${params[1].color}">${params[1].seriesName}: ${
-        params[0].data.thisYearAmount || "--"
+        params[0].data.lastAmount || "--"
       }(%)</div>
         <div style="color: red">${params[0].seriesName}: ${
-        params[0].data.lastYearAmount || "--"
+        params[0].data.thisAmount || "--"
       }(%)</div>
       </div>`;
     },