Merge remote-tracking branch 'origin/master'

src/api/audit.js

@@ -391,11 +391,50 @@ export default {
   },
   // 事件添加
   addEvent(params) {
-    return axios.get(`/dash/event/monitoring/ex/add`, {params})
+    return axios.post(`/dash/event/monitoring/ex/add`, params)
   },
   // 事件查询
-  EventList(params) {
-    return axios.get(`/dash/event/monitoring/ex/add`, {params})
+  eventList(params) {
+    return axios.get(`/dash/event/monitoring/ex/page`, {params})
+  },
+  // 事件删除   /dash/event/monitoring/ex/delete
+  deleteEvent(params) {
+    return axios.post(`/dash/event/monitoring/ex/delete`, params)
+  },
+  // 事件修改
+  editEvent(params) {
+    return axios.get(`/dash/event/monitoring/ex/edit`, params)
+  },
+  // 企业服务监管-评分机制配置
+  getPfjzList(params) {
+    return axios.get(`/dash/enterprise/service/config/page`, {params})
+  },
+  // 企业服务监管-增加评分机制配置
+  addPfjz(params) {
+    return axios.post(`/dash/enterprise/service/config/add`, params)
+  },
+  // 企业服务监管-修改评分机制配置
+  editPfjz(params) {
+    return axios.post(`/dash/enterprise/service/config/edit`, params)
+  },
+  // 企业服务监管-删除评分机制配置
+  deletePfjz(params) {
+    return axios.post(`/dash/enterprise/service/config/delete`, params)
+  },
+  // 服务评价
+  getPj(params) {
+    return axios.get(`/dash/enterprise/service/evaluation/page`, {params})
+  },
+  // 新增评价
+  addPj(params) {
+    return axios.post('/dash/enterprise/service/evaluation/add', params)
+  },
+  // 修改评价
+  editPj(params) {
+    return axios.post('/dash/enterprise/service/evaluation/edit', params)
+  },
+  // 修改评价
+  deletePj(params) {
+    return axios.post('/dash/enterprise/service/evaluation/delete', params)
   },
-
 }

src/assets/css/element_ui.css

