Merge remote-tracking branch 'origin/master'

src/api/audit.js

@@ -422,6 +422,10 @@ export default {
     return axios.post(`/dash/enterprise/service/config/delete`, params)
   },
   // 服务评价
+  getPjjzDic(params) {
+    return axios.get(`/dash/enterprise/service/config/select`, {params})
+  },
+  // 服务评价
   getPj(params) {
     return axios.get(`/dash/enterprise/service/evaluation/page`, {params})
   },
@@ -437,4 +441,15 @@ export default {
   deletePj(params) {
     return axios.post('/dash/enterprise/service/evaluation/delete', params)
   },
+  // 事件监测
+  getEventMonitoring(params) {
+    return axios.get(`/dash/event/monitoring/page`, {params})
+  },
+  // 全局停车诱导-地图难易指数
+  getEventStat1(params) {
+    return axios.post('/dash/event/monitoring/stat1', params)
+  },
+  getEventStat2(params) {
+    return axios.post('/dash/event/monitoring/stat2', params)
+  },
 }

src/pages/index/components/charge_price.vue

@@ -54,6 +54,7 @@
 
       <div style="width: 55%;height: 400px;">
         <h5 style="color: white">车主缴费明细</h5>
+        <br>
         <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>
@@ -174,7 +175,7 @@ export default {
       pageSize: 5,
       pageNum: 1,
       total2: 0,
-      pageSize2: 5,
+      pageSize2: 10,
       pageNum2: 1
     }
   },

src/pages/index/components/customer_complaint.vue

@@ -99,9 +99,9 @@
           <el-select v-model="formLabelAlign.comType" placeholder="请选择">
             <el-option
               v-for="item in complaintOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              :key="item.dictValue"
+              :label="item.dictKey"
+              :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
@@ -212,8 +212,8 @@ export default {
           key: 'disposeState'
         },
         {
-          label: '处理时间',
-          key: 'disposeTime'
+          label: '创建时间',
+          key: 'createdTime'
         }
       ],
       carOptions: [],

src/pages/index/components/enterprise_service.vue

@@ -113,7 +113,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="评分项" prop="dictKey">
-          <el-input v-model="formLabelAlign3.dictKey" maxLength="10" placeholder="请输入评分项"></el-input>
+          <el-select clearable filterable v-model="formLabelAlign3.dictKey" placeholder="请选择" popper-class="cur-select">
+            <el-option v-for="item in pjOptions" :key="item.dictKey" :label="item.dictKey" :value="item.dictKey"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleConfirm3('formLabelAlign3')">立即创建</el-button>
@@ -135,6 +137,7 @@ export default {
   },
   data() {
     return {
+      pjOptions: '',
       title: '',
       rule3: {
         parkId: [
@@ -211,12 +214,12 @@ export default {
       queryParams3: {},
       columns3: [
         {
-          label: '评价项',
-          key: 'dictKey'
+          label: '停车场',
+          key: 'carParkName'
         },
         {
-          label: '分值',
-          key: 'dictValue'
+          label: '评价项',
+          key: 'dictKey'
         },
         {
           label: '创建时间',
@@ -232,6 +235,7 @@ export default {
   },
   mounted() {
     this.getParkDic()
+    this.getPjDic()
     this.queryTable()
     this.queryTable2()
     this.queryTable3()
@@ -280,6 +284,11 @@ export default {
         this.carOptions = res.data || [];
       })
     },
+    getPjDic() {
+      api.getPjjzDic().then(res => {
+        this.pjOptions = res.data || [];
+      })
+    },
     queryTable() {
       this.pageNum = 1
       this.queryParams = {...this.formInline}
@@ -341,6 +350,7 @@ export default {
                   type: 'success'
                 })
                 this.queryTable2()
+                this.getPjDic()
               }
             })
           } else {
@@ -352,6 +362,7 @@ export default {
                   type: 'success'
                 })
                 this.queryTable2()
+                this.getPjDic()
               }
             })
           }

src/pages/index/components/equipment_running.vue

@@ -14,6 +14,11 @@
           <el-option v-for="item in carOptions" :key="item.parkId" :label="item.carParkName" :value="item.parkId"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="设备类型">
