接口整理

src/pages/index/components/berths_revenue.vue

@@ -41,7 +41,7 @@
           :bottom="30"
           :left="40"
           :legendTop="0"
-          yAxisName="(辆)"
+          yAxisName="(元)"
           :dataset="linedata"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
@@ -63,7 +63,7 @@
           :bottom="30"
           :left="40"
           :legendTop="0"
-          yAxisName="(辆)"
+          yAxisName="(元)"
           :dataset="linedata2"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
@@ -85,7 +85,7 @@
           :bottom="30"
           :left="40"
           :legendTop="0"
-          yAxisName="(辆)"
+          yAxisName="(元)"
           :dataset="linedata3"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
@@ -107,7 +107,7 @@
           :bottom="30"
           :left="40"
           :legendTop="0"
-          yAxisName="(辆)"
+          yAxisName="(元)"
           :dataset="linedata4"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
@@ -129,7 +129,7 @@
           :bottom="30"
           :left="40"
           :legendTop="0"
-          yAxisName="(辆)"
+          yAxisName="(元)"
           :dataset="linedata2"
           :tooltipFormat="lineTooltipFormat"
           :encode="[

src/pages/index/components/enterprise_service.vue

@@ -4,18 +4,6 @@
       <h5>车场综合服务评价</h5>
     </div>
     <br>
-    <div style="display: flex;justify-content: space-around;">
-      <div style="width: 33%;display: flex;">
-      <h4 class="h4font" data="tableData">贵弘停车场：</h4><h3 class="h4font" data="tableData2">5</h3><h4 class="h4font">个</h4>
-      </div>
-      <div style="width: 33%;display: flex;">
-        <h4 class="h4font" data="tableData3">裕泰停车场：</h4><h3 class="h4font" data="tableData4">5</h3><h4 class="h4font">个</h4>
-      </div>
-      <div style="width: 33%;display: flex;">
-        <h4 class="h4font" data="tableData5">强利停车场：</h4><h3 class="h4font" data="tableData6">5</h3><h4 class="h4font">个</h4>
-      </div>
-    </div>
-    <br>
     <br>
     <el-table :data="tableData7" style="background: #2a2a2a;border-color: #333;">
       <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