@@ -426,7 +426,7 @@ cur-select {
   background-color: #858990;
 }
 .el-form-item {
-  margin-bottom: 10px;
+  margin-bottom: 15px;
 }
 .el-input__inner {
   font-size: .72917vw;
@@ -438,3 +438,6 @@ cur-select {
 .el-date-editor .el-range__icon {
   line-height: 24px;
 }
+.el-date-editor .el-range__close-icon {
+  line-height: 24px;
+}

src/assets/css/global.css

@@ -131,6 +131,7 @@ body,
   background: #0c0c0c;
   width: 100%;
   height: 100%;
+  box-sizing: border-box;
 }
 .table-pagination{
   text-align: right;

src/pages/index/components/customer_complaint.vue

@@ -5,9 +5,9 @@
         <el-select clearable v-model="formInline.comType" placeholder="投诉类型" popper-class="cur-select">
           <el-option
             v-for="item in complaintOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
+            :key="item.dictKey"
+            :label="item.dictValue"
+            :value="item.dictKey">
           </el-option>
         </el-select>
       </el-form-item>

src/pages/index/components/enterprise_service.vue

@@ -9,7 +9,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="onSubmit">查询</el-button>
+            <el-button type="primary" @click="queryTable">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
@@ -23,18 +23,111 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="评分机制配置" name="评分机制配置">
-        222
+        <el-form class="form-wrapper" :inline="true" :model="formInline2">
+          <el-form-item label="评价项">
+            <el-input  v-model="formInline2.dictKey" placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="queryTable2">查询</el-button>
+            <el-button type="primary" @click="handleAdd">新增</el-button>
+          </el-form-item>
+        </el-form>
+        <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-column
+            label="操作"
+            width="200">
+            <template slot-scope="scope" style="display: inline-block">
+              <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>
+            </template>
+          </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>
       </el-tab-pane>
-      <el-tab-pane label="车厂分数评价" name="车厂分数评价">
-        333
+      <el-tab-pane label="服务评分" name="服务评分">
+        <el-form class="form-wrapper" :inline="true" :model="formInline3">
+          <el-form-item label="停车场">
+            <el-select clearable filterable v-model="formInline3.parkId" placeholder="请选择" popper-class="cur-select">
+              <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>
+            <el-button type="primary" @click="queryTable3">查询</el-button>
+            <el-button type="primary" @click="handleAdd3">新增</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table :data="tableData3" style="background: #2a2a2a;border-color: #333;">
+          <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="200">
+            <template slot-scope="scope" style="display: inline-block">
+              <el-button type="primary" @click="handleEdit3(scope.row)" slot="reference">修改</el-button>
+              <el-popconfirm title="确定删除吗？" @confirm="deleteRow3(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="total3" @current-change="handlePageChange3"
+                         :current-page.sync="pageNum3" :page-size.sync="pageSize3">
+          </el-pagination>
+        </div>
       </el-tab-pane>
     </el-tabs>
+    <el-dialog :title="title"
+               :visible.sync="dialogVisible"
+               width="60%"
+               custom-class="audit-dialog">
+      <el-form label-position="right" :rules="rule" label-width="80px" :model="formLabelAlign" ref="formLabelAlign">
+        <el-form-item label="评分项" prop="dictKey">
+          <el-input v-model="formLabelAlign.dictKey" maxLength="10" placeholder="请输入评分项"></el-input>
+        </el-form-item>
+        <el-form-item label="分值" prop="dictValue">
+          <el-input v-model="formLabelAlign.dictValue"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleConfirm('formLabelAlign')">立即创建</el-button>
+          <el-button @click="handleCancel('formLabelAlign')">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <el-dialog :title="title"
+               :visible.sync="dialogVisible3"
+               width="60%"
+               custom-class="audit-dialog">
+      <el-form label-position="right" :rules="rule3" label-width="80px" :model="formLabelAlign3" ref="formLabelAlign3">
+        <el-form-item label="停车场">
+          <el-select clearable filterable v-model="formLabelAlign3.parkId" placeholder="请选择" popper-class="cur-select">
+            <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="评分项" prop="dictKey">
+          <el-input v-model="formLabelAlign3.dictKey" maxLength="10" placeholder="请输入评分项"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleConfirm3('formLabelAlign3')">立即创建</el-button>
+          <el-button @click="handleCancel3('formLabelAlign3')">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
 import api from "@/api/audit.js";
 import piechart from "@/components/pieChart";
 import options from '@/util/options'
+import {validateInput} from '@/util/common'
 
 export default {
   components: {
@@ -42,11 +135,40 @@ export default {
   },
   data() {
     return {
+      title: '',
+      rule3: {
+        parkId: [
+          { required: true, message: '请选择车场', trigger: 'change' }
+        ],
+        dictKey: [
+          { required: true, message: '请选择评分项', trigger: 'change' }
+        ]
+      },
+      rule: {
+        dictKey: [
+          { required: true, message: '请输入评分项', trigger: 'blur' },
+          { validator: validateInput, trigger: "blur" }],
+        dictValue: [
+          { required: true, message: '请输入分值', trigger: 'blur' },
+          { pattern: /^(?:0|[1-9][0-9]?|100)$/, message: '请输入0-100以内的数字'}
+          ]
+      },
+      formLabelAlign: {
+        "dictKey": '',
+        "dictValue": 0
+      },
+      formLabelAlign3: {
+        "parkId": '',
+        "dictKey": '',
+        "dictValue": 0
+      },
+      carOptions: [],
       districtOptions: options.districtOptions,
       activeName:'车场综合评分',
       formInline: {
         regionCode: ''
       },
+      quryParams: {},
       columns: [
         {
           label: '车场名',
@@ -61,33 +183,214 @@ export default {
       total: 0,
       pageSize: 10,
       pageNum: 1,
-      radio: '2',
+      formInline2: {
+        eventKeyOptions: [],
+        time: [],
+        parkId: ''},
+      queryParams2: {},
+      columns2: [
+        {
+          label: '评价项',
+          key: 'dictKey'
+        },
+        {
+          label: '分值',
+          key: 'dictValue'
+        },
+        {
+          label: '创建时间',
+          key: 'createTime'
+        }
+      ],
+      tableData2: [],
+      total2: 0,
+      pageSize2: 10,
+      pageNum2: 1,
       dialogVisible: false,
-      selRow: {},
-      searchWords: undefined,
-      searchWords2: undefined,
+      formInline3: {parkId: ''},
+      queryParams3: {},
+      columns3: [
+        {
+          label: '评价项',
+          key: 'dictKey'
+        },
+        {
+          label: '分值',
+          key: 'dictValue'
+        },
+        {
+          label: '创建时间',
+          key: 'createTime'
+        }
+      ],
+      tableData3: [],
+      total3: 0,
+      pageSize3: 10,
+      pageNum3: 1,
+      dialogVisible3: false,
     }
   },
   mounted() {
-    this.getTableData()
+    this.getParkDic()
+    this.queryTable()
+    this.queryTable2()
+    this.queryTable3()
   },
   watch: {
   },
   methods: {
-    onSubmit() {
+    handleEdit(row) {
+      this.title = '修改'
+      this.formLabelAlign = {...row}
+      this.dialogVisible = true
+    },
+    handleAdd () {
+      this.title = '新增'
+      this.formLabelAlign = {}
+      this.dialogVisible = true
+    },
+    deleteRow (record) {
+      api.deletePfjz([{id: record.id}]).then(res => {
+        if (res.code === 200) {
+          this.$message({type: 'success', message: '删除成功!'})
+          this.getTableData2()
+        }
+      })
+    },
+    handleEdit3(row) {
+      this.title = '修改'
+      this.formLabelAlign3 = {...row}
+      this.dialogVisible3 = true
+    },
+    handleAdd3 () {
+      this.title = '新增'
+      this.formLabelAlign3 = {}
+      this.dialogVisible3 = true
+    },
+    deleteRow3 (record) {
+      api.deletePj([{id: record.id}]).then(res => {
+        if (res.code === 200) {
+          this.$message({type: 'success', message: '删除成功!'})
+          this.getTableData3()
+        }
+      })
+    },
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.carOptions = res.data || [];
+      })
+    },
+    queryTable() {
       this.pageNum = 1
+      this.queryParams = {...this.formInline}
       this.getTableData()
     },
+    queryTable2() {
+      this.pageNum2 = 1
+      this.queryParams2 = {...this.formInline2}
+      this.getTableData2()
+    },
+    queryTable3() {
+      this.pageNum3 = 1
+      this.queryParams3 = {...this.formInline3}
+      this.getTableData3()
+    },
     handlePageChange() {
       this.getTableData()
     },
+    handlePageChange2() {
+      this.getTableData2()
+    },
+    handlePageChange3() {
+      this.getTableData3()
+    },
     getTableData() {
-      const {pageNum, pageSize} = this
-      api.qyfwjgListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
+      const {pageNum, pageSize, queryParams} = this
+      api.qyfwjgListByPage({current: pageNum, size: pageSize, ...queryParams}).then(res => {
         this.tableData = (res.data.records || []).map(item => ({...item, score: Math.round(item.score)}))
         this.total = res.data.total
       })
-    }
+    },
+    getTableData2() {
+      const {pageNum2, pageSize2, queryParams2} = this
+      api.getPfjzList({current: pageNum2, size: pageSize2, ...queryParams2}).then(res => {
+        this.tableData2 = (res.data.records || [])
+        this.total2 = res.data.total
+      })
+    },
+    getTableData3() {
+      const {pageNum3, pageSize3, queryParams3} = this
+      api.getPj({current: pageNum3, size: pageSize3, ...queryParams3}).then(res => {
+        this.tableData3 = (res.data.records || [])
+        this.total3 = res.data.total
+      })
+    },
+    handleCancel(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogVisible = false;
+    },
+    handleConfirm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.title === '修改') {
+            api.editPfjz(this.formLabelAlign).then(res => {
+              if(res.code === 200) {
+                this.dialogVisible = false
+                this.$message({
+                  message: '修改成功!',
+                  type: 'success'
+                })
+                this.queryTable2()
+              }
+            })
+          } else {
+            api.addPfjz(this.formLabelAlign).then(res => {
+              if (res.code === 200) {
+                this.dialogVisible = false
+                this.$message({
+                  message: '添加成功!',
+                  type: 'success'
+                })
+                this.queryTable2()
+              }
+            })
+          }
+        }
+      })
+    },
+    handleCancel3(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogVisible3 = false;
+    },
+    handleConfirm3(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.title === '修改') {
+            api.editPj(this.formLabelAlign3).then(res => {
+              if(res.code === 200) {
+                this.dialogVisible3 = false
+                this.$message({
+                  message: '修改成功!',
+                  type: 'success'
+                })
+                this.queryTable3()
+              }
+            })
+          } else {
+            api.addPj(this.formLabelAlign3).then(res => {
+              if (res.code === 200) {
+                this.dialogVisible3 = false
+                this.$message({
+                  message: '添加成功!',
+                  type: 'success'
+                })
+                this.queryTable3()
+              }
+            })
+          }
+        }
+      })
+    },
   }
 }
 </script>

