接口联调

src/api/audit.js

@@ -1,6 +1,15 @@
 import axios from "@/util/ajax";
 
 export default {
+  // 停车饱和预警-饱和度
+  tcbhyj(params) {
+    return axios.post('/dash/saturation/warning/stat1', params)
+  },
+  // todo 停车饱和预警-网格化停车饱和预警
+  wghtcbhyj(params) {
+    return axios.post('/dash/saturation/warning/page', params)
+  },
+  // todo 车辆迁徙分析
   // 停车缺口分析-停车缺口分析
   tcqkfx(params) {
     return axios.post('/dash/gap/analysis/stat1', params)
@@ -9,13 +18,13 @@ export default {
   tcqkbhqs(params) {
     return axios.post('/dash/gap/analysis/stat2', params)
   },
-  // 停车饱和预警-饱和度
-  tcbhyj(params) {
-    return axios.post('/dash/saturation/warning/stat1', params)
+  // todo 停车难易指数-地图难易指数
+  dtnyzs(params) {
+    return axios.post('/dash/park/easy/stat', params)
   },
-  // todo 停车饱和预警-网格化停车饱和预警
-  wghtcbhyj(params) {
-    return axios.post('/dash/saturation/warning/page', params)
+  // todo 停车难易指数-折线图
+  zxt(params) {
+    return axios.post('/dash/park/easy/page', params)
   },
   // 全局停车诱导-地图难易指数
   nyzs(params) {
@@ -25,6 +34,15 @@ export default {
   nyzstj(params) {
     return axios.post('/dash/park/guidance/page', 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)
+  },
   // 其他分析-区域分析
   qyfx(params) {
     return axios.post('/dash/other/analyse/stat1', params)
@@ -45,7 +63,7 @@ export default {
   ywfx(params) {
     return axios.post('/dash/other/analyse/stat4', params)
   },
-  // 其他分析-停车热点分析
+  // todo 其他分析-停车热点分析
   tcrdfx(params) {
     return axios.post('/dash/other/analyse/stat5', params)
   },
@@ -57,14 +75,82 @@ export default {
   dlyltcc(params) {
     return axios.post('/dash/other/analyse/stat7', params)
   },
-  // 其他分析-高峰路线分析
+  // todo 其他分析-高峰路线分析
   gflxfx(params) {
     return axios.post('/dash/other/analyse/stat8', params)
   },
-  // 其他分析-重点车辆进厂占比
+  // 其他分析-重点车辆进场占比
   zdcljcfx(params) {
     return axios.post('/dash/other/analyse/stat9', params)
   },
+  // todo 服务发布
+  serviceListByPage(params) {
+    return axios.get('/dash/service/publish/page', {params})
+  },
+  servicePublic(params) {
+    return axios.post('/dash/service/publish/publish', params)
+  },
+  serviceSave(params) {
+    return axios.post('/dash/service/publish/save', params)
+  },
+  // todo 公告功能
+  announcementListByPage(params) {
+    return axios.get('/dash/announcement/function/page', {params})
+  },
+  announcementPublic(params) {
+    return axios.post('/dash/announcement/function/publish', params)
+  },
+  announcementSave(params) {
+    return axios.post('/dash/announcement/function/save', params)
+  },
+  // todo 消息中心
+  messageListByPage(params) {
+    return axios.post('/dash/message/page', {params})
+  },
+  // todo 服务监控
+  monitorListByPage(params) {
+    return axios.get('/dash/service/monitor/page', {params})
+  },
+  // todo 凭证管理
+  pzglListByPage(params) {
+    return axios.get('/dash/credential/management/function/page', {params})
+  },
+  deletePz(params) {
+    return axios.post('/dash/credential/management/function/delete', params)
+  },
+  addPz(params) {
+    return axios.post('/dash/credential/management/function/save', params)
+  },
+  // todo 服务订阅
+  subscription(params) {
+    return axios.post('/dash/service/subscription/function/subscription', params)
+  },
+  unsubscription(params) {
+    return axios.post('/dash/service/subscription/function/unsubscription', params)
+  },
+  // IP白名单-列表接口
+  ipListByPage(params) {
+    return axios.get('/dash/ip/white/list/page', {params})
+  },
+  // IP白名单-删除接口
+  deleteWhiteIp(params) {
+    return axios.post('/dash/ip/white/list/delete', params)
+  },
+  // IP白名单-新增接口
+  addWhiteIp(params) {
+    return axios.post('/dash/ip/white/list/save', params)
+  },
+  // todo 服务调用功能
+  fwdy(params) {
+    return axios.post('/dash/service/call/function/call', params)
+  },
+  // todo 操作日志功能
+  czrzListByPage(params) {
+    return axios.get('/dash/operation/log/page', {params})
+  },
+  czrzDetail(params) {
+    return axios.post('/dash/operation/log/detail', params)
+  },
   // 申请列表
   applyList(params) {
     return axios.get('/resourceApply/selectBackedApplyList', {params});

src/assets/css/global.css

@@ -102,3 +102,22 @@ body,
   font-size: 16px;
   color: #BEDAFF;
 }
+
+.bar-tooltip {
+  padding: 10px 20px;
+  background: url("../../../static/img/u231.png");
+  background-size: 100% 100%;
+}
+.line-tooltip {
+  padding: 10px 20px;
+  background: url("../../../static/img/u231.png");
+  background-size: 100% 100%;
+}
+.bar-tooltip-dz {
+  padding: 5px 10px;
+  background: url("../../../static/img/u261.png");
+  background-size: 100% 100%;
+  color: #333;
+  position: absolute;
+  top: 0;
+}

src/pages/index/components/berth_recommend.vue

@@ -11,8 +11,8 @@
         :dataset="linedata"
         :tooltipFormat="lineTooltipFormat"
         :encode="[
-              { x: 'month', y: 'lastYearAmount', seriesName: '预警值',col:'red' },
-              { x: 'month', y: 'thisYearAmount', seriesName: '缺口',bool:'true' },
+              { x: 'mouth', y: 'thisAmount', seriesName: '预警值',col:'red' },
+              { x: 'mouth', y: 'lastAmount', seriesName: '缺口',bool:'true' },
             ]"
         id="sxcyfzqk"
       />
@@ -33,7 +33,7 @@
 </template>
 <script>
 import linechart from "@/components/lineChart";
-// import api from "@/api/article_z";
+import api from "@/api/audit";
 
 export default {
   components: {
@@ -41,9 +41,7 @@ export default {
   },
   data() {
     return {
-      linedata: [{month: '老街街道',lastYearAmount: 30, thisYearAmount: 20}, {month: '马路街街道', lastYearAmount:30, thisYearAmount:50}
-        , {month: '顺河街街道', lastYearAmount:30, thisYearAmount:30}, {month: '干河陈街道', lastYearAmount:30, thisYearAmount:30}
-        , {month: '大刘镇', lastYearAmount:30, thisYearAmount:0}, {month: '阴阳赵镇', lastYearAmount:30, thisYearAmount:0}],
+      linedata: [],
       columns: [
         {
           label: '街道名称',
@@ -75,7 +73,7 @@ export default {
   },
   mounted() {
     this.getTableData()
-    // this.linedataData()
+    this.getLineData()
   },
   watch: {
   },
@@ -84,36 +82,19 @@ export default {
       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>`;
     },
     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 => {
+      api.lnbw({pageNum, pageSize, resourceName: searchWords}).then(res => {
         this.tableData = []
         res.data.records.map((item, index) => {
           const newItem = {...item}
@@ -123,14 +104,11 @@ export default {
         this.total = res.data.total
       })
     },
-    //初始化
-    // linedataData(){
-    //   api.queryBerthContext().then(res=>{
-    //     const lastA=res.data;
-    //     this.linedata=res.data.map(item=>({...item,thisAmount: 30}));
-    //     console.log(res.data)
-    //   })
-    // },
+    getLineData(){
+      api.lntcqk().then(res=>{
+        this.linedata=res.data.map(item=>({...item,thisAmount: 30}));
+      })
+    },
   }
 }
 </script>

src/pages/index/components/blind_spot_digging.vue

@@ -91,32 +91,10 @@ export default {
     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.tableData = res.data.record || []
         this.total = res.data.total
       })
     },

src/pages/index/components/bmap.vue

@@ -251,7 +251,7 @@ export default {
         );
       });
       let option = {
-        backgroundColor: "#013954",
+        backgroundColor: "#cccccc33",
         geo: [
           // {
           //   map: '河南',
@@ -383,7 +383,7 @@ export default {
       text-align: center;
       line-height: 6vh;
       letter-spacing: 0.3vw;
-      color: #fff;
+      color: #3498db;
       margin: 0;
     }
 

src/pages/index/components/charge_price.vue

@@ -93,7 +93,6 @@ export default {
       modelData: {
         list: [{name: '2元/小时', value: 600}, {name: '3元/小时', value: 800}, {name: '4元/小时', value: 800}, {name: '5元/小时', value: 800}]
       },
-
       tableData: [],
       tableData2: [],
       tableData3: [],

src/pages/index/components/demo1.vue

@@ -523,14 +523,6 @@ export default {
   width: 100%;
   height: 70%;
 }
-.bar-tooltip-dz {
-  padding: 5px 10px;
-  background: url("../../../../static/img/u261.png");
-  background-size: 100% 100%;
-  color: #333;
-  position: absolute;
-  top: 0;
-}
 .tax-table {
   tbody {
     tr {

src/pages/index/components/ip_white_list.vue

@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="IP地址">
-            <el-input v-model="formInline.ipUrl" placeholder="请输入"></el-input>
+            <el-input v-model="formInline.ipAddr" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -29,7 +29,7 @@
         label="操作"
         width="200">
         <template slot-scope="scope" style="display: inline-block">
-          <el-button type="primary" @click="handleAudit(scope.row)" slot="reference">修改</el-button>
+          <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
           <el-popconfirm title="确定删除吗？" @confirm="deleteRow(scope.row)">
             <el-button type="danger" slot="reference">删除</el-button>
           </el-popconfirm>
@@ -48,7 +48,7 @@
       custom-class="audit-dialog">
       <el-form label-position="left" label-width="80px" :model="formLabelAlign">
         <el-form-item label="IP地址">
-          <el-input v-model="formLabelAlign.ipUrl"></el-input>
+          <el-input v-model="formLabelAlign.ipAddr"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -68,26 +68,25 @@ export default {
       columns: [
         {
           label: 'IP地址',
-          key: 'resourceName'
+          key: 'ipAddr'
         },
         {
           label: '最后操作时间',
-          key: 'resourceType'
+          key: 'createTime'
         }
       ],
       tableData: [],
       total: 0,
       pageSize: 10,
       pageNum: 1,
-      radio: '2',
       dialogVisible: false,
       formInline: {
-        ipUrl: ''
+        ipAddr: ''
       },
       formLabelAlign: {
-        ipUrl: ''
+        id: '',
+        ipAddr: ''
       },
-      selRow: undefined,
       title: ''
     }
   },
@@ -97,9 +96,16 @@ export default {
   watch: {
   },
   methods: {
-    handleAudit(row) {
+    getTableData() {
+      const {pageNum, pageSize} = this
+      api.ipListByPage({current: pageNum, size: pageSize, ipAddr: this.formInline.ipAddr}).then(res => {
+        this.tableData = res.data.records || []
+        this.total = res.data.total
+      })
+    },
+    handleEdit(row) {
       this.title = '修改白名单'
-      this.formLabelAlign.ipUrl = row.resourceName
+      this.formLabelAlign = row
       this.dialogVisible = true
     },
     indexMethod(index) {
@@ -107,57 +113,48 @@ export default {
     },
     handleAdd () {
       this.title = '添加白名单'
-      this.formLabelAlign.ipUrl = ''
+      this.formLabelAlign.ipAddr = ''
       this.dialogVisible = true
     },
     onSubmit () {
       this.getTableData()
     },
     deleteRow (record) {
-      console.log(record)
+      api.deleteWhiteIp({id: record.id}).then(res => {
+        if (res.code === 200) {
+          this.$message({type: 'success', message: '删除成功!'})
+          this.getTableData()
+        }
+      })
     },
     handlePageChange() {
       this.getTableData()
     },
     handleConfirm() {
-      api.applyResource({idUrl: this.ipUrl}).then(res => {
-        if(res.success) {
-          this.dialogVisible = false
-          this.$message({
-            message: '添加成功!',
-            type: 'success'
-          })
-          this.getTableData()
-        }
-      })
-    },
-    getTableData() {
-      const {pageNum, pageSize} = this
-      api.applyList({pageNum, pageSize, ipUrl: this.formInline.ipUrl}).then(res => {
-        this.tableData = []
-        res.data.records.map((item, index) => {
-          const newItem = {...item}
-          newItem.applyTypeText = this.getApplyTypeText(item.applyType)
-          this.tableData.push(newItem)
+      if (this.title === '修改白名单') {
+        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
+          if(res.code === 200) {
+            this.dialogVisible = false
+            this.$message({
+              message: '修改成功!',
+              type: 'success'
+            })
+            this.getTableData()
+          }
+        })
+      } else {
+        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
+          if(res.code === 200) {
+            this.dialogVisible = false
+            this.$message({
+              message: '添加成功!',
+              type: 'success'
+            })
+            this.getTableData()
+          }
         })
-        this.total = res.data.total
-      })
-    },
-    getApplyTypeText(val) {
-      if (!val){
-        return '未申请'
-      }
-      const textMap = {
-        1: '待审批',
-        2: '审批通过',
-        3: '审批驳回'
       }
-      return textMap[val]
     },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
-    }
   }
 }
 </script>

src/pages/index/components/operation_log.vue

@@ -57,7 +57,7 @@
       :visible.sync="dialogVisible"
       width="60%"
       custom-class="audit-dialog">
-      <el-input type="textarea" disabled v-model="selRow.createTime"></el-input>
+      <el-input type="textarea" disabled v-model="logDetail.createTime"></el-input>
     </el-dialog>
   </div>
 </template>
@@ -96,7 +96,7 @@ export default {
       pageNum: 1,
       radio: '2',
       dialogVisible: false,
-      selRow: {},
+      logDetail: {},
       formInline: {
         interfaceName: '',
         time: ''
@@ -116,15 +116,17 @@ export default {
       this.getTableData()
     },
     handleDetail(row) {
-      this.selRow = row
-      this.dialogVisible = true
+      api.czrzDetail({id: row.id}).then(res => {
+        this.logDetail = res.data
+        this.dialogVisible = true
+      })
     },
     getTableData() {
       const {pageNum, pageSize, searchWords} = this
-      api.applyList({pageNum, pageSize, interfaceName: this.formInline.interfaceName}).then(res => {
-        this.tableData = res.data.records
-        this.total = res.data.total
-      })
+      // api.czrzListByPage({pageNum, pageSize, interfaceName: this.formInline.interfaceName}).then(res => {
+      //   this.tableData = res.data.records
+      //   this.total = res.data.total
+      // })
     },
     onSubmit() {
       console.log('submit!');

src/pages/index/components/other_analyse.vue

@@ -14,13 +14,13 @@
           :colorArr="[ '#5d78ff']"
           legendIcon="react"
           :bottom="30"
-          :xlabelFormat="xLabelFormat"
+          :xlabelFormat="xLabelFormat1"
           :top="60"
           yAxisName="(停车次数)"
-          :tooltip="tooltipFormat"
+          :tooltip="tooltipFormat1"
           :dataset="bardata"
           :encode="[
-            {x: 'month', y: 'dq'},
+            {x: 'month', y: 'cs'},
             ]"
           :labelSize="20"
           id="qyfx"
@@ -36,8 +36,8 @@
           :radiusArr="['30%', '70%']"
           :roseType = "false"
           :colorArr="ccsl"
-          :labelFormat="['{name|{b}}', '{sub|{@value} {d}%}', '{hr|}']"
-          :dataset="ccslvalue.list"
+          :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}', '{hr|}']"
+          :dataset="ccslvalue"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
@@ -56,14 +56,14 @@
           :colorArr="[ '#5d78ff','#00ff83']"
           legendIcon="react"
           :bottom="30"
-          :xlabelFormat="xLabelFormat"
+          :xlabelFormat="xLabelFormat1"
           :top="60"
           yAxisName="(辆)"
-          :tooltip="tooltipFormat"
+          :tooltip="tooltipFormat2"
           :dataset="tcfbfx"
           :encode="[
-            {x: 'month', y: 'lwtc', seriesName: '路外停车'},
-            {x: 'month', y: 'lntc', seriesName: '路内停车'},
+            {x: 'mouth', y: 'hc', seriesName: '路外停车'},
+            {x: 'mouth', y: 'cs', seriesName: '路内停车'},
             ]"
           :labelSize="20"
           id="tcfbfx"
@@ -79,14 +79,14 @@
           :colorArr="[ '#5d78ff','#00ff83']"
           legendIcon="react"
           :bottom="30"
-          :xlabelFormat="xLabelFormat"
+          :xlabelFormat="xLabelFormat1"
           :top="60"
           yAxisName="(泊位)"
-          :tooltip="tooltipFormat"
+          :tooltip="tooltipFormat3"
           :dataset="ywfx"
           :encode="[
-            {x: 'month', y: 'lwtc', seriesName: '路外余位'},
-            {x: 'month', y: 'lntc', seriesName: '路内余位'},
+            {x: 'mouth', y: 'hs', seriesName: '路外余位'},
+            {x: 'mouth', y: 'cs', seriesName: '路内余位'},
             ]"
           :labelSize="20"
           id="ywfx"
@@ -114,13 +114,13 @@
           :autoStop="false"
           :top="30"
           :bottom="30"
-          :left="40"
+          :left="50"
           :legendTop="0"
           yAxisName=""
           :dataset="cllfx"
-          :tooltipFormat="lineTooltipFormat"
+          :tooltipFormat="lineTooltipFormat4"
           :encode="[
-              { x: 'month', y: 'cll', seriesName: '车流量' },
+              { x: 'month', y: 'lastAmount', seriesName: '车流量' },
             ]"
           id="cllfx"
         />
@@ -143,13 +143,13 @@
           :colorArr="[ '#5d78ff']"
           legendIcon="react"
           :bottom="30"
-          :xlabelFormat="xLabelFormat"
+          :xlabelFormat="xLabelFormat1"
           :top="60"
           yAxisName=""
-          :tooltip="tooltipFormat"
+          :tooltip="lineTooltipFormat5"
           :dataset="dlyltcc"
           :encode="[
-            {x: 'month', y: 'dq'},
+            {x: 'mouth', y: 'hs'},
             ]"
           :labelSize="20"
           id="dlyltcc"
@@ -178,8 +178,8 @@
           :roseType="false"
           :radiusArr="['30%', '70%']"
           :colorArr="modelPieColor"
-          :labelFormat="['{name|{b}}', '{sub|{d}%}', '{hr|}']"
-          :dataset="modelData.list"
+          :labelFormat="['{name|{b}}', '{sub|{@value} {d}%}', '{hr|}']"
+          :dataset="zdcljcfx"
           :encode="{ itemName: 'name', value: 'value' }"
         />
     </div>
@@ -199,7 +199,8 @@ import piechart from "@/components/pieChart";
 import linechart from "@/components/lineChart";
 import barchart from "@/components/barChart";
 import * as echarts from 'echarts'
-import * as geoJson from '../../../util/411100.json'
+import * as geoJson from '@/util/411100.json'
+
 export default {
   name: "chinaLineMap",
   components: {
@@ -231,14 +232,12 @@ export default {
         label: '人民东路'
       }],
       ccsl: ["#ff8700","#9078f8","#ff0000","#4cff37","#4382f6"],
-      ccslvalue: {
-        list: [{name: '郾城区', value: 600}, {name: '临颍县', value: 800},{name: '舞阳县', value: 720}, {name: '源汇区', value: 840}, {name: '召陵区', value: 960}]
-      },
-      bardata: [{month: '郾城区', dq: 100},{month: '临颍县', dq: 120},{month: '舞阳县', dq: 115},{month: '源汇区', dq: 135},{month: '召陵区', dq: 150}],
-      tcfbfx: [{month: '郾城区', lwtc: 100,lntc:92},{month: '临颍县', lwtc: 120,lntc:80},{month: '舞阳县', lwtc: 110,lntc:65},{month: '源汇区', lwtc: 65,lntc:120},{month: '召陵区', lwtc: 70,lntc:95}],
-      ywfx: [{month: '郾城区', lwtc: 100,lntc:92},{month: '临颍县', lwtc: 120,lntc:80},{month: '舞阳县', lwtc: 110,lntc:65},{month: '源汇区', lwtc: 65,lntc:120},{month: '召陵区', lwtc: 70,lntc:95}],
-      cllfx: [{month: '郾城区', cll: 20}, {month: '临颍县', cll: 35},{month: '舞阳县', cll: 42},{month: '源汇区', cll: 31},{month: '召陵区', cll: 74},],
-      dlyltcc: [{month: '郾城区', dq: 100},{month: '临颍县', dq: 120},{month: '舞阳县', dq: 115},{month: '源汇区', dq: 135},{month: '召陵区', dq: 150}],
+      ccslvalue: [],
+      bardata: [],
+      tcfbfx: [],
+      ywfx: [],
+      cllfx: [],
+      dlyltcc: [],
       tableData: [],
       tableData2: [],
       tableData3: [],
@@ -332,149 +331,151 @@ export default {
       searchWords2: undefined,
       searchWords3: undefined,
       modelPieColor: ["#4382f6", "#9078f8", "#79a7db", "#FF9800"],
-      modelData: {
-        list: [{name: '建筑车', value: 23}, {name: '危险品车', value:5}, {name: '特种车', value:27}, {name: '残疾人车', value:45}]
-      },
+      zdcljcfx: [],
     }
   },
   mounted() {
+    this.getQyfx()
+    this.getCcsl()
+    this.getTcfbfx()
+    this.getYwfx()
+    this.getCllfx()
+    this.getDlyltcc()
+    this.getZdcljcfx()
     this.loadChinaLineMap()
-    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);
-    });
+    this.loadMap()
   },
   watch: {
   },
   methods: {
-    handlePageChange() {
-      this.getTableData()
-    },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
+    getQyfx() {
+      api.qyfx().then(res => {
+        this.bardata = res.data || []
+      })
     },
-    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()
-        }
+    getCcsl() {
+      api.ccsl().then(res => {
+        this.ccslvalue = res.data || []
       })
     },
-
-    mapTooltip(data) {
-      return `<div class="map-tooltip">
-        <div class="map-tooltip-name">${data.name}:<span class="map-tooltip-value">${data.value}%</span></div>
-      </div>`;
+    getTcfbfx() {
+      api.tcfbfx().then(res => {
+        this.tcfbfx = res.data || []
+      })
     },
-    getTableData() {
-      const {pageNum, pageSize, searchWords} = this
-      api.applyList({}).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
+    getYwfx() {
+      api.ywfx().then(res => {
+        this.ywfx = res.data || []
       })
     },
-    getTableData2() {
-      api.applyList({}).then(res => {
-        this.tableData2 =  res.data.data
-        this.total2 = res.data.total
+    getCllfx() {
+      api.cllfx().then(res => {
+        this.cllfx = res.data || []
       })
     },
-
-    getTableData3() {
-      api.applyList({}).then(res => {
-        this.tableData3 =  res.data.data
-        this.total3 = res.data.total
+    getDlyltcc() {
+      api.dlyltcc().then(res => {
+        this.dlyltcc = res.data || []
       })
     },
-
-    getTableData4() {
-      api.applyList({}).then(res => {
-        this.tableData4 =  res.data.data
-        this.total4 = res.data.total
+    getZdcljcfx() {
+      api.zdcljcfx().then(res => {
+        this.zdcljcfx = res.data || []
       })
     },
-
-    getApplyTypeText(val) {
-      if (!val){
-        return '未申请'
-      }
-      const textMap = {
-        1: '待审批',
-        2: '审批通过',
-        3: '审批驳回'
+    xLabelFormat1(name) {
+      const nameArr = []
+      for(let i=0; i<name.length; i+=7) {
+        nameArr.push(name.substring(i, i+7))
       }
-      return textMap[val]
+      return nameArr.join('\n');
+    },
+    tooltipFormat1(params) {
+      const data = params[0].data;
+      return `<div class="bar-tooltip-dz">${data.cs || "--"}次</div>`;
     },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
+    tooltipFormat2(params) {
+      const data = params[0].data;
+      return `<div class="line-tooltip">
+        <div style="color: ${params[0].color}">${params[0].seriesName}: ${
+        params[0].data.hs || "--"
+      }(辆)</div>
+        <div style="color: ${params[1].color}">${params[1].seriesName}: ${
+        params[0].data.cs || "--"
+      }(辆)</div>
+      </div>`;
+    },
+    tooltipFormat3(params) {
+      const data = params[0].data;
+      return `<div class="line-tooltip">
+        <div style="color: ${params[0].color}">${params[0].seriesName}: ${
+        params[0].data.hs || "--"
+      }(辆)</div>
+        <div style="color: ${params[1].color}">${params[1].seriesName}: ${
+        params[0].data.cs || "--"
+      }(辆)</div>
+      </div>`;
+    },
+    lineTooltipFormat4(params) {
+      const data = params[0].data;
+      return `<div class="bar-tooltip-dz">${data.lastAmount || "--"}次</div>`;
+    },
+    lineTooltipFormat5(params) {
+      const data = params[0].data;
+      return `<div class="bar-tooltip-dz">${data.hs || "--"}</div>`;
+    },
+    mapTooltip(data) {
+      return `<div class="map-tooltip">
+        <div class="map-tooltip-name">${data.name}:<span class="map-tooltip-value">${data.value}%</span></div>
+      </div>`;
     },
-    zeroPadding(num, digit) {
-      var zero = '';
-      for(var i = 0; i < digit; i++) {
-        zero += '0';
+    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),
+          });
+        }
       }
-      return (zero + num).slice(-digit);
+      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);
+      });
     },
-    //加载中国飞线地图
+    //加载轨迹地图
     loadChinaLineMap() {
       echarts.registerMap('河南', geoJson);
       var myCharts = echarts.init(document.getElementById('ChinaLineMap'));
@@ -726,4 +727,13 @@ export default {
   width: 100%;
   height: 99%;
 }
+
+.bar-tooltip-dz {
+  padding: 5px 10px;
+  background: url("../../../../static/img/u261.png");
+  background-size: 100% 100%;
+  color: #333;
+  position: absolute;
+  top: 0;
+}
 </style>

src/pages/index/components/park_easy.vue

@@ -169,7 +169,7 @@ export default {
     },
   },
   mounted() {
-    api.nyzs().then(res => {
+    api.dtnyzs().then(res => {
       let arr = []
       let dataSoure = res.data
       for (const key in dataSoure) {

src/pages/index/components/park_guidance.vue

@@ -18,8 +18,9 @@
 
 <script>
 import * as echarts from 'echarts'
-import * as geoJson from '../../../util/411100.json'
+import * as geoJson from '@/util/411100.json'
 import linechart from "@/components/lineChart";
+import api from '@/api/audit'
 
 export default {
   components: {
@@ -143,52 +144,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/service_publish.vue

@@ -2,7 +2,7 @@
   <div class="body-wrapper">
     <div>
       <h2 style="color: #3498db;margin-bottom: 20px;display: inline-block;width: 90%">服务发布列表</h2>
-      <el-button type="primary" @click="handleAdd">配置服务</el-button>
+      <el-button type="primary" @click="handleAdd">发布服务</el-button>
     </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">
@@ -69,13 +69,10 @@ export default {
       tableData: [{"interfaceName":'消息通知',"interfaceAddress":'http://39.106.16.100/notification',"submitState":'已提交',"publicState":' 未发布'}
         ,{"interfaceName":'预警提醒',"interfaceAddress":'http://39.106.16.100/warning',"submitState":'已提交',"publicState":' 未发布'},
         ,{"interfaceName":'剩余车位推送',"interfaceAddress":'http://39.106.16.100/seatpush',"submitState":'已提交',"publicState":' 已发布'},],
-      total: 3,
+      total: 0,
       pageSize: 10,
       pageNum: 1,
-      radio: '2',
       dialogVisible: false,
-      selRow: {},
-      searchWords: undefined,
       formLabelAlign: {
         interfaceName: '',
         interfaceAddress: '',
@@ -94,29 +91,20 @@ export default {
     handlePageChange() {
       this.getTableData()
     },
-    handleAudit(row) {
-      this.selRow = row
-      this.dialogVisible = true
-    },
-    handleCancelApply(row) {
-      console.log('enter handle cancel apply')
-    },
     handleAdd () {
       this.title = '配置服务'
       this.formLabelAlign.interfaceName = ''
       this.formLabelAlign.interfaceAddress = ''
-      // this.formLabelAlign.submitState = ''
-      // this.formLabelAlign.publicState = ''
       this.dialogVisible = true
     },
     handleConfirm() {
       const {id} = this.selRow
       console.log('radio', this.radio)
-      api.applyResource({id, applyType: this.formLabelAlign.interfaceName}).then(res => {
-        if(res.success) {
+      api.servicePublic({id, applyType: this.formLabelAlign.interfaceName}).then(res => {
+        if(res.code === 200) {
           this.dialogVisible = false
           this.$message({
-            message: '审核成功!',
+            message: '发布成功!',
             type: 'success'
           })
           this.getTableData()
@@ -125,7 +113,7 @@ export default {
     },
     getTableData() {
       const {pageNum, pageSize, searchWords} = this
-      api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
+      api.serviceListByPage({pageNum, pageSize, resourceName: searchWords}).then(res => {
         this.tableData = []
         res.data.records.map((item, index) => {
           const newItem = {...item}
@@ -134,26 +122,49 @@ export default {
         })
         this.total = res.data.total
       })
-    },
-    getApplyTypeText(val) {
-      if (!val){
-        return '未申请'
-      }
-      const textMap = {
-        1: '待审批',
-        2: '审批通过',
-        3: '审批驳回'
-      }
-      return textMap[val]
-    },
-    handleSearch() {
-      this.pageNum = 1
-      this.getTableData()
     }
   }
 }
 </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;
@@ -168,13 +179,8 @@ export default {
   .label{
     text-align: right;
   }
-  .form-div{
-    /deep/ .el-input__inner{
-      height: 35px;
-      width: 90%;
-      border: 1px solid #a6a5a5;
-      color: black;
-    }
+  /deep/ .el-input__inner{
+    background: white;
   }
 }
 </style>

src/pages/index/components/service_subscription_function.vue

@@ -126,15 +126,15 @@ export default {
       },
       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
-        })
+        // 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
+        // })
       },
       getApplyTypeText(val) {
         if (!val){