接口联调

src/api/article_liao.js

@@ -17,6 +17,14 @@ export default {
   businessAnalysisStat3(params) {
     return axios.post('/dash/charge/business/analysis/stat3', params)
   },
+  // 停车运行监管-流量预警
+  llyjListByPage(params) {
+    return axios.get('/dash/park/monitor/alert', {params})
+  },
+  // 停车运行监管-泊位停车实况
+  bwtcskListByPage(params) {
+    return axios.get('/dash/park/monitor/berth', {params})
+  },
   //资源利用分析
   parkMonitorStat(params) {
     return axios.post('/dash/park/monitor/stat', params);

src/api/article_z.js

@@ -2,13 +2,17 @@
 import axios from "../util/ajax";
 
 export default {
+  // 停车盲点挖掘/dash/blind/spot/digging/page
+  queryBlindListByPage(params) {
+    return axios.get(`/dash/blind/spot/digging/page`, {params})
+  },
   //停车盲点挖掘
   queryBlindContext(params) {
     return axios.post(`/dash/blind/spot/digging/stat1`, params)
   },
   //路内泊位设置推荐
   queryBerthContext(params) {
-    return axios.post(`/dash/berth/recommend/page`, params)
+    return axios.get(`/dash/berth/recommend/page`, {params})
   },
   //路内泊位设置推荐
   queryGapMapContext(params) {
@@ -19,46 +23,58 @@ export default {
   queryServiceMap(params) {
     return axios.post(`/dash/service/operations/page`, params)
   },
-  // todo 区域停车主题_区域饱和度
-  queryParkingArea_Qybhd(params) {
+  // 区域停车主题_区域饱和度
+  queryParkingArea_qybhd(params) {
     return axios.post(`/dash/parking/area/stat1`, params)
   },
-  // todo 区域停车主题_停车热度时空分布
+  // 区域停车主题_饱和度时段分析
+  queryParkingArea_bhdsdfx(params) {
+    return axios.post(`/dash/parking/area/stat2`, params)
+  },
+  // 区域停车主题_停车热度时空分布
   queryParkingArea_Tcrdskfb(params) {
     return axios.post(`/dash/parking/area/stat3`, params)
   },
-  // 区域停车主题_停车饱和度
+  // 运营停车场主题_停车饱和度
   queryParkingOperate_Tcbhd(params) {
     return axios.post(`/dash/parking/operate/stat1`, params)
   },
-  // 区域停车主题_停车场周转率分析
+  // 运营停车场主题_停车场周转率分析
   queryParkingOperate_Tczzlfx(params) {
     return axios.post(`/dash/parking/operate/stat2`, params)
   },
-  // 区域停车主题_停车场营收分析
+  // 运营停车场主题_停车场营收分析
   queryParkingOperate_Tccysfx(params) {
     return axios.post(`/dash/parking/operate/stat3`, params)
   },
-  // 区域停车主题_特殊车辆进场占比
+  // 运营停车场主题_特殊车辆进场占比
   queryParkingOperate_Tscljczb(params) {
     return axios.post(`/dash/parking/operate/stat4`, params)
   },
-  // 区域停车主题_车辆进出场趋势
+  // 运营停车场主题_车辆进出场趋势
   queryParkingOperate_Cljccqs(params) {
     return axios.post(`/dash/parking/operate/stat5`, params)
   },
-  // 区域停车主题_停车场营收对比分析
+  // 运营停车场主题_停车场营收对比分析
   queryParkingOperate_Tccysdbfx(params) {
     return axios.post(`/dash/parking/operate/stat6`, params)
   },
-  // 区域停车主题_泊位盈余情况
+  // 泊位运营分析_泊位盈余情况
   queryBerthPerationNalysis_Bwyyqk(params) {
     return axios.post(`/dash/berth/peration/nalysis/surplus`, params)
   },
-  // 区域停车主题_泊位周转率分析
+  //泊位运营分析_泊位周转率分析
   queryBerthPerationNalysis_Bwzzlfx(params) {
     return axios.post(`/dash/berth/peration/nalysis/turnover`, params)
   },
+  // 收费价格监管-停车场收费价格
+  sfjgListByPage(params) {
+    return axios.get('/dash/charge/price/page',{params})
+  },
+  // 收费价格监管-车主缴费明细
+  czjfmxListByPage(params) {
+    return axios.get('/dash/charge/price/pay/page',{params})
+  },
   // 收费价格监管_收费单价分析
   queryChargePrice_Sfdjfx(params) {
     return axios.post(`/dash/charge/price/stat`, params)
@@ -75,7 +91,7 @@ export default {
   queryCustomerComplaint_Ksfx(params) {
     return axios.post(`/dash/customer/complaint/stat`, params)
   },
-  // todo设备运行监测_列表
+  // todo 设备运行监测_列表
   sbyxjcList(params) {
     return axios.get('/dash/equipment/running/page', {params})
   },

src/api/audit.js

@@ -1,15 +1,47 @@
 import axios from "@/util/ajax";
 
 export default {
+  // 记录查询-车辆查询
+  carListByPage(params) {
+    return axios.get('/dash/record/query/berth/page', {params})
+  },
+  // 记录查询-轨迹查询
+  gjListByPage(params) {
+    return axios.get('/dash/record/query/monitor/page', {params})
+  },
+  // 记录查询-停车记录查询
+  tcjlListByPage(params) {
+    return axios.get('/dash/record/query/park/page', {params})
+  },
+  // 企业服务监管-列表
+  qyfwjgListByPage(params) {
+    return axios.get('/dash/enterprise/service/page', {params})
+  },
+  // 停车场情况-列表
+  tccqkListByPage(params) {
+    return axios.get('/dash/parking/lot/situation/page', {params})
+  },
+  // 停车场情况-总览
+  tccqkView(params) {
+    return axios.get('/dash/parking/lot/situation/view', {params})
+  },
+  // 停车收费取证主题-列表
+  tcsfztListByPage(params) {
+    return axios.get('/dash/parking/fee/page', {params})
+  },
   // 停车饱和预警-饱和度
   tcbhyj(params) {
     return axios.post('/dash/saturation/warning/stat1', params)
   },
-  // todo 停车饱和预警-网格化停车饱和预警
+  // 停车饱和预警-网格化停车饱和预警
   wghtcbhyj(params) {
-    return axios.post('/dash/saturation/warning/page', params)
+    return axios.get('/dash/saturation/warning/page', {params})
   },
-  // todo 车辆迁徙分析
+  //  车辆迁徙分析
+  clqx(params) {
+    return axios.post('/dash/trck/map/stat1', params)
+  },
+
   // 停车缺口分析-停车缺口分析
   tcqkfx(params) {
     return axios.post('/dash/gap/analysis/stat1', params)
@@ -30,18 +62,24 @@ export default {
   nyzs(params) {
     return axios.post('/dash/park/guidance/stat', params)
   },
-  // todo 全局停车诱导-统计
-  nyzstj(params) {
-    return axios.post('/dash/park/guidance/page', params)
+  //
+  nyzstjListByPage(params) {
+    return axios.get('/dash/park/guidance/page', {params})
+  },
+  // 区域停车发展分析
+  qytcfzListByPage1 (params) {
+    return axios.get('/dash/park/development/analysis/common', {params})
+  },
+  qytcfzListByPage2 (params) {
+    return axios.get('/dash/park/development/analysis/development', {params})
   },
-  // todo 区域停车发展分析
   // 路内泊位设置推荐- 停车缺口 /dash/berth/recommend/stat1
   lntcqk(params) {
     return axios.post('/dash/berth/recommend/stat1', params)
   },
   // 路内泊位设置推荐- 路内泊位
   lnbw(params) {
-    return axios.post('/dash/berth/recommend/page', params)
+    return axios.get('/dash/berth/recommend/page', {params})
   },
   // 其他分析-区域分析
   qyfx(params) {
@@ -63,7 +101,7 @@ export default {
   ywfx(params) {
     return axios.post('/dash/other/analyse/stat4', params)
   },
-  // todo 其他分析-停车热点分析
+  // 其他分析-停车热点分析
   tcrdfx(params) {
     return axios.post('/dash/other/analyse/stat5', params)
   },
@@ -75,7 +113,7 @@ export default {
   dlyltcc(params) {
     return axios.post('/dash/other/analyse/stat7', params)
   },
-  // todo 其他分析-高峰路线分析
+  // 其他分析-高峰路线分析
   gflxfx(params) {
     return axios.post('/dash/other/analyse/stat8', params)
   },
@@ -102,9 +140,9 @@ export default {
   },
   // 消息中心
   messageListByPage(params) {
-    return axios.post('/dash/message/page', {params})
+    return axios.get('/dash/message/page', {params})
   },
-  // todo 服务监控
+  // 服务监控
   monitorListByPage(params) {
     return axios.get('/dash/service/monitor/page', {params})
   },
@@ -118,7 +156,10 @@ export default {
   addPz(params) {
     return axios.post('/dash/credential/management/function/save', params)
   },
-  // todo 服务订阅
+  // 服务订阅 /dash/service/subscription/function/page
+  subscriptionListByPage (params) {
+    return axios.get('/dash/service/subscription/function/page', {params})
+  },
   subscription(params) {
     return axios.post('/dash/service/subscription/function/subscription', params)
   },
@@ -137,7 +178,7 @@ export default {
   addWhiteIp(params) {
     return axios.post('/dash/ip/white/list/save', params)
   },
-  // todo 服务调用功能
+  // 服务调用功能
   fwdy(params) {
     return axios.post('/dash/service/call/function/call', params)
   },
@@ -148,10 +189,6 @@ export default {
   czrzDetail(params) {
     return axios.post('/dash/operation/log/detail', params)
   },
-  // todo 停车收费主题
-  tcsfListByPage(params) {
-    return axios.get('/dash/parking/fee/page', {params})
-  },
   // 车主信用监管
   czxyjgListByPage(params) {
     return axios.get('/dash/car/owner/credit/page', {params})

src/pages/index/components/access_data_analysis.vue

@@ -1,23 +1,23 @@
 <template>
   <div class="body-wrapper">
-      <el-form class="form-wrapper" :inline="true" :model="formInline">
-        <el-form-item label="所在区">
-          <el-select v-model="formInline.region" placeholder="请选择所在区">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="停车场名称">
-          <el-input v-model="formInline.interfaceName" placeholder="请输入停车场名称"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">查询</el-button>
-        </el-form-item>
-      </el-form>
+<!--      <el-form class="form-wrapper" :inline="true" :model="formInline">-->
+<!--        <el-form-item label="所在区">-->
+<!--          <el-select v-model="formInline.region" placeholder="请选择所在区">-->
+<!--            <el-option-->
+<!--              v-for="item in options"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="停车场名称">-->
+<!--          <el-input v-model="formInline.interfaceName" placeholder="请输入停车场名称"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
+<!--          <el-button type="primary" @click="onSubmit">查询</el-button>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
     <div style="display: flex; justify-content: space-between;">
       <div style="width: 50%; height: 300px">
         <barchart

src/pages/index/components/announcement_function.vue

@@ -33,9 +33,9 @@
           <el-form-item label="公告正文" required>
             <el-input v-model="formLabelAlign.noticeText"></el-input>
           </el-form-item>
-          <el-form-item v-if="title === '查看详情'" label="发布人">
-            <el-input v-model="formLabelAlign.publishUser"></el-input>
-          </el-form-item>
+<!--          <el-form-item v-if="title === '查看详情'" label="发布人">-->
+<!--            <el-input v-model="formLabelAlign.publishUser"></el-input>-->
+<!--          </el-form-item>-->
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -59,12 +59,12 @@ export default {
         },
         {
           label: '公告日期',
-          key: 'publishDate'
+          key: 'createTime'
         },
-        {
-          label: '发布人',
-          key: 'publishUser'
-        }
+        // {
+        //   label: '发布人',
+        //   key: 'publishUser'
+        // }
       ],
       tableData: [{"publicTitle":'预警提示',"publicTime":'2023-12-29 10:00:00',"publicPerson":'李玉'},
         {"publicTitle":'停车时限',"publicTime":'2023-12-31 11:00:00',"publicPerson":'张玮'},

src/pages/index/components/berth_recommend.vue

@@ -44,24 +44,19 @@ export default {
       linedata: [],
       columns: [
         {
-          label: '街道名称',
-          key: 'jd'
+          label: '区域名称',
+          key: 'regionName'
         },
         {
           label: '缺口程度（%）',
-          key: 'qk'
+          key: 'parkGap'
         },
         {
           label: '推荐策略',
-          key: 'tj'
+          key: 'detail'
         }
       ],
-      tableData: [{"jd": '老街街道',"qk": 30,"tj":"建议设置路内泊车"}
-        ,{"jd":'马路街街道',"qk": 20,"tj":"--"}
-        ,{"jd":'顺河街街道',"qk": 50,"tj":"建议设置路内泊车"}
-        ,{"jd":'干河陈街道',"qk": 30,"tj":"--"}
-        ,{"jd":'大刘镇',"qk": 20,"tj":"建议设置路内泊车"}
-        ,{"jd":'阴阳赵镇',"qk": 50,"tj":"--"}],
+      tableData: [],
       total: 3,
       pageSize: 10,
       pageNum: 1,
@@ -93,14 +88,9 @@ export default {
       this.getTableData()
     },
     getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.lnbw({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)
-        })
+      const {pageNum, pageSize} = this
+      api.lnbw({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
         this.total = res.data.total
       })
     },

src/pages/index/components/blind_spot_digging.vue

@@ -44,34 +44,26 @@ export default {
       linedata: [],
       columns: [
         {
-          label: '街道名称',
-          key: 'jd'
+          label: '区域名称',
+          key: 'regionName'
         },
         {
           label: '缺口程度（%）',
-          key: 'qk'
+          key: 'parkGap'
         },
         {
           label: '推荐策略',
-          key: 'tj'
+          key: 'detail'
         }
       ],
-      tableData: [{"jd": '老街街道',"qk": 30,"tj":"建议提升停车盲点的停车资源利用率"}
-        ,{"jd":'马路街街道',"qk": 20,"tj":"--"}
-        ,{"jd":'顺河街街道',"qk": 10,"tj":"建议提升停车盲点的停车资源利用率"}
-        ,{"jd":'干河陈街道',"qk": 0,"tj":"--"}
-        ,{"jd":'大刘镇',"qk": 0,"tj":"建议提升停车盲点的停车资源利用率"}
-        ,{"jd":'阴阳赵镇',"qk": 10,"tj":"--"}],
+      tableData: [],
       total: 3,
       pageSize: 10,
-      pageNum: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
-      searchWords: undefined,
+      pageNum: 1
     }
   },
   mounted() {
+    this.getTableData()
     this.getLineData()
   },
   watch: {
@@ -92,9 +84,9 @@ export default {
       this.getTableData()
     },
     getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
-        this.tableData = res.data.record || []
+      const {pageNum, pageSize} = this
+      api.queryBlindListByPage({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
         this.total = res.data.total
       })
     },

src/pages/index/components/charge_price.vue

@@ -8,8 +8,8 @@
       </el-table-column>
     </el-table>
     <div class="table-pagination">
-      <el-pagination :background="false" layout="total, prev, pager, next" :total="total2" @current-change="handlePageChange"
-                     :current-page.sync="pageNum2" :page-size.sync="pageSize2">
+      <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>
     <br>
@@ -24,20 +24,20 @@
           :roseType = "false"
           :colorArr="modelPieColor"
           :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
-          :dataset="modelData.list"
+          :dataset="modelData"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
 
       <div style="width: 55%;height: 400px;">
         <h4 style="color: white">车主缴费明细</h4>
-        <el-table :data="tableData3" style="background: #2a2a2a;border-color: #333;">
+        <el-table :data="tableData2" style="background: #2a2a2a;border-color: #333;">
           <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="total" @current-change="handlePageChange"
-                         :current-page.sync="pageNum" :page-size.sync="pageSize">
+          <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>
       </div>
@@ -48,9 +48,8 @@
   </div>
 </template>
 <script>
-import api from "@/api/audit.js";
 import piechart from "@/components/pieChart";
-import api1 from "@/api/article_z";
+import api from "@/api/article_z";
 
 export default {
   components: {
@@ -61,138 +60,83 @@ export default {
       columns: [
         {
           label: '停车场',
-          key: 'resourceName'
+          key: 'carParkName'
         },
         {
-          label: '收费标准',
-          key: 'resourceType'
+          label: '日常收费标准',
+          key: 'dailyStandards'
         } ,{
-          label: '全天（24小时最高停车费）',
-          key: 'resourceName'
+          label: '假期收费标准',
+          key: 'holidayStandards'
+        },{
+          label: '特殊收费标准',
+          key: 'specialStandards'
         }
       ],
       columns2: [
         {
-          label: '日期',
-          key: 'resourceName'
+          label: '缴费时间',
+          key: 'payTime'
         },
         {
-          label: '姓名',
-          key: 'resourceType'
+          label: '车牌号',
+          key: 'plateNo'
         } ,{
-          label: '地址',
-          key: 'resourceName'
+          label: '停车场',
+          key: 'carParkName'
         },{
           label: '缴费金额',
-          key: 'resourceName'
+          key: 'fee'
         },{
           label: '停车时长',
-          key: 'resourceName'
+          key: 'duration'
         }
       ],
       modelPieColor: ["#2E8B57","#9078f8","#54FF9F","#00CED1"],
-      modelData: {
-        list: [{name: '2元/小时', value: 600}, {name: '3元/小时', value: 800}, {name: '4元/小时', value: 800}, {name: '5元/小时', value: 800}]
-      },
+      modelData: [],
       tableData: [],
       tableData2: [],
-      tableData3: [],
       total: 0,
-      pageSize: 10,
+      pageSize: 5,
       pageNum: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
-      searchWords: undefined,
       total2: 0,
-      pageSize2: 10,
-      pageNum2: 1,
-      radio2: '2',
-      dialogVisible2: false,
-      selRow2: {},
-      searchWords2: undefined,
+      pageSize2: 5,
+      pageNum2: 1
     }
   },
   mounted() {
     this.getTableData()
     this.getTableData2()
-    this.getTableData3()
     this.getModelDataData()
   },
   watch: {
   },
   methods: {
-    handlePageChange() {
-      this.getTableData()
-      this.getTableData2()
-      this.getTableData3()
-    },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
-    handleConfirm() {
-      const {id} = this.selRow
-      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.sfjgListByPage({current: 1, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
+        this.total = res.data.total || 0
       })
     },
     getTableData2() {
-      api.applyList({}).then(res => {
-        this.tableData2 =  res.data.data
-        this.total2 = res.data.total
+      const {pageNum2, pageSize2} = this
+      api.czjfmxListByPage({current: pageNum2, size: pageSize2}).then(res => {
+        this.tableData2 = (res.data.records || []).map(item => ({...item, fee: Number(item.fee).toFixed(2)}))
+        this.total2 = res.data.total || 0
       })
     },
-
-    getTableData3() {
-      api.applyList({pageNum: this.pageNum2, pageSize:this.pageSize2, resourceName: this.searchWords2}).then(res => {
-        this.tableData3 =  res.data.data
-        this.total3 = res.data.total
-      })
+    handlePageChange() {
+      this.getTableData()
+    },
+    handlePageChange2() {
+      this.getTableData2()
     },
     getModelDataData(){
-      api1.queryChargePrice_Sfdjfx().then(res=>{
-        this.modelData.list=res.data;
+      api.queryChargePrice_Sfdjfx().then(res=>{
+        this.modelData=res.data || [];
       })
     },
-
-    getApplyTypeText(val) {
-      if (!val){
-        return '未申请'
-      }
-      const textMap = {
-        1: '待审批',
-        2: '审批通过',
-        3: '审批驳回'
-      }
-      return textMap[val]
-    },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
-    }
   }
 }
 </script>

src/pages/index/components/customer_complaint.vue

@@ -124,6 +124,10 @@ export default {
         {
           label: '处理状态',
           key: 'disposeState'
+        },
+        {
+          label: '处理结束时间状态',
+          key: 'endDisposeTime'
         }
       ],
       modelPieColor: ["#4382f6","#9078f8","#C1FFC1","#1E90FF"],
@@ -151,6 +155,7 @@ export default {
   },
   methods: {
     onSubmit() {
+      this.pageNum = 1
       this.getTableData()
     },
     getModelDataData(){

src/pages/index/components/enterprise_service.vue

@@ -5,7 +5,7 @@
     </div>
     <br>
     <br>
-    <el-table :data="tableData7" style="background: #2a2a2a;border-color: #333;">
+    <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>
@@ -32,27 +32,15 @@ export default {
       columns: [
         {
           label: '车场名',
-          key: 'parkName'
+          key: 'carParkName'
         },
         {
           label: '综合评分',
-          key: 'resourceType'
+          key: 'score'
         }
       ],
       tableData: [],
-      tableData2: [],
-      tableData3: [],
-      tableData4: [],
-      tableData5: [],
-      tableData6: [],
-      tableData7: [],
       total: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
-      total5: 0,
-      total6: 0,
-      total7: 0,
       pageSize: 10,
       pageNum: 1,
       radio: '2',
@@ -64,12 +52,6 @@ export default {
   },
   mounted() {
     this.getTableData()
-    this.getTableData2()
-    this.getTableData3()
-    this.getTableData4()
-    this.getTableData5()
-    this.getTableData6()
-    this.getTableData7()
   },
   watch: {
   },
@@ -77,90 +59,12 @@ export default {
     handlePageChange() {
       this.getTableData()
     },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
-    handleConfirm() {
-      const {id} = this.selRow
-      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)
-        })
+      const {pageNum, pageSize} = this
+      api.qyfwjgListByPage({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = (res.data.records || []).map(item => ({...item, score: Math.round(item.score)}))
         this.total = res.data.total
       })
-    },
-    getTableData2() {
-      api.applyList({}).then(res => {
-        this.tableData2 =  res.data.data
-        this.total2 = res.data.total
-      })
-    },
-    getTableData3() {
-      api.applyList({}).then(res => {
-        this.tableData3 =  res.data.data
-        this.total3 = res.data.total
-      })
-    },
-    getTableData4() {
-      api.applyList({}).then(res => {
-        this.tableData4 =  res.data.data
-        this.total4 = res.data.total
-      })
-    },
-    getTableData5() {
-      api.applyList({}).then(res => {
-        this.tableData5 =  res.data.data
-        this.total5 = res.data.total
-      })
-    },
-    getTableData6() {
-      api.applyList({}).then(res => {
-        this.tableData6 =  res.data.data
-        this.total6 = res.data.total
-      })
-    },
-    getTableData7() {
-      api.applyList({}).then(res => {
-        this.tableData7 =  res.data.data
-        this.total7 = res.data.total
-      })
-    },
-
-
-    getApplyTypeText(val) {
-      if (!val){
-        return '未申请'
-      }
-      const textMap = {
-        1: '待审批',
-        2: '审批通过',
-        3: '审批驳回'
-      }
-      return textMap[val]
-    },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
     }
   }
 }

src/pages/index/components/operation_log.vue

@@ -130,7 +130,6 @@ export default {
       })
     },
     onSubmit() {
-      console.log(this.formInline, 'submit!');
       let params = this.formInline
       if (
         this.formInline.time && this.formInline.time.length === 2 &&

src/pages/index/components/other_analyse.vue

@@ -184,11 +184,11 @@
         />
     </div>
 
-      <div style="width: 50%;height: 500px;">
-        <h4 style="color: white">重点车辆进场占比</h4>
-        <br>
-        <div id="ChinaLineMap2"></div>
-      </div>
+<!--      <div style="width: 50%;height: 500px;">-->
+<!--        <h4 style="color: white">重点车辆进场占比</h4>-->
+<!--        <br>-->
+<!--        <div id="ChinaLineMap2"></div>-->
+<!--      </div>-->
     </div>
 
   </div>
@@ -254,7 +254,7 @@ export default {
           textStyle: {
             color: "white",
           },
-          text: ["(%)"],
+          text: ["(次)"],
           min: 0,
           max: 100,
           inRange: {
@@ -426,213 +426,173 @@ 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>`;
     },
     loadMap() {
-      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.tcrdfx().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))
-      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);
-      });
+      })
     },
     //加载轨迹地图
     loadChinaLineMap() {
-      echarts.registerMap('河南', geoJson);
-      var myCharts = echarts.init(document.getElementById('ChinaLineMap'));
-      var myCharts2 = echarts.init(document.getElementById('ChinaLineMap2'));
-      var geoCoordMap = {
-        '源汇区': [114.00647,33.55627],
-        '郾城区': [114.00694,33.58723],
-        '召陵区': [114.09399,33.58601],
-        '舞阳县': [113.59848,33.43243],
-        '临颍县': [113.93661,33.81123]
-      };
-      var chinaDatas = [
-        [{
-          name: '源汇区',
-          value: 0
-        }, {
-          name: '郾城区',
-          value: 20
-        }], [{
-          name: '郾城区',
-          value: 0
-        }, {
-          name: '召陵区',
-          value: 20
-        }], [{
-          name: '召陵区',
-          value: 0
-        }, {
-          name: '郾城区',
-          value: 20
-        }], [{
-          name: '舞阳县',
-          value: 1
-        }, {
-          name: '郾城区',
-          value: 20
-        }], [{
-          name: '临颍县',
-          value: 2
-        }, {
-          name: '郾城区',
-          value: 20
-        }]
-      ];
-      var convertData = function (data) {
-        var res = [];
-        for (var i = 0; i < data.length; i++) {
-          var dataItem = data[i];
-          var fromCoord = geoCoordMap[dataItem[0].name];
-          // var toCoord = [114.026405, 33.575855];
-          var toCoord = geoCoordMap[dataItem[1].name];
-          if (fromCoord && toCoord) {
-            res.push([{
-              coord: fromCoord,
-              value: dataItem[0].value
-            }, {
-              coord: toCoord,
-            }]);
+      api.gflxfx().then(res => {
+        echarts.registerMap('河南', geoJson);
+        var myCharts = echarts.init(document.getElementById('ChinaLineMap'));
+        // var myCharts2 = echarts.init(document.getElementById('ChinaLineMap2'));
+        var geoCoordMap = res.data.geoCoordMap || {};
+        var chinaDatas = (res.data.chinaDatas || []).map(item => ([{name: item.from, value: item.value}, {name: item.to, value: 0}]));
+        var convertData = function (data) {
+          var res = [];
+          for (var i = 0; i < data.length; i++) {
+            var dataItem = data[i];
+            var fromCoord = geoCoordMap[dataItem[0].name];
+            // var toCoord = [114.026405, 33.575855];
+            var toCoord = geoCoordMap[dataItem[1].name];
+            if (fromCoord && toCoord) {
+              res.push([{
+                coord: fromCoord,
+                value: dataItem[0].value
+              }, {
+                coord: toCoord,
+              }]);
+            }
           }
-        }
-        return res;
-      };
-      //飞线数据
-      var series = [];
-      [['漯河市', chinaDatas]].forEach(function (item, i) {
-        console.log(item)
-        series.push({
-            type: 'lines',
-            zlevel: 2,
-            effect: {
-              show: true,
-              period: 4, //箭头指向速度，值越小速度越快
-              trailLength: 0.02, //特效尾迹长度[0,1]值越大，尾迹越长重
-              symbol: 'arrow', //箭头图标
-              symbolSize: 5, //图标大小
-            },
-            lineStyle: {
-              normal: {
-                color:'#EE5652',
-                width: 1, //尾迹线条宽度
-                opacity: 1, //尾迹线条透明度
-                curveness: .3 //尾迹线条曲直度
-              }
-            },
-            data: convertData(item[1])
-          }, {
-            type: 'effectScatter',
-            coordinateSystem: 'geo',
-            zlevel: 2,
-            rippleEffect: { //涟漪特效
-              period: 4, //动画时间，值越小速度越快
-              brushType: 'stroke', //波纹绘制方式 stroke, fill
-              scale: 4 //波纹圆环最大限制，值越大波纹越大
-            },
-            label: {
-              normal: {
+          return res;
+        };
+        //飞线数据
+        var series = [];
+        [['漯河市', chinaDatas]].forEach(function (item, i) {
+          console.log(item)
+          series.push({
+              type: 'lines',
+              zlevel: 2,
+              effect: {
                 show: true,
-                position: 'right', //显示位置
-                offset: [5, 0], //偏移设置
-                formatter: function (params) {//圆环显示文字
-                  return params.data.name;
+                period: 4, //箭头指向速度，值越小速度越快
+                trailLength: 0.02, //特效尾迹长度[0,1]值越大，尾迹越长重
+                symbol: 'arrow', //箭头图标
+                symbolSize: 5, //图标大小
+              },
+              lineStyle: {
+                normal: {
+                  color:'#EE5652',
+                  width: 1, //尾迹线条宽度
+                  opacity: 1, //尾迹线条透明度
+                  curveness: .3 //尾迹线条曲直度
+                }
+              },
+              data: convertData(item[1])
+            }, {
+              type: 'effectScatter',
+              coordinateSystem: 'geo',
+              zlevel: 2,
+              rippleEffect: { //涟漪特效
+                period: 4, //动画时间，值越小速度越快
+                brushType: 'stroke', //波纹绘制方式 stroke, fill
+                scale: 4 //波纹圆环最大限制，值越大波纹越大
+              },
+              label: {
+                normal: {
+                  show: false,
+                  position: 'right', //显示位置
+                  offset: [5, 0], //偏移设置
+                  formatter: function (params) {//圆环显示文字
+                    return params.data.name;
+                  },
+                  color:'#FFD200',
+                  fontSize: 16
                 },
-                color:'#FFD200',
-                fontSize: 16
+                emphasis: {
+                  show: true
+                }
               },
-              emphasis: {
-                show: true
-              }
-            },
-            symbol: 'circle',
-            // symbolSize: function (val) {
-            // 	return 5 + val[2] * 5; //圆环大小
-            // },
-            itemStyle: {
-              normal: {
-                show: true,
-                color: '#ffffff'
-              }
-            },
-            data: item[1].map(function (dataItem) {
-              return {
-                name: dataItem[0].name,
-                value: geoCoordMap[dataItem[0].name].concat([dataItem[0].value])
-              };
-            }),
-          },
-        );
-      });
-      let option = {
-        backgroundColor: "#0c0c0c",
-        geo: [
-          {
-            map: '河南',
-            aspectScale: 1,
-            roam: false, // 是否允许缩放
-            zoom: 1.2, // 默认显示级别
-            layoutSize: '95%',
-            layoutCenter: ['55%', '51.5%'],
-            itemStyle: {
-              areaColor: 'rgba(0,27,95,0.4)',
-              borderColor: '#004db5',
-              borderWidth: 1
+              symbol: 'circle',
+              // symbolSize: function (val) {
+              // 	return 5 + val[2] * 5; //圆环大小
+              // },
+              itemStyle: {
+                normal: {
+                  show: true,
+                  color: '#ffffff'
+                }
+              },
+              data: item[1].map(function (dataItem) {
+                return {
+                  name: dataItem[0].name,
+                  value: geoCoordMap[dataItem[0].name].concat([dataItem[0].value])
+                };
+              }),
             },
-            zlevel: 1,
-            silent: true
-          }
-        ],
-        series: series
-      };
-      //var max = Math.max.apply(Math, newarray);
-      //option.visualMap.max = max;
-      myCharts.clear();
-      myCharts.setOption(option);
-      myCharts2.clear();
-      myCharts2.setOption(option);
-      // myChart.setOption(option);
-
+          );
+        });
+        let option = {
+          backgroundColor: "#0c0c0c",
+          geo: [
+            {
+              map: '河南',
+              aspectScale: 1,
+              roam: false, // 是否允许缩放
+              zoom: 1.2, // 默认显示级别
+              layoutSize: '95%',
+              layoutCenter: ['55%', '51.5%'],
+              itemStyle: {
+                areaColor: 'rgba(0,27,95,0.4)',
+                borderColor: '#004db5',
+                borderWidth: 1
+              },
+              zlevel: 1,
+              silent: true
+            }
+          ],
+          series: series
+        };
+        //var max = Math.max.apply(Math, newarray);
+        //option.visualMap.max = max;
+        myCharts.clear();
+        myCharts.setOption(option);
+        // myCharts2.clear();
+        // myCharts2.setOption(option);
+        // myChart.setOption(option);
+      })
     }
   }
 }

src/pages/index/components/park_development_analysis.vue

@@ -3,117 +3,103 @@
     <div style="color: #d5d3d3" class="middle-map">
       <div align="center" 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 v-for="(item, index) in columns1" :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 :background="false" layout="total, prev, pager, next" :total="total1" @current-change="handlePageChange1"
+                       :current-page.sync="pageNum1" :page-size.sync="pageSize1">
         </el-pagination>
       </div>
     </div>
-    <div class="body-wrapper" style="height: 300px">
+    <div class="middle-map">
       <div align="center" style="color: #3498db;font-size: 23px;margin-bottom: 20px">停车发展评估</div>
-      <el-table :data="tableData1" style="background: #2a2a2a;border-color: #333;">
-        <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
+      <el-table :data="tableData2" style="background: #2a2a2a;border-color: #333;">
+        <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>
     </div>
   </div>
 </template>
 
 <script>
+import api from '@/api/audit'
 
 export default {
   data() {
     return {
-      columns: [
+      columns1: [
         {
-          label: '区县',
-          key: 'district'
+          label: '区域名称',
+          key: 'regionName'
         },
         {
           label: '周边区域开发',
-          key: 'surroundingArea'
+          key: 's1'
         },
         {
           label: '停车资源供给',
-          key: 'parkingResource'
+          key: 's2'
         },
         {
           label: '公共交通设施发展',
-          key: 'publicTransport'
+          key: 's3'
         },
         {
           label: '道路资源供给',
-          key: 'roadResource'
+          key: 's4'
         },
       ],
-      tableData: [{"district":'临颍县',"surroundingArea":'轻微开发',"parkingResource":'充足',"publicTransport":' 欠缺',"roadResource":'充足'}
-      ,{"district":'源汇区',"surroundingArea":'轻微开发',"parkingResource":'充足',"publicTransport":' 欠缺',"roadResource":'充足'}
-      ,{"district":'郾城区',"surroundingArea":'轻微开发',"parkingResource":'充足',"publicTransport":' 欠缺',"roadResource":'充足'}
-      ,{"district":'召陵区',"surroundingArea":'轻微开发',"parkingResource":'充足',"publicTransport":' 欠缺',"roadResource":'充足'}
-      ,{"district":'舞阳县',"surroundingArea":'轻微开发',"parkingResource":'充足',"publicTransport":' 欠缺',"roadResource":'充足'},],
-      total: 3,
-      pageSize: 10,
-      pageNum: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
-      searchWords: undefined,
-      columns1: [
+      tableData1: [],
+      total1: 0,
+      pageSize1: 10,
+      pageNum1: 1,
+      columns2: [
         {
-          label: '姓名',
-          key: 'name'
+          label: '区域名称',
+          key: 'regionName'
         },
         {
           label: '停车发展评估',
-          key: 'assessment'
+          key: 'detail'
         }
       ],
-      tableData1: [{"name":'舞阳区',"assessment":'不建议进行停车发展'}
-        ,{"name":'源汇区',"assessment":'不建议进行停车发展'}
-        ,{"name":'郾城区',"assessment":'建议进行停车发展'}
-        ,{"name":'召陵区',"assessment":'建议进行停车发展'}
-        ,],
+      tableData2: [],
+      total2: 0,
+      pageSize2: 10,
+      pageNum2: 1,
     };
   },
   methods: {
-    handlePageChange() {
-      this.getTableData()
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
+    handlePageChange1() {
+      this.getTableData1()
     },
-    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()
-        }
+    getTableData1() {
+      const {pageNum1, pageSize1} = this
+      api.qytcfzListByPage1({current: pageNum1, size: pageSize1}).then(res => {
+        this.tableData1 = res.data.records || []
+        this.total1 = res.data.total
       })
     },
-    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
+    handlePageChange2() {
+      this.getTableData2()
+    },
+    getTableData2() {
+      const {pageNum2, pageSize2} = this
+      api.qytcfzListByPage2({current: pageNum2, size: pageSize2}).then(res => {
+        this.tableData2 = res.data.records || []
+        this.total2 = res.data.total
       })
     },
   },
   mounted() {
-    this.getTableData()
+    this.getTableData1()
+    this.getTableData2()
   },
 };
 </script>

src/pages/index/components/park_guidance.vue

@@ -12,6 +12,11 @@
         <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>
 </template>
@@ -31,14 +36,17 @@ export default {
       columns: [
         {
           label: '区域',
-          key: 'area'
+          key: 'regionName'
         },
         {
           label: '建议',
-          key: 'advice'
+          key: 'detail'
         }
       ],
-      tableData: [{"area":'舞阳区',"advice":'建议车辆引流到源汇区'}],
+      tableData: [],
+      pageNum: 1,
+      pageSize: 10,
+      total: 1,
       dqIndex: -1,
       timer: null,
       option: {
@@ -120,10 +128,19 @@ export default {
       },
       curData: {},
       dataSource: null,
-      totalAll: '0',
     };
   },
   methods: {
+    handlePageChange() {
+      this.getTableData()
+    },
+    getTableData() {
+      const {pageNum, pageSize} = this
+      api.nyzstjListByPage({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
+        this.total = res.data.total
+      })
+    },
     setIntervalMap(chart) {
       this.timer = setInterval(() => {
         chart.dispatchAction({
@@ -144,6 +161,7 @@ export default {
     },
   },
   mounted() {
+    this.getTableData()
     api.nyzs().then(res => {
       let arr = []
       let dataSoure = res.data
@@ -194,6 +212,9 @@ export default {
   height: 100%;
   box-sizing: border-box;
   background: #0c0c0c;
+  .table-pagination{
+    text-align: right;
+  }
 }
 </style>
 <style lang="less" scoped>

src/pages/index/components/park_monitor.vue

@@ -39,12 +39,12 @@
       <h3 style="color: white;float: left">泊位停车实况</h3>
       <br>
         <br>
-        <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
+        <el-table :data="tableData2" style="background: #2a2a2a;border-color: #333;">
           <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="handlePageChange"
+          <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>
@@ -71,47 +71,70 @@ export default {
       modelData: [],
       columns: [
         {
-          label: '预警信息',
-          key: 'resourceName'
+          label: '停车场',
+          key: 'carParkName'
         },
         {
-          label: '停车场',
-          key: 'resourceType'
+          label: '预警信息',
+          key: 'alertInfo'
         },
         {
           label: '预警时间',
-          key: 'userName'
+          key: 'eventTime'
         }
       ],
       columns2: [
         {
           label: '停车场',
-          key: 'resourceName'
+          key: 'carParkName'
         },
         {
           label: '泊位号',
-          key: 'resourceType'
+          key: 'orderNo'
         },
         {
           label: '泊车状态',
-          key: 'userName'
+          key: 'parkingStatus'
         }
       ],
       tableData: [],
+      tableData2: [],
       total: 0,
-      pageSize: 10,
+      pageSize: 5,
       pageNum: 1,
       total2: 0,
-      pageSize2: 10,
+      pageSize2: 5,
       pageNum2: 1,
     }
   },
   mounted() {
+    this.getTableData()
+    this.getTableData2()
     this.parkMonitorStat()
   },
   watch: {
   },
   methods: {
+    getTableData() {
+      const {pageNum, pageSize} = this
+      api.llyjListByPage({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
+        this.total = res.data.total || 0
+      })
+    },
+    getTableData2() {
+      const {pageNum2, pageSize2} = this
+      api.bwtcskListByPage({current: pageNum2, size: pageSize2}).then(res => {
+        this.tableData2 = res.data.records || []
+        this.total2 = res.data.total || 0
+      })
+    },
+    handlePageChange() {
+      this.getTableData()
+    },
+    handlePageChange2() {
+      this.getTableData2()
+    },
     parkMonitorStat(){
       api.parkMonitorStat().then(res =>{
         this.modelData = res.data || []

src/pages/index/components/parking_area.vue

@@ -29,7 +29,7 @@
           :left="40"
           :legendTop="0"
           yAxisName="(%)"
-          :dataset="linedata1"
+          :dataset="linedata"
           :tooltipFormat="lineTooltipFormat1"
           :encode="[
               { x: 'month', y: 'lastAmount', seriesName: '饱和度',bool:'true' },
@@ -51,6 +51,7 @@ import linechart from "@/components/lineChart";
 import barchart from "@/components/barChart";
 import * as echarts from 'echarts';
 import * as geoJson from '../../../util/411100.json';
+import api from '@/api/article_z'
 
 
 export default {
@@ -103,41 +104,45 @@ export default {
           data: []
         }]
       },
-      linedata1: [{month: '00:00', lastAmount: 68}, {month: '01:30', lastAmount:71}
-        , {month: '02:30', lastAmount:83}, {month: '03:30', lastAmount:87}, {month: '04:30', lastAmount:75}
-        , {month: '05:30', lastAmount:69}, {month: '06:30', lastAmount:59}],
-      bardata: [{month: '郾城区', cs: 80},{month: '临颍县', cs: 71}
-        ,{month: '舞阳县', cs:63},{month: '源汇区', cs:85},{month: '召陵区', cs:90},],
+      linedata: [],
+      bardata: [],
     }
   },
   mounted() {
-    let data = [
-      ["114.00647", "33.55627", 9034],
-      ["114.00694", "33.58723", 5803],
-      ["113.59848", "33.43243", 5508],
-      ["114.09399", "33.58601", 1200],
-      ["113.93661", "33.81123", 4000]
-    ]
-    let areaData = [];
-    data.map(item => { //扩大热力图效果
-      areaData.push(...new Array(3).fill(item))
-    })
-    let mapMax = Math.max(...data.map(item => item[2]))
-    let mapMin = Math.min(...data.map(item => item[2]))
-    let chart = echarts.init(document.getElementById("map"));
-    echarts.registerMap("luohe", geoJson);
+    this.getBarData()
+    this.getLineData()
+    api.queryParkingArea_Tcrdskfb().then(res => {
+      let data = res.data || []
+      let areaData = [];
+      data.map(item => { //扩大热力图效果
+        areaData.push(...new Array(3).fill(item))
+      })
+      let mapMax = Math.max(...data.map(item => item[2]))
+      let mapMin = Math.min(...data.map(item => item[2]))
+      let chart = echarts.init(document.getElementById("map"));
+      echarts.registerMap("luohe", geoJson);
 
-    // echarts.registerMap('china', china)
-    this.option.series[0].data = areaData;
-    this.option.visualMap.min = mapMin;
-    this.option.visualMap.max = mapMax;
-    chart.setOption(this.option);
+      // echarts.registerMap('china', china)
+      this.option.series[0].data = areaData;
+      this.option.visualMap.min = mapMin;
+      this.option.visualMap.max = mapMax;
+      chart.setOption(this.option);
+    })
   },
   watch: {
 
   },
   methods: {
-
+    getBarData() {
+      api.queryParkingArea_qybhd().then(res => {
+        this.bardata = res.data || []
+      })
+    },
+    getLineData() {
+      api.queryParkingArea_bhdsdfx().then(res => {
+        this.linedata = res.data || []
+      })
+    },
     lineTooltipFormat1(params) {
       const data = params[0].data;
       return `<div class="line-tooltip">

src/pages/index/components/parking_fee.vue

@@ -24,14 +24,14 @@
     <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-column label="操作" width="150">
-        <template slot-scope="scope" style="display: inline-block">
-          <el-button type="primary" @click="handleAudit(scope.row)" slot="reference">修改</el-button>
-          <el-popconfirm title="确定删除吗？" @confirm="deleteRow(scope.row)">
-            <el-button type="danger" slot="reference">删除</el-button>
-          </el-popconfirm>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" width="150">-->
+<!--        <template slot-scope="scope" style="display: inline-block">-->
+<!--          <el-button type="primary" @click="handleAudit(scope.row)" slot="reference">修改</el-button>-->
+<!--          <el-popconfirm title="确定删除吗？" @confirm="deleteRow(scope.row)">-->
+<!--            <el-button type="danger" slot="reference">删除</el-button>-->
+<!--          </el-popconfirm>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <div class="table-pagination">
       <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
@@ -73,7 +73,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
+<!--            <el-button type="primary" @click="handleConfirm">确 定</el-button>-->
         </span>
     </el-dialog>
   </div>
@@ -87,47 +87,50 @@ export default {
     return {
       columns: [
         {
-          label: '停车路段',
-          key: 'parkRoad'
+          label: '停车场',
+          key: 'carParkName'
+        },
+        {
+          label: '停车场位置',
+          key: 'carParkAddress'
         },
         {
-          label: '停车位置',
-          key: 'parkStall'
+          label: '车位号',
+          key: 'parkingNo'
         },
         {
           label: '车牌号',
-          key: 'plateCode'
+          key: 'plateNo'
         },
         {
           label: '车牌类型',
-          key: 'plateType'
+          key: 'type'
         },
         {
-          label: '停车时间',
-          key: 'parkTime'
+          label: '入场时间',
+          key: 'inTime'
         },
         {
-          label: '离开时间',
-          key: 'leaveTime'
+          label: '通道名称',
+          key: 'laneName'
         },
         {
-          label: '修改人',
-          key: 'revisePerson'
+          label: '上传时间',
+          key: 'createTime'
         },
-        {
-          label: '修改时间',
-          key: 'reviseTime'
-        }
+        // {
+        //   label: '修改人',
+        //   key: 'updateUser'
+        // },
+        // {
+        //   label: '修改时间',
+        //   key: 'updateTime'
+        // }
       ],
-      tableData: [{"parkRoad":'老街街道',"parkStall":'路边',"plateCode":'豫L0Q985',"plateType":'本地车',"parkTime":'2023-12-31 08:30:00',"leaveTime":'2024-12-31 10:15:00',"revisePerson":'无',"reviseTime":'',}
-        ,{"parkRoad":'马路街街道',"parkStall":'过道口',"plateCode":'豫A71XL1',"plateType":'本地车',"parkTime":'2023-12-31 09:35:00',"leaveTime":'2023-12-31 11:25:00',"revisePerson":'无',"reviseTime":'',}
-        ,{"parkRoad":'顺河街街道',"parkStall":'十字路口',"plateCode":'浙GJG272',"plateType":'外地车',"parkTime":'2023-12-31 14:52:00',"leaveTime":'2023-12-31 14:15:00',"revisePerson":'无',"reviseTime":'',}],
+      tableData: [],
       total: 3,
       pageSize: 10,
       pageNum: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
       searchWords: undefined,
       formInline: {
         searchTime: '',
@@ -175,36 +178,27 @@ export default {
       console.log('enter handle cancel apply')
     },
     handleConfirm() {
-      api.applyResource({id, applyType: this.formLabelAlign.parkRoad}).then(res => {
-        if(res.success) {
-          this.dialogVisible = false
-          this.$message({
-            message: '审核成功!',
-            type: 'success'
-          })
-          this.getTableData()
-        }
-      })
+      // api.tcsfztListByPage({id, applyType: this.formLabelAlign.parkRoad}).then(res => {
+      //   if(res.success) {
+      //     this.dialogVisible = false
+      //     this.$message({
+      //       message: '审核成功!',
+      //       type: 'success'
+      //     })
+      //     this.getTableData()
+      //   }
+      // })
     },
     onSubmit () {
       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)
-        })
+      const {pageNum, pageSize} = this
+      api.tcsfztListByPage({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
         this.total = res.data.total
       })
-    },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
-    },
+    }
   }
 }
 </script>

src/pages/index/components/parking_lot_situation.vue

@@ -6,21 +6,21 @@
     <br>
     <div style="display: flex;justify-content: space-around;">
       <div style="width: 25%;display: flex;">
-      <h4 class="h4font" data="tableData">泊位数量：</h4><h3 class="h4font" data="tableData2">5</h3>
+      <h4 class="h4font">泊位数量：</h4><h3 class="h4font">{{viewData.totalParkingNumber}}</h3>
       </div>
       <div style="width: 25%;display: flex;">
-        <h4 class="h4font" data="tableData3">实时余位：</h4><h3 class="h4font" data="tableData4">5</h3>
+        <h4 class="h4font">实时余位：</h4><h3 class="h4font">{{viewData.remainParkingNumber}}</h3>
       </div>
       <div style="width: 25%;display: flex;">
-        <h4 class="h4font" data="tableData5">实时进场：</h4><h3 class="h4font" data="tableData6">5</h3>
+        <h4 class="h4font">实时进场：</h4><h3 class="h4font">{{viewData.inNumber}}</h3>
       </div>
       <div style="width: 25%;display: flex;">
-        <h4 class="h4font" data="tableData5">实时出场：</h4><h3 class="h4font" data="tableData6">5</h3>
+        <h4 class="h4font">实时出场：</h4><h3 class="h4font">{{viewData.outNumber}}</h3>
       </div>
     </div>
     <br>
     <br>
-    <el-table :data="tableData7" style="background: #2a2a2a;border-color: #333;">
+    <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>
@@ -46,53 +46,37 @@ export default {
     return {
       columns: [
         {
-          label: '编号',
-          key: 'resourceName'
+          label: '停车场ID',
+          key: 'parkId'
         },
         {
-          label: '停车场',
-          key: 'resourceType'
+          label: '停车场名称',
+          key: 'carParkName'
         },
         {
-          label: '泊位',
-          key: 'resourceType'
+          label: '总泊位',
+          key: 'totalParkingNumber'
         },
         {
-          label: '余位',
-          key: 'resourceType'
+          label: '空余泊位',
+          key: 'remainParkingNumber'
         }
       ],
       tableData: [],
-      tableData2: [],
-      tableData3: [],
-      tableData4: [],
-      tableData5: [],
-      tableData6: [],
-      tableData7: [],
       total: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
-      total5: 0,
-      total6: 0,
-      total7: 0,
       pageSize: 10,
       pageNum: 1,
-      radio: '2',
-      dialogVisible: false,
-      selRow: {},
-      searchWords: undefined,
-      searchWords2: undefined,
+      viewData: {
+        outNumber: "0",
+        inNumber: "0",
+        totalParkingNumber: "0",
+        remainParkingNumber: "0"
+      }
     }
   },
   mounted() {
     this.getTableData()
-    this.getTableData2()
-    this.getTableData3()
-    this.getTableData4()
-    this.getTableData5()
-    this.getTableData6()
-    this.getTableData7()
+    this.getView()
   },
   watch: {
   },
@@ -100,90 +84,17 @@ export default {
     handlePageChange() {
       this.getTableData()
     },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
-    handleConfirm() {
-      const {id} = this.selRow
-      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
-      })
-    },
-    getTableData2() {
-      api.applyList({}).then(res => {
-        this.tableData2 =  res.data.data
-        this.total2 = res.data.total
-      })
-    },
-    getTableData3() {
-      api.applyList({}).then(res => {
-        this.tableData3 =  res.data.data
-        this.total3 = res.data.total
-      })
-    },
-    getTableData4() {
-      api.applyList({}).then(res => {
-        this.tableData4 =  res.data.data
-        this.total4 = res.data.total
+      const {pageNum, pageSize} = this
+      api.tccqkListByPage({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
+        this.total = res.data.total || 0
       })
     },
-    getTableData5() {
-      api.applyList({}).then(res => {
-        this.tableData5 =  res.data.data
-        this.total5 = res.data.total
+    getView() {
+      api.tccqkView().then(res => {
+        this.viewData = res.data
       })
-    },
-    getTableData6() {
-      api.applyList({}).then(res => {
-        this.tableData6 =  res.data.data
-        this.total6 = res.data.total
-      })
-    },
-    getTableData7() {
-      api.applyList({}).then(res => {
-        this.tableData7 =  res.data.data
-        this.total7 = res.data.total
-      })
-    },
-
-
-    getApplyTypeText(val) {
-      if (!val){
-        return '未申请'
-      }
-      const textMap = {
-        1: '待审批',
-        2: '审批通过',
-        3: '审批驳回'
-      }
-      return textMap[val]
-    },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
     }
   }
 }

src/pages/index/components/record_query.vue

@@ -6,12 +6,12 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车牌号">
-                <el-input v-model="formInline1.parkName" placeholder="请输入"></el-input>
+                <el-input v-model="formInline1.plateNo" 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-button type="primary" class="query-btn" @click="onSubmit1">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -31,12 +31,12 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车牌号">
-                <el-input v-model="formInline2.carNo" placeholder="请输入"></el-input>
+                <el-input v-model="formInline2.plateNo" 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-button type="primary" class="query-btn" @click="onSubmit2">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,12 +56,12 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车牌号">
-                <el-input v-model="formInline3.parkName" placeholder="请输入"></el-input>
+                <el-input v-model="formInline3.plateNo" 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-button type="primary" class="query-btn" @click="onSubmit3">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -88,6 +88,7 @@
 </template>
 <script>
 import api from "@/api/audit.js";
+import dictionary from "@/util/dictionary";
 
 export default {
     components: {},
@@ -95,25 +96,17 @@ export default {
       return {
         activeName: '停车记录查询',
         columns1: [
-          {
-            label: '停车场',
-            key: 'resourceName'
-          },
           {
             label: '车牌号',
-            key: 'resourceType'
-          },
-          {
-            label: '泊位号',
-            key: 'userName'
+            key: 'plateNo'
           },
           {
-            label: '入场时间',
-            key: 'applyTypeText'
+            label: '车辆类型',
+            key: 'carType'
           },
           {
-            label: '出场时间',
-            key: 'applyTypeText'
+            label: '车辆大小',
+            key: 'carTypeName'
           }
         ],
         tableData1: [],
@@ -121,16 +114,24 @@ export default {
         pageSize1: 10,
         pageNum1: 1,
         formInline1: {
-          carNo: ''
+          plateNo: ''
         },
         columns2: [
           {
             label: '车牌号',
-            key: 'resourceName'
+            key: 'plateNo'
           },
           {
-            label: '车型',
-            key: 'resourceType'
+            label: '停车场',
+            key: 'carParkName'
+          },
+          {
+            label: '行为',
+            key: 'behavior'
+          },
+          {
+            label: '时间',
+            key: 'behaviorTime'
           }
         ],
         tableData2: [],
@@ -138,20 +139,28 @@ export default {
         pageSize2: 10,
         pageNum2: 1,
         formInline2: {
-          carNo: ''
+          plateNo: ''
         },
         columns3: [
           {
             label: '车牌号',
-            key: 'resourceName'
+            key: 'plateNo'
+          },
+          {
+            label: '停车场',
+            key: 'carParkName'
           },
           {
-            label: '地点',
-            key: 'resourceType'
+            label: '泊位号',
+            key: 'parkingNo'
           },
           {
-            label: '行为',
-            key: 'userName'
+            label: '入场时间',
+            key: 'inTime'
+          },
+          {
+            label: '出场时间',
+            key: 'outTime'
           }
         ],
         tableData3: [],
@@ -159,35 +168,120 @@ export default {
         pageSize3: 10,
         pageNum3: 1,
         formInline3: {
-          carNo: ''
+          plateNo: ''
         }
       }
     },
     mounted() {
       this.getTableData1()
+      this.getTableData2()
+      this.getTableData3()
     },
     watch: {
     },
     methods: {
+      onSubmit1() {
+        this.pageNum1 = 1
+        this.getTableData1()
+      },
+      onSubmit2() {
+        this.pageNum2 = 1
+        this.getTableData2()
+      },
+      onSubmit3() {
+        this.pageNum3 = 1
+        this.getTableData3()
+      },
       handlePageChange1() {
         this.getTableData1()
       },
       getTableData1() {
-        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 {pageNum1, pageSize1} = this
+        api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+          this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.carTypeMap[item.carType]}))
+          this.total1 = res.data.total
+        })
+      },
+      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
+        })
+      },
+      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>
 <style  lang="scss" scoped>
+
+.form-wrapper {
+  margin-bottom: 20px;
+}
+/deep/ .el-input__inner {
+  background: #2d3744;
+  border: none;
+  border-radius: 0;
+}
+/deep/ .el-select {
+  height: 40px;
+  .el-input__inner {
+    height: 40px;
+  }
+  .el-input__prefix, .el-input__suffix {
+    height: 40px;
+  }
+
+  /* 下面设置右侧按钮居中 */
+  .el-input__suffix {
+    top: 0px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    align-content: flex-start;
+  }
+  /* 输入框加上上下边是 32px + 2px =34px */
+  .el-input__icon {
+    line-height: 0px;
+  }
+}
+/deep/ .form-wrapper .el-button {
+  background: linear-gradient(90deg,#0158d9,#3c97e4);
+  width: 100px;
+  height: 40px;
+}
+.body-wrapper {
+  padding: 20px;
+  background: #0c0c0c;
+  .button-block{
+    text-align: right;
+    margin-bottom: 20px;
+  }
+  .table-pagination{
+    text-align: right;
+  }
+  .search-card{
+    margin-bottom: 20px;
+    text-align: center;
+    .input-wrapper{
+      width: 36%;
+    }
+  }
+}
 .body-wrapper {
   width: 100%;
   padding: 20px;

src/pages/index/components/saturation_warning.vue

@@ -4,6 +4,7 @@
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-form-item label="区县:">
         <el-select v-model="formInline.region0" placeholder="区县" popper-class="cur-select">
+          <el-option label="全部" value=""></el-option>
           <el-option label="源汇区" value="源汇区"></el-option>
           <el-option label="郾城区" value="郾城区"></el-option>
           <el-option label="召陵区" value="召陵区"></el-option>
@@ -90,23 +91,16 @@ export default {
       linedata: [],
       columns: [
         {
-          label: '街道名称',
-          key: 'jd'
+          label: '停车场位置',
+          key: 'carParkAddress'
         },
         {
           label: '剩余停车位',
-          key: 'sy'
+          key: 'remainParkingNumber'
         }
       ],
-      tableData: [{"jd": '老街街道',"sy": 30}
-        ,{"jd":'马路街街道',"sy": 70}
-        ,{"jd":'顺河街街道',"sy": 80}
-        ,{"jd":'干河陈街道',"sy": 30}
-        ,{"jd":'大刘镇',"sy": 62}
-        ,{"jd":'阴阳赵镇',"sy": 44}
-        ,{"jd":'空冢郭镇',"sy": 30}
-        ,{"jd":'问十乡',"sy": 97}],
-      total: 3,
+      tableData: [],
+      total: 0,
       pageSize: 10,
       pageNum: 1,
       radio: '2',
@@ -131,15 +125,10 @@ export default {
     },
     getTableData() {
       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
-      // })
+      api.wghtcbhyj({current: pageNum, size: pageSize}).then(res => {
+        this.tableData = res.data.records || []
+        this.total = res.data.total
+      })
     },
     lineTooltipFormat(params) {
       const data = params[0].data;

src/pages/index/components/service_subscription_function.vue

@@ -26,9 +26,12 @@
         label="操作"
         width="100">
         <template slot-scope="scope" style="display: inline-block">
-          <el-popconfirm title="确定订阅吗？" @confirm="subscribeRow(scope.row)">
+          <el-popconfirm  v-if="scope.row.subStatusName === '未订阅'" title="确定订阅吗？" @confirm="subscribeRow(scope.row)">
             <el-button type="success" slot="reference">订阅</el-button>
           </el-popconfirm>
+          <el-popconfirm v-if="scope.row.subStatusName === '已订阅'" title="确定取消订阅吗？" @confirm="unsubscribeRow(scope.row)">
+            <el-button type="success" slot="reference">取消订阅</el-button>
+          </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
@@ -48,12 +51,12 @@ export default {
       return {
         columns: [
           {
-            label: '服务名称',
-            key: 'resourceName'
+            label: '接口名称',
+            key: 'interfaceName'
           },
           {
-            label: '状态',
-            key: 'applyTypeText'
+            label: '订阅状态',
+            key: 'subStatusName'
           }
         ],
         tableData: [],
@@ -89,7 +92,7 @@ export default {
         })
       },
       unsubscribeRow (record) {
-        api.subscription({id: record.id}).then(res => {
+        api.unsubscription({id: record.id}).then(res => {
           if (res.code === 200) {
             this.$message({type: 'success', message: '取消订阅成功!'})
             this.getTableData()
@@ -100,11 +103,11 @@ export default {
         this.getTableData()
       },
       getTableData() {
-        const {pageNum, pageSize, formInline} = this
-        // api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
-        //   this.tableData = res.data.records || []
-        //   this.total = res.data.total
-        // })
+        const {pageNum, pageSize} = this
+        api.subscriptionListByPage({current: pageNum, size: pageSize}).then(res => {
+          this.tableData = res.data.records || []
+          this.total = res.data.total
+        })
       }
     }
 }

src/pages/index/components/track_map.vue

@@ -13,6 +13,7 @@
 <script>
 import * as echarts from 'echarts'
 import * as geoJson from '../../../util/411100.json'
+import api from '@/api/audit'
 export default {
   name: "chinaLineMap",
   data: function () {
@@ -54,305 +55,197 @@ export default {
     },
     //加载中国飞线地图
     loadChinaLineMap() {
-      echarts.registerMap('河南', geoJson);
-      var myCharts = echarts.init(document.getElementById('ChinaLineMap'));
-      var geoCoordMap = {
-        '源汇区': [114.00647,33.55627],
-        '郾城区': [114.00694,33.58723],
-        '召陵区': [114.09399,33.58601],
-        '舞阳县': [113.59848,33.43243],
-        '临颍县': [113.93661,33.81123]
-      };
-      var chinaDatas = [
-        [{
-          name: '源汇区',
-          value: 0
-        }, {
-          name: '郾城区',
-          value: 20
-        }], [{
-          name: '郾城区',
-          value: 0
-        }, {
-          name: '召陵区',
-          value: 20
-        }], [{
-          name: '召陵区',
-          value: 0
-        }, {
-          name: '郾城区',
-          value: 20
-        }], [{
-          name: '舞阳县',
-          value: 1
-        }, {
-          name: '郾城区',
-          value: 20
-        }], [{
-          name: '临颍县',
-          value: 2
-        }, {
-          name: '郾城区',
-          value: 20
-        }]
-      ];
-      var convertData = function (data) {
-        var res = [];
-        for (var i = 0; i < data.length; i++) {
-          var dataItem = data[i];
-          var fromCoord = geoCoordMap[dataItem[0].name];
-          // var toCoord = [114.026405, 33.575855];
-          var toCoord = geoCoordMap[dataItem[1].name];
-          if (fromCoord && toCoord) {
-            res.push([{
-              coord: fromCoord,
-              value: dataItem[0].value
-            }, {
-              coord: toCoord,
-            }]);
+      api.clqx().then(res => {
+        echarts.registerMap('漯河', geoJson);
+        var myCharts = echarts.init(document.getElementById('ChinaLineMap'));
+        var geoCoordMap = res.data.geoCoordMap || {};
+        var chinaDatas = (res.data.chinaDatas || []).map(item => ([{name: item.from, value: item.value}, {name: item.to, value: 0}]));
+        var convertData = function (data) {
+          var res = [];
+          for (var i = 0; i < data.length; i++) {
+            var dataItem = data[i];
+            var fromCoord = geoCoordMap[dataItem[0].name];
+            // var toCoord = [114.026405, 33.575855];
+            var toCoord = geoCoordMap[dataItem[1].name];
+            if (fromCoord && toCoord) {
+              res.push([{
+                coord: fromCoord,
+                value: dataItem[0].value
+              }, {
+                coord: toCoord,
+              }]);
+            }
           }
-        }
-        return res;
-      };
-      //飞线数据
-      var chinaData = [
-        //[{name: '上海'}, {name: '江苏'}],
-        //[{name: '北京'}, {name: '江苏'}],
-        //[{name: '新疆'}, {name: '江苏'}],
-        //[{name: '西藏'}, {name: '江苏'}]
-      ];
-      //获取飞线数据
-      // var res = [
-      //   {
-      //     "name": "安徽",
-      //     "value": 6114
-      //   },
-      //   {
-      //     "name": "浙江",
-      //     "value": 4341
-      //   },
-      //   {
-      //     "name": "上海",
-      //     "value": 3600
-      //   },
-      //   {
-      //     "name": "四川",
-      //     "value": 2980
-      //   },
-      //   {
-      //     "name": "河南",
-      //     "value": 2504
-      //   },
-      //   {
-      //     "name": "山东",
-      //     "value": 1590
-      //   },
-      //   {
-      //     "name": "湖南",
-      //     "value": 1163
-      //   },
-      //   {
-      //     "name": "江西",
-      //     "value": 1108
-      //   },
-      //   {
-      //     "name": "广东",
-      //     "value": 1100
-      //   },
-      //   {
-      //     "name": "重庆",
-      //     "value": 838
-      //   },
-      //   {
-      //     "name": "河北",
-      //     "value": 534
-      //   },
-      //   {
-      //     "name": "北京",
-      //     "value": 473
-      //   }
-      //
-      // ]
-      // res.forEach(function (item) {
-      //   newarray.push(item.value);
-      //   var array = [];
-      //   var o = {};
-      //   var o1 = {};
-      //   o.name = item.name;
-      //   o1.name = '江苏';
-      //   o.value = item.value;
-      //   array.push(o);
-      //   array.push(o1);
-      //   chinaData.push(array);
-      // });
-      var series = [];
-      [['漯河市', chinaDatas]].forEach(function (item, i) {
-        console.log(item)
-        series.push({
-            type: 'lines',
-            zlevel: 2,
-            effect: {
-              show: true,
-              period: 4, //箭头指向速度，值越小速度越快
-              trailLength: 0.02, //特效尾迹长度[0,1]值越大，尾迹越长重
-              symbol: 'arrow', //箭头图标
-              symbolSize: 5, //图标大小
-            },
-            lineStyle: {
-              normal: {
-                color:'#EE5652',
-                width: 1, //尾迹线条宽度
-                opacity: 1, //尾迹线条透明度
-                curveness: .3 //尾迹线条曲直度
-              }
-            },
-            data: convertData(item[1])
-          }, {
-            type: 'effectScatter',
-            coordinateSystem: 'geo',
-            zlevel: 2,
-            rippleEffect: { //涟漪特效
-              period: 4, //动画时间，值越小速度越快
-              brushType: 'stroke', //波纹绘制方式 stroke, fill
-              scale: 4 //波纹圆环最大限制，值越大波纹越大
-            },
-            label: {
-              normal: {
+          return res;
+        };
+        var series = [];
+        [['漯河市', chinaDatas]].forEach(function (item, i) {
+          console.log(item)
+          series.push({
+              type: 'lines',
+              zlevel: 2,
+              effect: {
                 show: true,
-                position: 'right', //显示位置
-                offset: [5, 0], //偏移设置
-                formatter: function (params) {//圆环显示文字
-                  return params.data.name;
+                period: 4, //箭头指向速度，值越小速度越快
+                trailLength: 0.02, //特效尾迹长度[0,1]值越大，尾迹越长重
+                symbol: 'arrow', //箭头图标
+                symbolSize: 5, //图标大小
+              },
+              lineStyle: {
+                normal: {
+                  color:'#EE5652',
+                  width: 1, //尾迹线条宽度
+                  opacity: 1, //尾迹线条透明度
+                  curveness: .3 //尾迹线条曲直度
+                }
+              },
+              data: convertData(item[1])
+            }, {
+              type: 'effectScatter',
+              coordinateSystem: 'geo',
+              zlevel: 2,
+              rippleEffect: { //涟漪特效
+                period: 4, //动画时间，值越小速度越快
+                brushType: 'stroke', //波纹绘制方式 stroke, fill
+                scale: 4 //波纹圆环最大限制，值越大波纹越大
+              },
+              label: {
+                normal: {
+                  show: false,
+                  position: 'right', //显示位置
+                  offset: [5, 0], //偏移设置
+                  formatter: function (params) {//圆环显示文字
+                    return params.data.name;
+                  },
+                  color:'#FFD200',
+                  fontSize: 16
                 },
-                color:'#FFD200',
-                fontSize: 16
+                emphasis: {
+                  show: true
+                }
               },
-              emphasis: {
-                show: true
-              }
+              symbol: 'circle',
+              // symbolSize: function (val) {
+              // 	return 5 + val[2] * 5; //圆环大小
+              // },
+              itemStyle: {
+                normal: {
+                  show: true,
+                  color: '#ffffff'
+                }
+              },
+              data: item[1].map(function (dataItem) {
+                return {
+                  name: dataItem[0].name,
+                  value: geoCoordMap[dataItem[0].name].concat([dataItem[0].value])
+                };
+              }),
             },
-            symbol: 'circle',
-            // symbolSize: function (val) {
-            // 	return 5 + val[2] * 5; //圆环大小
+          );
+        });
+        let option = {
+          backgroundColor: "#cccccc33",
+          geo: [
+            // {
+            //   map: '河南',
+            //   aspectScale: 0.9,
+            //   roam: false, // 是否允许缩放
+            //   zoom: 1.2, // 默认显示级别
+            //   layoutSize: '95%',
+            //   layoutCenter: ['55%', '50%'],
+            //   itemStyle: {
+            //     normal: {
+            //       areaColor: {
+            //         type: 'linear-gradient',
+            //         x: 0,
+            //         y: 400,
+            //         x2: 0,
+            //         y2: 0,
+            //         colorStops: [{
+            //           offset: 0,
+            //           color: 'rgba(37,108,190,0.3)' // 0% 处的颜色
+            //         }, {
+            //           offset: 1,
+            //           color: 'rgba(15,169,195,0.3)' // 50% 处的颜色
+            //         }],
+            //         global: true // 缺省为 false
+            //       },
+            //       borderColor: '#4ecee6',
+            //       borderWidth: 1
+            //     },
+            //     emphasis: {
+            //       areaColor: {
+            //         type: 'linear-gradient',
+            //         x: 0,
+            //         y: 300,
+            //         x2: 0,
+            //         y2: 0,
+            //         // colorStops: [{
+            //         //   offset: 0,
+            //         //   color: 'rgba(37,108,190,1)' // 0% 处的颜色
+            //         // }, {
+            //         //   offset: 1,
+            //         //   color: 'rgba(15,169,195,1)' // 50% 处的颜色
+            //         // }],
+            //         global: false // 缺省为 false
+            //       },
+            //     }
+            //   },
+            //   emphasis: {
+            //     itemStyle: {
+            //       areaColor: '#0160AD'
+            //     },
+            //     label: {
+            //       show: 0,
+            //       color: 'transparent'
+            //     }
+            //   },
+            //   zlevel: 3
             // },
-            itemStyle: {
-              normal: {
-                show: true,
-                color: '#ffffff'
-              }
-            },
-            data: item[1].map(function (dataItem) {
-              return {
-                name: dataItem[0].name,
-                value: geoCoordMap[dataItem[0].name].concat([dataItem[0].value])
-              };
-            }),
-          },
-        );
-      });
-      let option = {
-        backgroundColor: "#cccccc33",
-        geo: [
-          // {
-          //   map: '河南',
-          //   aspectScale: 0.9,
-          //   roam: false, // 是否允许缩放
-          //   zoom: 1.2, // 默认显示级别
-          //   layoutSize: '95%',
-          //   layoutCenter: ['55%', '50%'],
-          //   itemStyle: {
-          //     normal: {
-          //       areaColor: {
-          //         type: 'linear-gradient',
-          //         x: 0,
-          //         y: 400,
-          //         x2: 0,
-          //         y2: 0,
-          //         colorStops: [{
-          //           offset: 0,
-          //           color: 'rgba(37,108,190,0.3)' // 0% 处的颜色
-          //         }, {
-          //           offset: 1,
-          //           color: 'rgba(15,169,195,0.3)' // 50% 处的颜色
-          //         }],
-          //         global: true // 缺省为 false
-          //       },
-          //       borderColor: '#4ecee6',
-          //       borderWidth: 1
-          //     },
-          //     emphasis: {
-          //       areaColor: {
-          //         type: 'linear-gradient',
-          //         x: 0,
-          //         y: 300,
-          //         x2: 0,
-          //         y2: 0,
-          //         // colorStops: [{
-          //         //   offset: 0,
-          //         //   color: 'rgba(37,108,190,1)' // 0% 处的颜色
-          //         // }, {
-          //         //   offset: 1,
-          //         //   color: 'rgba(15,169,195,1)' // 50% 处的颜色
-          //         // }],
-          //         global: false // 缺省为 false
-          //       },
-          //     }
-          //   },
-          //   emphasis: {
-          //     itemStyle: {
-          //       areaColor: '#0160AD'
-          //     },
-          //     label: {
-          //       show: 0,
-          //       color: 'transparent'
-          //     }
-          //   },
-          //   zlevel: 3
-          // },
-          // {
-          //   map: '漯河',
-          //   aspectScale: 0.9,
-          //   roam: false, // 是否允许缩放
-          //   zoom: 1.2, // 默认显示级别
-          //   layoutSize: '95%',
-          //   layoutCenter: ['55%', '50%'],
-          //   itemStyle: {
-          //     normal: {
-          //       borderColor: 'rgba(192,245,249,.6)',
-          //       borderWidth: 2,
-          //       shadowColor: '#2C99F6',
-          //       shadowOffsetY: 0,
-          //       shadowBlur: 120,
-          //       areaColor: 'rgba(29,85,139,.2)'
-          //     }
-          //   },
-          //   zlevel: 2,
-          //   silent: true
-          // },
-          {
-            map: '河南',
-            aspectScale: 1,
-            roam: false, // 是否允许缩放
-            zoom: 1.2, // 默认显示级别
-            layoutSize: '95%',
-            layoutCenter: ['55%', '51.5%'],
-            itemStyle: {
-              areaColor: 'rgba(0,27,95,0.4)',
-              borderColor: '#004db5',
-              borderWidth: 1
-            },
-            zlevel: 1,
-            silent: true
-          }
-        ],
-        series: series
-      };
-      //var max = Math.max.apply(Math, newarray);
-      //option.visualMap.max = max;
-      myCharts.clear();
-      myCharts.setOption(option);
-      // myChart.setOption(option);
-
+            // {
+            //   map: '漯河',
+            //   aspectScale: 0.9,
+            //   roam: false, // 是否允许缩放
+            //   zoom: 1.2, // 默认显示级别
+            //   layoutSize: '95%',
+            //   layoutCenter: ['55%', '50%'],
+            //   itemStyle: {
+            //     normal: {
+            //       borderColor: 'rgba(192,245,249,.6)',
+            //       borderWidth: 2,
+            //       shadowColor: '#2C99F6',
+            //       shadowOffsetY: 0,
+            //       shadowBlur: 120,
+            //       areaColor: 'rgba(29,85,139,.2)'
+            //     }
+            //   },
+            //   zlevel: 2,
+            //   silent: true
+            // },
+            {
+              map: '漯河',
+              aspectScale: 1,
+              roam: true, // 是否允许缩放
+              zoom: 1.2, // 默认显示级别
+              layoutSize: '95%',
+              layoutCenter: ['55%', '51.5%'],
+              itemStyle: {
+                areaColor: 'rgba(0,27,95,0.4)',
+                borderColor: '#004db5',
+                borderWidth: 1
+              },
+              zlevel: 1,
+              silent: true
+            }
+          ],
+          series: series
+        };
+        //var max = Math.max.apply(Math, newarray);
+        //option.visualMap.max = max;
+        myCharts.clear();
+        myCharts.setOption(option);
+        // myChart.setOption(option);
+      })
     }
   }
 }

src/util/dictionary.js

@@ -0,0 +1,9 @@
+export default {
+  carTypeMap:  {
+    0: '临时车',
+    1: '月卡车',
+    2: '预约车',
+    3: '无感代扣',
+    99: '其它'
+  }
+}