src/pages/index/components/event_monitoring.vue

@@ -1,76 +1,149 @@
 <template>
   <div class="body-wrapper">
-    <el-form class="form-wrapper" :inline="true" :model="formInline">
-      <el-form-item label="行政区">
-        <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
-          <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item clearable label="具体道路">
-        <el-input v-model="formInline.streetName" placeholder="请输入"></el-input>
-      </el-form-item>
-      <el-form-item label="停车场">
-        <el-select clearable filterable v-model="formInline.parkId" placeholder="请选择" popper-class="cur-select">
-          <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>
-        <el-button type="primary" @click="queryTable">查询</el-button>
-      </el-form-item>
-    </el-form>
-    <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-column>
-    </el-table>
-    <br>
-    <h5>发生趋势</h5>
-    <div style="height: 300px">
-      <linechart
-        :autoStop="false"
-        :top="30"
-        :bottom="30"
-        :left="40"
-        :legendTop="0"
-        yAxisName="(件)"
-        :dataset="linedata1"
-        :tooltipFormat="lineTooltipFormat1"
-        :encode="[
-              { x: 'month', y: 'blacklistEvent', seriesName: '黑名单入场事件',bool:'true' },
-              { x: 'month', y: 'deckEvent', seriesName: '套牌车事件',bool:'true' },
+    <el-tabs  v-model="activeName">
+      <el-tab-pane label="事件监测" name="事件监测">
+        <el-form class="form-wrapper" :inline="true" :model="formInline">
+          <el-form-item label="停车场">
+            <el-select clearable filterable v-model="formInline.parkId" placeholder="请选择" popper-class="cur-select">
+              <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>
+            <el-button type="primary" @click="queryTable">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <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-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>
+        <br>
+        <h5>发生趋势</h5>
+        <div style="height: 300px">
+          <linechart
+            :autoStop="false"
+            :top="30"
+            :bottom="30"
+            :left="40"
+            :legendTop="0"
+            yAxisName="(件)"
+            :dataset="linedata1"
+            :tooltipFormat="lineTooltipFormat1"
+            :encode="[
+              { x: 'mouth', y: 's1', seriesName: '昨日',bool:'true' },
+              { x: 'mouth', y: 's2', seriesName: '今日',bool:'true' },
             ]"