+        <el-select clearable filterable v-model="formInline1.deviceType" placeholder="请选择" popper-class="cur-select">
+          <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="queryTable">查询</el-button>
       </el-form-item>
@@ -49,7 +54,7 @@
     <br>
     <div style="width: 100%;display: flex;justify-content: space-between;">
       <div style="width: 33%;height: 400px;">
-        <h5 style="color: white">摄像头</h5>
+        <h5 style="color: white">高杆相机</h5>
         <piechart
           class="model-pie-body"
           id="chart1"
@@ -63,7 +68,7 @@
       </div>
 
       <div style="width: 33%;height: 400px;">
-        <h5 style="color: white">闸机</h5>
+        <h5 style="color: white">PDA</h5>
         <piechart
           class="model-pie-body"
           id="chart2"
@@ -77,7 +82,7 @@
       </div>
 
       <div style="width: 33%;height: 400px;">
-        <h5 style="color: white">满位显示器</h5>
+        <h5 style="color: white">地磁</h5>
         <piechart
           class="model-pie-body"
           id="chart3"
@@ -107,6 +112,7 @@ export default {
   data() {
     return {
       districtOptions: options.districtOptions,
+      deviceOptions: options.deviceOptions,
       carOptions: [],
       columns: [
         {

src/pages/index/components/event_monitoring.vue

@@ -34,8 +34,8 @@
             :dataset="linedata1"
             :tooltipFormat="lineTooltipFormat1"
             :encode="[
-              { x: 'mouth', y: 's1', seriesName: '昨日',bool:'true' },
-              { x: 'mouth', y: 's2', seriesName: '今日',bool:'true' },
+              { x: 'mouth', y: 's1', seriesName: '昨日', bool: 'true' },
+              { x: 'mouth', y: 's2', seriesName: '今日', bool: 'true' },
             ]"
             id="fsqs"
           />
@@ -55,7 +55,7 @@
               { x: 'mouth', y: 's2', seriesName: '套牌车事件',bool:'true' },
               { x: 'mouth', y: 's3', seriesName: '客诉事件',bool:'true' },
               { x: 'mouth', y: 's4', seriesName: '设备事件',bool:'true' },
-              { x: 'mouth', y: 's5', seriesName: '超长停车事件',bool:'true' },
+              { x: 'mouth', y: 's5', seriesName: '超长停 车事件',bool:'true' },
               { x: 'mouth', y: 's6', seriesName: '大额欠费事件',bool:'true' },
             ]"
             id="sxcyfzqk"
@@ -193,16 +193,12 @@ export default {
           key: 'carParkName'
         },
         {
-          label: '事件类型',
-          key: 'eventKey'
+          label: '实时数',
+          key: 'today'
         },
         {
-          label: '备注',
-          key: 'eventBiz'
-        },
-        {
-          label: '事件时间',
-          key: 'eventTime'
+          label: '历史事件数',
+          key: 'history'
         }
       ],
       columns2: [
@@ -256,12 +252,7 @@ export default {
       total: 0,
       pageSize: 10,
       pageNum: 1,
-      linedata2: [{month: '12-26', blacklistEvent:11,deckEvent:12,customerEvent:13,deviceEvent:11,longEvent:12,largeEvent:21},
-        {month: '12-27', blacklistEvent:12,deckEvent:13,customerEvent:12,deviceEvent:11,longEvent:11,largeEvent:12},
-        {month: '12-28', blacklistEvent:20,deckEvent:12,customerEvent:11,deviceEvent:22,longEvent:22,largeEvent:15},
-        {month: '12-29', blacklistEvent:13,deckEvent:14,customerEvent:21,deviceEvent:13,longEvent:13,largeEvent:12},
-        {month: '12-30', blacklistEvent:12,deckEvent:12,customerEvent:13,deviceEvent:12,longEvent:14,largeEvent:15},
-        {month: '12-31', blacklistEvent:13,deckEvent:12,customerEvent:12,deviceEvent:14,longEvent:21,largeEvent:21},],
+      linedata2: [],
       tableData2: [],
       total2: 0,
       pageSize2: 10,
@@ -304,6 +295,8 @@ export default {
       this.pageNum = 1
       this.queryParams = {...this.formInline}
       this.getTableData()
+      this.getEventStat1()
+      this.getEventStat2()
     },
     queryTable2() {
       this.pageNum2 = 1
@@ -319,22 +312,22 @@ export default {
       const data = params[0].data;
       return `<div class="line-tooltip">
         <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-        params[0].data.blacklistEvent || "--"
+        params[0].data.s1 || "0"
       }(件)</div>
         <div style="color: ${params[1].color}">${params[1].seriesName}: ${
-        params[0].data.deckEvent || "--"
+        params[0].data.s2 || "0"
       }(件)</div>
         <div style="color: ${params[2].color}">${params[2].seriesName}: ${
-        params[0].data.customerEvent || "--"
+        params[0].data.s3 || "0"
       }(件)</div>
         <div style="color: ${params[3].color}">${params[3].seriesName}: ${
-        params[0].data.deviceEvent || "--"
+        params[0].data.s4 || "0"
       }(件)</div>
         <div style="color: ${params[4].color}">${params[4].seriesName}: ${
-        params[0].data.longEvent || "--"
+        params[0].data.s5 || "0"
       }(件)</div>
         <div style="color: ${params[5].color}">${params[5].seriesName}: ${
-        params[0].data.largeEvent || "--"
+        params[0].data.s6 || "0"
       }(件)</div>
       </div>`;
     },
@@ -342,10 +335,10 @@ export default {
       const data = params[0].data;
       return `<div class="line-tooltip">
         <div style="color: ${params[0].color}">${params[0].seriesName}: ${
-        params[0].data.blacklistEvent || "--"
+        params[0].data.lastYearAmount || "0"
       }(件)</div>
         <div style="color: ${params[1].color}">${params[1].seriesName}: ${
-        params[0].data.deckEvent || "--"
+        params[0].data.thisYearAmount || "0"
       }(件)</div>
       </div>`;
     },
@@ -354,10 +347,20 @@ export default {
     },
     getTableData() {
       const {pageNum, pageSize, queryParams} = this
-      // api.applyList({current: pageNum, size: pageSize, ...queryParams}).then(res => {
-      //   this.tableData = []
-      //   this.total = res.data.total
-      // })
+      api.getEventMonitoring({current: pageNum, size: pageSize, ...queryParams}).then(res => {
+        this.tableData1 = res.data.records || []
+        this.total = res.data.total
+      })
+    },
+    getEventStat1() {
+      api.getEventStat1({...this.queryParams}).then(res => {
+        this.linedata1 = res.data || []
+      })
+    },
+    getEventStat2() {
+      api.getEventStat2({...this.queryParams}).then(res => {
+        this.linedata2 = res.data || []
+      })
     },
 
     handlePageChange2() {

src/util/options.js

@@ -25,17 +25,29 @@ export default {
     label: '临颍县'
   }],
   keyAreaOptions: [{
-    value: '商圈',
-    label: '商圈'
+    value: '住宅小区',
+    label: '住宅小区'
   }, {
-    value: '学校',
-    label: '学校'
+    value: '商业体',
+    label: '商业体'
+  }, {
+    value: '办公园区',
+    label: '办公园区'
+  }, {
+    value: '政府单位',
+    label: '政府单位'
   }, {
     value: '医院',
     label: '医院'
   }, {
-    value: '旅游景点',
-    label: '旅游景点'
+    value: '院校',
+    label: '院校'
+  }, {
+    value: '公共设施',
+    label: '公共设施'
+  }, {
+    value: '其他',
+    label: '其他'
   }],
   complaintOptions: [ {
     value: '经营服务类停车问题',
@@ -91,5 +103,15 @@ export default {
   }, {
     value: '大额欠费事件',
     label: '大额欠费事件'
-  }]
+  }],
+  deviceOptions: [ {
+    value: '高杆相机',
+    label: '高杆相机'
+  }, {
+    value: 'PDA',
+    label: 'PDA'
+  }, {
+    value: '地磁',
+    label: '地磁'
+  }],
 }