@@ -43,8 +31,8 @@ export default {
     return {
       columns: [
         {
-          label: '姓名',
-          key: 'resourceName'
+          label: '车场名',
+          key: 'parkName'
         },
         {
           label: '综合评分',

src/pages/index/components/park_monitor.vue

@@ -83,6 +83,20 @@ export default {
           key: 'userName'
         }
       ],
+      columns2: [
+        {
+          label: '停车场',
+          key: 'resourceName'
+        },
+        {
+          label: '泊位号',
+          key: 'resourceType'
+        },
+        {
+          label: '泊车状态',
+          key: 'userName'
+        }
+      ],
       tableData: [],
       total: 0,
       pageSize: 10,

src/pages/index/components/record_query.vue

@@ -1,44 +1,89 @@
 <template>
   <div class="body-wrapper">
-
-    <div class="search-card">
-        <el-input class="input-wrapper" v-model="searchWords" placeholder="请输入关键字">
-          <el-button slot="append" icon="el-icon-search"  @click="handleSearch"></el-button>
-        </el-input>
-    </div>
-    <el-table :data="tableData">
-      <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="100">
-        <template slot-scope="scope">
-            <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleAudit(scope.row)" type="text" size="small">审核</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-pagination">
-      <el-pagination layout="prev, pager, next" :total="total" @current-change="handlePageChange"
-        :current-page.sync="pageNum" :page-size.sync="pageSize">
-      </el-pagination>
-    </div>
-    <el-dialog
-        title="审核"
-        :visible.sync="dialogVisible"
-        width="60%"
-        custom-class="audit-dialog">
-        <el-row class="mg-bt">
-            <el-col class="label" :span="4">审核：</el-col>
-            <el-col :span="18">
-                <el-radio v-model="radio" label="2">通过</el-radio>
-                <el-radio v-model="radio" label="3">驳回</el-radio>
+    <el-tabs  v-model="activeName">
+      <el-tab-pane label="停车记录查询" name="停车记录查询">
+        <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="车牌号">
+                <el-input v-model="formInline1.parkName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-table :data="tableData1">
+          <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 layout="prev, pager, next" :total="total1" @current-change="handlePageChange1"
+                         :current-page.sync="pageNum1" :page-size.sync="pageSize1">
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="车辆查询" name="车辆查询">
+        <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="车牌号">
+                <el-input v-model="formInline2.carNo" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-table :data="tableData2">
+          <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 layout="prev, pager, next" :total="total1" @current-change="handlePageChange2"
+                         :current-page.sync="pageNum2" :page-size.sync="pageSize2">
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="轨迹查询" name="轨迹查询">
+        <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="车牌号">
+                <el-input v-model="formInline3.parkName" placeholder="请输入"></el-input>
+              </el-form-item>
             </el-col>
-        </el-row>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
-        </span>
-    </el-dialog>
+            <el-col :span="8">
+              <el-form-item>
+                <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-table :data="tableData3">
+          <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="100">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleAudit(scope.row)" type="text" size="small">审核</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="table-pagination">
+          <el-pagination layout="prev, pager, next" :total="total3" @current-change="handlePageChange1"
+                         :current-page.sync="pageNum3" :page-size.sync="pageSize3">
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 <script>
@@ -48,65 +93,86 @@ export default {
     components: {},
     data() {
       return {
-        columns: [
+        activeName: '停车记录查询',
+        columns1: [
           {
-            label: '资源名称',
+            label: '停车场',
             key: 'resourceName'
           },
           {
-            label: '资源类型',
+            label: '车牌号',
             key: 'resourceType'
           },
           {
-            label: '申请人',
+            label: '泊位号',
             key: 'userName'
           },
           {
-            label: '状态',
+            label: '入场时间',
+            key: 'applyTypeText'
+          },
+          {
+            label: '出场时间',
             key: 'applyTypeText'
           }
         ],
-        tableData: [],
-        total: 0,
-        pageSize: 10,
-        pageNum: 1,
-        radio: '2',
-        dialogVisible: false,
-        selRow: {},
-        searchWords: undefined
+        tableData1: [],
+        total1: 0,
+        pageSize1: 10,
+        pageNum1: 1,
+        formInline1: {
+          carNo: ''
+        },
+        columns2: [
+          {
+            label: '车牌号',
+            key: 'resourceName'
+          },
+          {
+            label: '车型',
+            key: 'resourceType'
+          }
+        ],
+        tableData2: [],
+        total2: 0,
+        pageSize2: 10,
+        pageNum2: 1,
+        formInline2: {
+          carNo: ''
+        },
+        columns3: [
+          {
+            label: '车牌号',
+            key: 'resourceName'
+          },
+          {
+            label: '地点',
+            key: 'resourceType'
+          },
+          {
+            label: '行为',
+            key: 'userName'
+          }
+        ],
+        tableData3: [],
+        total3: 0,
+        pageSize3: 10,
+        pageNum3: 1,
+        formInline3: {
+          carNo: ''
+        }
       }
     },
     mounted() {
-      this.getTableData()
+      this.getTableData1()
     },
     watch: {
     },
     methods: {
-      handlePageChange() {
-        this.getTableData()
+      handlePageChange1() {
+        this.getTableData1()
       },
-      handleAudit(row) {
-        this.selRow = row
-        this.dialogVisible = true
-      },
-      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() {
+      getTableData1() {
         const {pageNum, pageSize, searchWords} = this
         api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
           this.tableData = []
@@ -117,21 +183,6 @@ 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()
       }
     }
 }

src/pages/index/layouts/indexLayout.vue

@@ -62,7 +62,7 @@ export default {
         {name: '区域停车主题', url: '/parking_area'},
         {name: '设备运营主题', url: '/service_operations'},
         {name: '停车饱和预警', url: '/saturation_warning'},
-        {name: '车辆迁徒分析', url: '/bmap'},
+        {name: '车辆迁徒分析', url: '/track_map'},
         {name: '停车缺口分析', url: '/gap_analysis'},
         {name: '停车难易指数', url: '/park_easy'},
         {name: '全局停车诱导', url: '/park_guidance'},

src/router/index.js

@@ -121,9 +121,9 @@ export default new Router({
           component: () => import("../pages/index/components/amap.vue")
         },
         {
-          name: "bmap",
-          path: "/bmap",
-          component: () => import("../pages/index/components/bmap.vue")
+          name: "track_map",
+          path: "/track_map",
+          component: () => import("../pages/index/components/track_map.vue")
         },
         {
           name: "berth_road_out",