-        id="fsqs"
-      />
-    </div>
-    <div style="height: 300px">
-        <linechart
-          :autoStop="false"
-          :top="30"
-          :bottom="30"
-          :left="40"
-          :legendTop="0"
-          yAxisName="(件)"
-          :dataset="linedata2"
-          :tooltipFormat="lineTooltipFormat2"
-          :encode="[
-              { x: 'month', y: 'blacklistEvent', seriesName: '黑名单入场事件',bool:'true' },
-              { x: 'month', y: 'deckEvent', seriesName: '套牌车事件',bool:'true' },
-              { x: 'month', y: 'customerEvent', seriesName: '客诉事件',bool:'true' },
-              { x: 'month', y: 'deviceEvent', seriesName: '设备事件',bool:'true' },
-              { x: 'month', y: 'longEvent', seriesName: '超长停车事件',bool:'true' },
-              { x: 'month', y: 'largeEvent', seriesName: '大额欠费事件',bool:'true' },
+            id="fsqs"
+          />
+        </div>
+        <div style="height: 300px">
+          <linechart
+            :autoStop="false"
+            :top="30"
+            :bottom="30"
+            :left="40"
+            :legendTop="0"
+            yAxisName="(件)"
+            :dataset="linedata2"
+            :tooltipFormat="lineTooltipFormat2"
+            :encode="[
+              { x: 'mouth', y: 's1', seriesName: '黑名单入场事件',bool:'true' },
+              { 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: 's6', seriesName: '大额欠费事件',bool:'true' },
             ]"
-          id="sxcyfzqk"
-        />
-    </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>-->
-<!--    </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>-->
+            id="sxcyfzqk"
+          />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="事件新增" name="事件新增">
+        <el-form class="form-wrapper" :inline="true" :model="formInline2">
+          <el-form-item label="停车场">
+            <el-select clearable filterable v-model="formInline2.parkId" placeholder="请选择" popper-class="cur-select">
+              <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="formInline2.eventKey" placeholder="请选择" popper-class="cur-select">
+              <el-option v-for="item in eventOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="查询日期">
+            <el-date-picker
+              clearable
+              v-model="formInline2.time"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :picker-options="{disabledDate: (time) => time.getTime() > Date.now()}"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="queryTable2">查询</el-button>
+            <el-button type="primary" @click="handleAdd">新增</el-button>
+          </el-form-item>
+        </el-form>
+        <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-column
+            label="操作"
+            width="200">
+            <template slot-scope="scope" style="display: inline-block">
+              <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="total2" @current-change="handlePageChange2"
+                         :current-page.sync="pageNum2" :page-size.sync="pageSize2">
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog :title="title"
+               :visible.sync="dialogVisible"
+               width="60%"
+               custom-class="audit-dialog">
+      <el-form label-position="right" :rules="rule" label-width="80px" :model="formLabelAlign" ref="formLabelAlign">
+        <el-form-item label="停车场" prop="parkId">
+          <el-select clearable filterable v-model="formLabelAlign.parkId" placeholder="请选择" popper-class="cur-select">
+            <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="事件类型" prop="eventKey">
+          <el-select clearable filterable v-model="formLabelAlign.eventKey" placeholder="请选择" popper-class="cur-select">
+            <el-option v-for="item in eventOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="eventBiz">
+          <el-input type="text"  maxlength="50" show-word-limit v-model="formLabelAlign.eventBiz"></el-input>
+        </el-form-item>
+        <el-form-item label="事件时间" prop="eventTime">
+          <el-date-picker
+            v-model="formLabelAlign.eventTime"
+            type="datetime"
+            placeholder="选择时间"
+            :picker-options="endPickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleConfirm('formLabelAlign')">立即创建</el-button>
+          <el-button @click="handleCancel('formLabelAlign')">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -84,6 +157,23 @@ export default {
   },
   data() {
     return {
+      title: '',
+      rule: {
+        parkId: [{ required: true, message: '请选择停车场', trigger: 'change' }],
+        eventKey: [{ required: true, message: '请输入事件类型', trigger: 'blur' }],
+        eventBiz: [{ required: true, message: '请输入备注', trigger: 'blur' }],
+        eventTime: [
+          { required: true, message: '请选择结束时间', trigger: 'change' }
+        ]
+      },
+      formLabelAlign: {
+        "parkId": '',
+        "eventKey": '',
+        "eventBiz": '',
+        "eventTime": ''
+      },
+      activeName: '事件监测',
+      eventOptions: options.eventOptions,
       districtOptions: options.districtOptions,
       carOptions: [],
       formInline: {
@@ -92,18 +182,45 @@ export default {
         streetName: '',
         parkId: '',},
       queryParams: {},
+      formInline2: {
+        eventKeyOptions: [],
+        time: [],
+        parkId: ''},
+      queryParams2: {},
       columns1: [
         {
-          label: '实时事件数',
-          key: 'liveEvents'
+          label: '停车场',
+          key: 'carParkName'
+        },
+        {
+          label: '事件类型',
+          key: 'eventKey'
         },
         {
-          label: '近日事件数',
-          key: 'recentEvents'
+          label: '备注',
+          key: 'eventBiz'
         },
         {
-          label: '历史事件数',
-          key: 'historicalEvents'
+          label: '事件时间',
+          key: 'eventTime'
+        }
+      ],
+      columns2: [
+        {
+          label: '停车场',
+          key: 'carParkName'
+        },
+        {
+          label: '事件类型',
+          key: 'eventKey'
+        },
+        {
+          label: '备注',
+          key: 'eventBiz'
+        },
+        {
+          label: '事件时间',
+          key: 'eventTime'
         }
       ],
       tableData1: [],
@@ -113,12 +230,6 @@ export default {
         {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: [{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},],
       columns: [
         {
           label: '停车场',
@@ -145,19 +256,45 @@ export default {
       total: 0,
       pageSize: 10,
       pageNum: 1,
-      radio: '2',
+      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},],
+      tableData2: [],
+      total2: 0,
+      pageSize2: 10,
+      pageNum2: 1,
       dialogVisible: false,
-      selRow: {},
-      searchWords: undefined
     }
   },
   mounted() {
     this.getParkDic()
     this.queryTable()
+    this.queryTable2()
   },
   watch: {
   },
+  computed: {
+    endPickerOptions() {
+      return {
+        disabledDate(time) {
+          // 禁止选择当前时间之后的日期和时间
+          return time.getTime() > Date.now();
+        }
+      };
+    }
+  },
   methods: {
+    deleteRow (record) {
+      api.deleteEvent([{id: record.id}]).then(res => {
+        if (res.code === 200) {
+          this.$message({type: 'success', message: '删除成功!'})
+          this.getTableData2()
+        }
+      })
+    },
     getParkDic() {
       api.parkDic().then(res => {
         this.carOptions = res.data || [];
@@ -168,6 +305,16 @@ export default {
       this.queryParams = {...this.formInline}
       this.getTableData()
     },
+    queryTable2() {
+      this.pageNum2 = 1
+      this.queryParams2 = {...this.formInline2}
+      this.getTableData2()
+    },
+    handleAdd () {
+      this.title = '添加'
+      this.formLabelAlign = {}
+      this.dialogVisible = true
+    },
     lineTooltipFormat2(params) {
       const data = params[0].data;
       return `<div class="line-tooltip">
@@ -207,11 +354,56 @@ export default {
     },
     getTableData() {
       const {pageNum, pageSize, queryParams} = this
-      // api.applyList({pageNum, pageSize, ...queryParams}).then(res => {
+      // api.applyList({current: pageNum, size: pageSize, ...queryParams}).then(res => {
       //   this.tableData = []
       //   this.total = res.data.total
       // })
     },
+
+    handlePageChange2() {
+      this.getTableData2()
+    },
+    getTableData2() {
+      const {pageNum2, pageSize2, queryParams2} = this
+      let params = {...queryParams2}
+      if (
+        this.queryParams2.time && this.queryParams2.time.length === 2 &&
+        this.queryParams2.time[1] !== ""
+      ) {
+        this.queryParams2.time[0] = this.queryParams2.time[0].substring(0, 10) + " 00:00:00";
+        this.queryParams2.time[1] = this.queryParams2.time[1].substring(0, 10) + " 23:59:59";
+        params.startEventTime= this.queryParams2.time[0]
+        params.endEventTime = this.queryParams2.time[1]
+      }
+      delete params.time
+      api.eventList({current: pageNum2, size: pageSize2, ...params}).then(res => {
+        this.tableData2 = res.data.records || []
+        this.total2 = res.data.total
+      })
+    },
+    handleCancel(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogVisible = false;
+    },
+    handleConfirm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let params = {...this.formLabelAlign}
+          api.addEvent(params).then(res => {
+            if(res.code === 200) {
+              this.dialogVisible = false
+              this.$message({
+                message: '添加成功!',
+                type: 'success'
+              })
+              this.getTableData2()
+            }
+          })
+        } else {
+          return false;
+        }
+      });
+    },
   }
 }
 </script>