sz

src/api/base/alarmInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/alarmInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/alarmInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/alarmInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/alarmInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/alarmInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/alarmInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/alarmInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/base/informationInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/informationInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/informationInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/informationInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/informationInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/informationInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/informationInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/informationInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/base/ownerInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/ownerInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/ownerInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/ownerInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/ownerInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/ownerInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/ownerInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/ownerInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/base/parkingApply.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/parkingApply/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/parkingApply/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/parkingApply/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/parkingApply/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/parkingApply/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/parkingApply/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/parkingApply/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/base/parkingInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/parkingInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/parkingInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/parkingInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/parkingInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/parkingInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/parkingInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/parkingInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/sys.js

@@ -130,6 +130,86 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
+        },
+
+
+
+        {
+                path: '/base/ownerInfo/list',
+                name: 'base-ownerInfo-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/ownerInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/parkingInfo/list',
+                name: 'base-parkingInfo-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/parkingInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/parkingApply/list',
+                name: 'base-parkingApply-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/parkingApply-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/alarmInfoFence/list',
+                name: 'base-alarmInfoFence-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/alarmInfo-fence-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/alarmInfoAlert/list',
+                name: 'base-alarmInfoAlert-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/alarmInfo-alert-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/informationInfoComplaint/list',
+                name: 'base-informationInfoComplaint-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/informationInfo-complaint-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/informationInfoWarranty/list',
+                name: 'base-informationInfoWarranty-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/informationInfo-warranty-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
         }
 ]
 

src/views/Login.vue

@@ -5,7 +5,7 @@
         <img src="../assets/logo.png" width="269" height="65"/>
       </h3>
       <el-card class="box-card">
-        <h3 class="title">电费充值管理系统</h3>
+        <h3 class="title">智慧小区管理系统</h3>
         <el-form
           class="card-box"
           autocomplete="on"

src/views/base/alarmInfo-alert-list.vue

@@ -0,0 +1,286 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">安防管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/alarmInfo">警戒报警</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="设备号" prop="deviceNo">
+    <el-input type="text" size="mini" v-model="queryModel.deviceNo"></el-input>
+</el-form-item>
+<el-form-item label="通道名称" prop="channelName">
+    <el-input type="text" size="mini" v-model="queryModel.channelName"></el-input>
+</el-form-item>
+<el-form-item label="警报标识类型" prop="alertType">
+    <el-input type="text" size="mini" v-model="queryModel.alertType"></el-input>
+</el-form-item>
+<pre></pre>
+<el-form-item label="报警时间" prop="createTime">
+    <el-date-picker
+      v-model="queryModel.createTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+		<el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
+		<el-table-column prop="deviceNo" sort-by="device_no" label="设备号" width="150"></el-table-column>
+		<el-table-column prop="channelName" sort-by="channel_name" label="通道名称" width="150"></el-table-column>
+		<el-table-column prop="alertType" sort-by="alert_type" label="警报标识类型" width="150"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<alarmInfo-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></alarmInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import AlarmInfoDetail from "./alarmInfo-detail";
+import alarmInfoApi from "@/api/base/alarmInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"deviceNo":""
+		,				"channelName":""
+		,				"alertType":""
+		,				"type":"2"
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id",self.queryModel.id);
+      formData.append("createBy",self.queryModel.createBy);
+      formData.append("createTime",self.queryModel.createTime);
+      formData.append("updateBy",self.queryModel.updateBy);
+      formData.append("updateTime",self.queryModel.updateTime);
+      formData.append("delFlag",self.queryModel.delFlag);
+      formData.append("deviceNo",self.queryModel.deviceNo);
+      formData.append("channelName",self.queryModel.channelName);
+      formData.append("alertType",self.queryModel.alertType);
+      formData.append("type",self.queryModel.type);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      alarmInfoApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        alarmInfoApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        alarmInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    },
+    handleOpenVideo(record){
+      window.open(record.videoUrl);
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "alarmInfo-detail": AlarmInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/alarmInfo-detail.vue

@@ -0,0 +1,156 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<el-form-item label="" prop="id">
+	    <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否删除" prop="delFlag">
+	    <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="设备号" prop="deviceNo">
+	    <el-input v-model="formModel.deviceNo" placeholder="请输入设备号" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="通道名称" prop="channelName">
+	    <el-input v-model="formModel.channelName" placeholder="请输入通道名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="警报标识类型" prop="alertType">
+	    <el-input v-model="formModel.alertType" placeholder="请输入警报标识类型" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="警报所属类型/1围墙/2警戒" prop="type">
+	    <el-input v-model="formModel.type" placeholder="请输入警报所属类型/1围墙/2警戒" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import alarmInfoApi from "@/api/base/alarmInfo";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    delFlag: [
+                { required: true, message: '是否删除不能为空', trigger: 'blur' }
+            ],                    deviceNo: [
+                { required: true, message: '设备号不能为空', trigger: 'blur' }
+            ],                    channelName: [
+                { required: true, message: '通道名称不能为空', trigger: 'blur' }
+            ],                    alertType: [
+                { required: true, message: '警报标识类型不能为空', trigger: 'blur' }
+            ],                    type: [
+                { required: true, message: '警报所属类型/1围墙/2警戒不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return alarmInfoApi.add(self.formModel);
+            }
+            else{
+              return alarmInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                this.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                this.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return alarmInfoApi.create()
+      }
+      else{
+        return alarmInfoApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/alarmInfo-fence-list.vue

@@ -0,0 +1,286 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">安防管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/alarmInfo">围墙报警</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="设备号" prop="deviceNo">
+    <el-input type="text" size="mini" v-model="queryModel.deviceNo"></el-input>
+</el-form-item>
+<el-form-item label="通道名称" prop="channelName">
+    <el-input type="text" size="mini" v-model="queryModel.channelName"></el-input>
+</el-form-item>
+<el-form-item label="警报标识类型" prop="alertType">
+    <el-input type="text" size="mini" v-model="queryModel.alertType"></el-input>
+</el-form-item>
+<pre></pre>
+<el-form-item label="报警时间" prop="createTime">
+    <el-date-picker
+      v-model="queryModel.createTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+		<el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
+		<el-table-column prop="deviceNo" sort-by="device_no" label="设备号" width="150"></el-table-column>
+		<el-table-column prop="channelName" sort-by="channel_name" label="通道名称" width="150"></el-table-column>
+		<el-table-column prop="alertType" sort-by="alert_type" label="警报标识类型" width="150"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<alarmInfo-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></alarmInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import AlarmInfoDetail from "./alarmInfo-detail";
+import alarmInfoApi from "@/api/base/alarmInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"deviceNo":""
+		,				"channelName":""
+		,				"alertType":""
+		,				"type":"1"
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id",self.queryModel.id);
+      formData.append("createBy",self.queryModel.createBy);
+      formData.append("createTime",self.queryModel.createTime);
+      formData.append("updateBy",self.queryModel.updateBy);
+      formData.append("updateTime",self.queryModel.updateTime);
+      formData.append("delFlag",self.queryModel.delFlag);
+      formData.append("deviceNo",self.queryModel.deviceNo);
+      formData.append("channelName",self.queryModel.channelName);
+      formData.append("alertType",self.queryModel.alertType);
+      formData.append("type",self.queryModel.type);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      alarmInfoApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        alarmInfoApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        alarmInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    },
+    handleOpenVideo(record){
+      window.open(record.videoUrl);
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "alarmInfo-detail": AlarmInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/informationInfo-complaint-list.vue

@@ -0,0 +1,300 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">物业管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/informationInfo">投诉管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="投诉人" prop="name">
+    <el-input type="text" v-model="queryModel.ownerName"></el-input>
+</el-form-item>
+<el-form-item label="提交时间" prop="createTime">
+    <el-date-picker
+      v-model="queryModel.createTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+<el-form-item label="投诉状态" prop="status">
+    <el-select  v-model="queryModel.status">
+      <el-option value="0">待回复</el-option>
+      <el-option value="1">已回复</el-option>
+      <el-option value="2">已结束</el-option>
+    </el-select>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+    <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="100"></el-table-column>
+		<el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+		<el-table-column prop="community" sort-by="community_" label="报修人房号" width="120"></el-table-column>
+		<el-table-column prop="content" sort-by="content_" label="投诉内容" width="220"></el-table-column>
+    <el-table-column prop="createTime" sort-by="create_time" label="提交时间" width="150"></el-table-column>
+		<el-table-column prop="status" sort-by="status_" label="投诉状态" width="180">
+      <template slot-scope="scope">
+          <p v-if="scope.row.status=='0'">待回复</p>
+          <p v-if="scope.row.status=='1'">已回复</p>
+          <p v-if="scope.row.status=='2'">已结束</p>
+      </template>
+    </el-table-column>
+		<el-table-column prop="returnContent" sort-by="return_content" label="回复方案" width="220"></el-table-column>
+		<el-table-column prop="returnTime" sort-by="return_time" label="回复时间" width="150"></el-table-column>
+      <el-table-column label="操作" width="180">
+        <template slot-scope="">
+          <el-button size="mini" type="success" disabled>已解决</el-button>
+          <el-button size="mini" type="danger" disabled>结束</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<informationInfo-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></informationInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import InformationInfoDetail from "./informationInfo-detail";
+import informationInfoApi from "@/api/base/informationInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"ownerId":""
+		,				"community":""
+		,				"content":""
+		,				"status":""
+		,				"returnContent":""
+		,				"returnTime":""
+		,				"type":"1"
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+formData.append("id",self.queryModel.id);
+formData.append("createBy",self.queryModel.createBy);
+formData.append("createTime",self.queryModel.createTime);
+formData.append("updateBy",self.queryModel.updateBy);
+formData.append("updateTime",self.queryModel.updateTime);
+formData.append("delFlag",self.queryModel.delFlag);
+formData.append("ownerId",self.queryModel.ownerId);
+formData.append("community",self.queryModel.community);
+formData.append("content",self.queryModel.content);
+formData.append("status",self.queryModel.status);
+formData.append("returnContent",self.queryModel.returnContent);
+formData.append("returnTime",self.queryModel.returnTime);
+formData.append("type",self.queryModel.type);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      informationInfoApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        informationInfoApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        informationInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "informationInfo-detail": InformationInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/informationInfo-detail.vue

@@ -0,0 +1,171 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<el-form-item label="" prop="id">
+	    <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否删除" prop="delFlag">
+	    <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="提交人ID" prop="ownerId">
+	    <el-input v-model="formModel.ownerId" placeholder="请输入提交人ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="所在小区" prop="community">
+	    <el-input v-model="formModel.community" placeholder="请输入所在小区" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="提交内容" prop="content">
+	    <el-input v-model="formModel.content" placeholder="请输入提交内容" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="提交状态" prop="status">
+	    <el-input v-model="formModel.status" placeholder="请输入提交状态" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="回复内容" prop="returnContent">
+	    <el-input v-model="formModel.returnContent" placeholder="请输入回复内容" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="回复时间" prop="returnTime">
+	    <el-input v-model="formModel.returnTime" placeholder="请输入回复时间" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="状态/1投诉/2报修" prop="type">
+	    <el-input v-model="formModel.type" placeholder="请输入状态/1投诉/2报修" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import informationInfoApi from "@/api/base/informationInfo";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    delFlag: [
+                { required: true, message: '是否删除不能为空', trigger: 'blur' }
+            ],                    ownerId: [
+                { required: true, message: '提交人ID不能为空', trigger: 'blur' }
+            ],                    community: [
+                { required: true, message: '所在小区不能为空', trigger: 'blur' }
+            ],                    content: [
+                { required: true, message: '提交内容不能为空', trigger: 'blur' }
+            ],                    status: [
+                { required: true, message: '提交状态不能为空', trigger: 'blur' }
+            ],                    returnContent: [
+                { required: true, message: '回复内容不能为空', trigger: 'blur' }
+            ],                    returnTime: [
+                { required: true, message: '回复时间不能为空', trigger: 'blur' }
+            ],                    type: [
+                { required: true, message: '状态/1投诉/2报修不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return informationInfoApi.add(self.formModel);
+            }
+            else{
+              return informationInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                this.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                this.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return informationInfoApi.create()
+      }
+      else{
+        return informationInfoApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/informationInfo-warranty-list.vue

@@ -0,0 +1,303 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">物业管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/informationInfo">报修管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="报修人" prop="name">
+    <el-input type="text" size="mini" v-model="queryModel.ownerName"></el-input>
+</el-form-item>
+<el-form-item label="提交时间" prop="createTime">
+    <el-date-picker
+      v-model="queryModel.createTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+<el-form-item label="报修状态" prop="status">
+    <el-select  v-model="queryModel.status">
+      <el-option value="0">待解决</el-option>
+      <el-option value="1">已解决</el-option>
+      <el-option value="2">已结束</el-option>
+    </el-select>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+    <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="100"></el-table-column>
+		<el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+		<el-table-column prop="community" sort-by="community_" label="报修人房号" width="120"></el-table-column>
+		<el-table-column prop="content" sort-by="content_" label="报修内容" width="220"></el-table-column>
+    <el-table-column prop="createTime" sort-by="create_time" label="提交时间" width="150"></el-table-column>
+		<el-table-column prop="status" sort-by="status_" label="报修状态" width="180">
+      <template slot-scope="scope">
+          <p v-if="scope.row.status=='0'">待解决</p>
+          <p v-if="scope.row.status=='1'">已解决</p>
+          <p v-if="scope.row.status=='2'">已结束</p>
+      </template>
+    </el-table-column>
+		<el-table-column prop="returnContent" sort-by="return_content" label="解决方案" width="220"></el-table-column>
+		<el-table-column prop="returnTime" sort-by="return_time" label="解决时间" width="150"></el-table-column>
+      <el-table-column label="操作" width="220">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status=='0'"><el-button size="mini" type="success" disabled>提交解决方案</el-button></span>
+          &nbsp;
+          <span v-if="scope.row.status=='2'"><el-button size="mini" type="success" disabled>已解决</el-button></span>
+          &nbsp;
+          <el-button size="mini" type="danger" disabled>结束</el-button>
+      </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<informationInfo-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></informationInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import InformationInfoDetail from "./informationInfo-detail";
+import informationInfoApi from "@/api/base/informationInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"ownerId":""
+		,				"community":""
+		,				"content":""
+		,				"status":""
+		,				"returnContent":""
+		,				"returnTime":""
+		,				"type":"2"
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+formData.append("id",self.queryModel.id);
+formData.append("createBy",self.queryModel.createBy);
+formData.append("createTime",self.queryModel.createTime);
+formData.append("updateBy",self.queryModel.updateBy);
+formData.append("updateTime",self.queryModel.updateTime);
+formData.append("delFlag",self.queryModel.delFlag);
+formData.append("ownerId",self.queryModel.ownerId);
+formData.append("community",self.queryModel.community);
+formData.append("content",self.queryModel.content);
+formData.append("status",self.queryModel.status);
+formData.append("returnContent",self.queryModel.returnContent);
+formData.append("returnTime",self.queryModel.returnTime);
+formData.append("type",self.queryModel.type);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      informationInfoApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        informationInfoApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        informationInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "informationInfo-detail": InformationInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/ownerInfo-detail.vue

@@ -0,0 +1,196 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<el-form-item label="" prop="id">
+	    <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否删除" prop="delFlag">
+	    <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="业主名称" prop="name">
+	    <el-input v-model="formModel.name" placeholder="请输入业主名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="手机号码" prop="tel">
+	    <el-input v-model="formModel.tel" placeholder="请输入手机号码" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="所在园区" prop="park">
+	    <el-input v-model="formModel.park" placeholder="请输入所在园区" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="楼栋/单元/房号" prop="building">
+	    <el-input v-model="formModel.building" placeholder="请输入楼栋/单元/房号" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="面积" prop="area">
+	    <el-input v-model="formModel.area" placeholder="请输入面积" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="入住时间" prop="checkinTime">
+	    <el-input v-model="formModel.checkinTime" placeholder="请输入入住时间" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="应缴物业费" prop="propertyCosts">
+	    <el-input v-model="formModel.propertyCosts" placeholder="请输入应缴物业费" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="卡号" prop="cardNo">
+	    <el-input v-model="formModel.cardNo" placeholder="请输入卡号" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="权限" prop="authority">
+	    <el-input v-model="formModel.authority" placeholder="请输入权限" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="车牌" prop="carNo">
+	    <el-input v-model="formModel.carNo" placeholder="请输入车牌" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否绑定门禁" prop="isAccessControl">
+	    <el-input v-model="formModel.isAccessControl" placeholder="请输入是否绑定门禁" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否绑定公众号" prop="isThePublic">
+	    <el-input v-model="formModel.isThePublic" placeholder="请输入是否绑定公众号" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import ownerInfoApi from "@/api/base/ownerInfo";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    delFlag: [
+                { required: true, message: '是否删除不能为空', trigger: 'blur' }
+            ],                    name: [
+                { required: true, message: '业主名称不能为空', trigger: 'blur' }
+            ],                    tel: [
+                { required: true, message: '手机号码不能为空', trigger: 'blur' }
+            ],                    park: [
+                { required: true, message: '所在园区不能为空', trigger: 'blur' }
+            ],                    building: [
+                { required: true, message: '楼栋/单元/房号不能为空', trigger: 'blur' }
+            ],                    area: [
+                { required: true, message: '面积不能为空', trigger: 'blur' }
+            ],                    checkinTime: [
+                { required: true, message: '入住时间不能为空', trigger: 'blur' }
+            ],                    propertyCosts: [
+                { required: true, message: '应缴物业费不能为空', trigger: 'blur' }
+            ],                    cardNo: [
+                { required: true, message: '卡号不能为空', trigger: 'blur' }
+            ],                    authority: [
+                { required: true, message: '权限不能为空', trigger: 'blur' }
+            ],                    carNo: [
+                { required: true, message: '车牌不能为空', trigger: 'blur' }
+            ],                    isAccessControl: [
+                { required: true, message: '是否绑定门禁不能为空', trigger: 'blur' }
+            ],                    isThePublic: [
+                { required: true, message: '是否绑定公众号不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return ownerInfoApi.add(self.formModel);
+            }
+            else{
+              return ownerInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                this.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                this.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return ownerInfoApi.create()
+      }
+      else{
+        return ownerInfoApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/ownerInfo-list.vue

@@ -0,0 +1,334 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">人行门禁管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/ownerInfo">业主信息管理管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="业主名称" prop="name">
+    <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+</el-form-item>
+<el-form-item label="手机号码" prop="tel">
+    <el-input type="text" size="mini" v-model="queryModel.tel"></el-input>
+</el-form-item>
+<el-form-item label="所在园区" prop="park">
+    <el-input type="text" size="mini" v-model="queryModel.park"></el-input>
+</el-form-item>
+<el-form-item label="所在楼栋" prop="park">
+    <el-input type="text" size="mini" v-model="queryModel.building"></el-input>
+</el-form-item>
+<pre></pre>
+<el-form-item label="入住时间" prop="checkinTime">
+    <el-date-picker
+      v-model="queryModel.checkinTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增业主信息</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus">批量导入</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</el-button>
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+		<el-table-column prop="name" sort-by="name_" label="业主名称" width="120"></el-table-column>
+		<el-table-column prop="tel" sort-by="tel_" label="手机号码" width="120"></el-table-column>
+		<el-table-column prop="park" sort-by="park_" label="所在园区" width="120"></el-table-column>
+		<el-table-column prop="building" sort-by="building" label="楼栋/单元/房号" width="180"></el-table-column>
+		<el-table-column prop="area" sort-by="area_" label="面积" width="100"></el-table-column>
+		<el-table-column prop="checkinTime" sort-by="checkin_time" label="入住时间" width="120"></el-table-column>
+		<el-table-column prop="propertyCosts" sort-by="property_costs" label="应缴物业费" width="120"></el-table-column>
+		<el-table-column prop="cardNo" sort-by="card_no" label="卡号" width="120"></el-table-column>
+		<el-table-column prop="authority" sort-by="authority_" label="权限" width="120"></el-table-column>
+		<el-table-column prop="carNo" sort-by="car_no" label="车牌" width="120"></el-table-column>
+		<el-table-column prop="isAccessControl" sort-by="is_access_control" :formatter="formatBoolean" label="是否绑定门禁" width="120"></el-table-column>
+		<el-table-column prop="isThePublic" sort-by="is_the_public" :formatter="formatBoolean" label="是否绑定公众号" width="120"></el-table-column>
+      <el-table-column label="操作" width="480">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" disabled @click="handleEdit(row)">修改</el-button>
+          <el-button size="mini" type="danger" disabled @click="handleDelete(row)">删除</el-button>
+          <el-button size="mini" type="success" disabled>已绑定门禁</el-button>
+          <el-button size="mini" type="success" disabled>已绑定公众号</el-button>
+          <el-button size="mini" type="success" disabled>已绑定设备</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<ownerInfo-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></ownerInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import OwnerInfoDetail from "./ownerInfo-detail";
+import ownerInfoApi from "@/api/base/ownerInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"name":""
+		,				"tel":""
+		,				"park":""
+		,				"building":""
+		,				"area":""
+		,				"checkinTime":""
+		,				"propertyCosts":""
+		,				"cardNo":""
+		,				"authority":""
+		,				"carNo":""
+		,				"isAccessControl":""
+		,				"isThePublic":""
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id",self.queryModel.id);
+      formData.append("createBy",self.queryModel.createBy);
+      formData.append("createTime",self.queryModel.createTime);
+      formData.append("updateBy",self.queryModel.updateBy);
+      formData.append("updateTime",self.queryModel.updateTime);
+      formData.append("delFlag",self.queryModel.delFlag);
+      formData.append("name",self.queryModel.name);
+      formData.append("tel",self.queryModel.tel);
+      formData.append("park",self.queryModel.park);
+      formData.append("building",self.queryModel.building);
+      formData.append("area",self.queryModel.area);
+      formData.append("checkinTime",self.queryModel.checkinTime);
+      formData.append("propertyCosts",self.queryModel.propertyCosts);
+      formData.append("cardNo",self.queryModel.cardNo);
+      formData.append("authority",self.queryModel.authority);
+      formData.append("carNo",self.queryModel.carNo);
+      formData.append("isAccessControl",self.queryModel.isAccessControl);
+      formData.append("isThePublic",self.queryModel.isThePublic);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      ownerInfoApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    formatBoolean: function (row, column, cellValue) {
+        var ret = ''  
+        if (cellValue) {
+            ret = "已绑定"  
+        } else {
+            ret = "未绑定"
+        }
+        return ret;
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        ownerInfoApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        ownerInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "ownerInfo-detail": OwnerInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/parkingApply-detail.vue

@@ -0,0 +1,156 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<el-form-item label="" prop="id">
+	    <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否删除" prop="delFlag">
+	    <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="申请车位ID" prop="parkingId">
+	    <el-input v-model="formModel.parkingId" placeholder="请输入申请车位ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="申请人ID" prop="ownerId">
+	    <el-input v-model="formModel.ownerId" placeholder="请输入申请人ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="申请类型" prop="contractType">
+	    <el-input v-model="formModel.contractType" placeholder="请输入申请类型" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="租赁时长(月)" prop="contractDuration">
+	    <el-input v-model="formModel.contractDuration" placeholder="请输入租赁时长(月)" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import parkingApplyApi from "@/api/base/parkingApply";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    delFlag: [
+                { required: true, message: '是否删除不能为空', trigger: 'blur' }
+            ],                    parkingId: [
+                { required: true, message: '申请车位ID不能为空', trigger: 'blur' }
+            ],                    ownerId: [
+                { required: true, message: '申请人ID不能为空', trigger: 'blur' }
+            ],                    contractType: [
+                { required: true, message: '申请类型不能为空', trigger: 'blur' }
+            ],                    contractDuration: [
+                { required: true, message: '租赁时长(月)不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return parkingApplyApi.add(self.formModel);
+            }
+            else{
+              return parkingApplyApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                this.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                this.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return parkingApplyApi.create()
+      }
+      else{
+        return parkingApplyApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/parkingApply-list.vue

@@ -0,0 +1,291 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">车辆道闸管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/parkingApply">车位申请</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="车位编号" prop="parkingNumber">
+    <el-input type="text" size="mini" v-model="queryModel.parkingNumber"></el-input>
+</el-form-item>
+<el-form-item label="业主名称" prop="name">
+    <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+</el-form-item>
+<el-form-item label="手机号码" prop="tel">
+    <el-input type="text" size="mini" v-model="queryModel.tel"></el-input>
+</el-form-item>
+<el-form-item label="申请类型" prop="contractType">
+    <el-input type="text" size="mini" v-model="queryModel.contractType"></el-input>
+</el-form-item>
+<pre></pre>
+<el-form-item label="申请日期" prop="checkinTime">
+    <el-date-picker
+      v-model="queryModel.effectiveTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+    <el-table-column prop="contractType" sort-by="contract_type" label="申请类型" width="120"></el-table-column>
+		<el-table-column prop="parking.parkingNumber" sort-by="parkingNumber" label="申请车位" width="120"></el-table-column>
+		<el-table-column prop="owner.carNo" sort-by="car_no" label="车牌" width="120"></el-table-column>
+    <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="120"></el-table-column>
+		<el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+    <el-table-column prop="startTime" sort-by="start_time" label="申请时间" width="150"></el-table-column>
+		<el-table-column prop="contractDuration" sort-by="contract_duration" label="租赁时长(月)" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="">
+          <el-button size="mini" type="success" disabled>已通过</el-button>
+          <el-button size="mini" type="warning" disabled>删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<parkingApply-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></parkingApply-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ParkingApplyDetail from "./parkingApply-detail";
+import parkingApplyApi from "@/api/base/parkingApply";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"parkingId":""
+		,				"ownerId":""
+		,				"contractType":""
+		,				"contractDuration":""
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+formData.append("id",self.queryModel.id);
+formData.append("createBy",self.queryModel.createBy);
+formData.append("createTime",self.queryModel.createTime);
+formData.append("updateBy",self.queryModel.updateBy);
+formData.append("updateTime",self.queryModel.updateTime);
+formData.append("delFlag",self.queryModel.delFlag);
+formData.append("parkingId",self.queryModel.parkingId);
+formData.append("ownerId",self.queryModel.ownerId);
+formData.append("contractType",self.queryModel.contractType);
+formData.append("contractDuration",self.queryModel.contractDuration);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      parkingApplyApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        parkingApplyApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        parkingApplyApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "parkingApply-detail": ParkingApplyDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/parkingInfo-detail.vue

@@ -0,0 +1,173 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<el-form-item label="" prop="id">
+	    <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否删除" prop="delFlag">
+	    <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="
+车位编号" prop="parkingNumber">
+	    <el-input v-model="formModel.parkingNumber" placeholder="请输入
+车位编号" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="车位售价" prop="parkingPrice">
+	    <el-input v-model="formModel.parkingPrice" placeholder="请输入车位售价" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="租赁价格(月)" prop="rentPrice">
+	    <el-input v-model="formModel.rentPrice" placeholder="请输入租赁价格(月)" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="合约类型" prop="contractType">
+	    <el-input v-model="formModel.contractType" placeholder="请输入合约类型" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="申请人ID" prop="ownerId">
+	    <el-input v-model="formModel.ownerId" placeholder="请输入申请人ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="生效日期" prop="effectiveTime">
+	    <el-input v-model="formModel.effectiveTime" placeholder="请输入生效日期" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="有效期" prop="expirationTime">
+	    <el-input v-model="formModel.expirationTime" placeholder="请输入有效期" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import parkingInfoApi from "@/api/base/parkingInfo";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    delFlag: [
+                { required: true, message: '是否删除不能为空', trigger: 'blur' }
+            ],                    parkingNumber: [
+                { required: true, message: '车位编号不能为空', trigger: 'blur' }
+            ],                    parkingPrice: [
+                { required: true, message: '车位售价不能为空', trigger: 'blur' }
+            ],                    rentPrice: [
+                { required: true, message: '租赁价格(月)不能为空', trigger: 'blur' }
+            ],                    contractType: [
+                { required: true, message: '合约类型不能为空', trigger: 'blur' }
+            ],                    ownerId: [
+                { required: true, message: '申请人ID不能为空', trigger: 'blur' }
+            ],                    effectiveTime: [
+                { required: true, message: '生效日期不能为空', trigger: 'blur' }
+            ],                    expirationTime: [
+                { required: true, message: '有效期不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return parkingInfoApi.add(self.formModel);
+            }
+            else{
+              return parkingInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                this.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                this.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return parkingInfoApi.create()
+      }
+      else{
+        return parkingInfoApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/parkingInfo-list.vue

@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">车辆道闸管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/parkingInfo">车位管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="业主名称" prop="name">
+    <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+</el-form-item>
+<el-form-item label="手机号码" prop="tel">
+    <el-input type="text" size="mini" v-model="queryModel.tel"></el-input>
+</el-form-item>
+<el-form-item label="车位编号" prop="parkingNumber">
+    <el-input type="text" size="mini" v-model="queryModel.parkingNumber"></el-input>
+</el-form-item>
+<el-form-item label="合约类型" prop="contractType">
+    <el-input type="text" size="mini" v-model="queryModel.contractType"></el-input>
+</el-form-item>
+<pre></pre>
+<el-form-item label="生效日期" prop="checkinTime">
+    <el-date-picker
+      v-model="queryModel.effectiveTime"
+      type="daterange"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker>
+</el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+        >查询</el-button>&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+        >重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+		<el-table-column prop="parkingNumber" sort-by="parking_number" label="车位编号" width="120"></el-table-column>
+		<el-table-column prop="parkingPrice" sort-by="parking_price" label="车位售价" width="120"></el-table-column>
+		<el-table-column prop="rentPrice" sort-by="rent_price" label="租赁价格(月)" width="120"></el-table-column>
+		<el-table-column prop="contractType" sort-by="contract_type" label="合约类型" width="120"></el-table-column>
+    <el-table-column prop="owner.carNo" sort-by="car_no" label="车牌" width="120"></el-table-column>
+    <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="120"></el-table-column>
+		<el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+		<el-table-column prop="effectiveTime" sort-by="effective_time" label="生效日期" width="180"></el-table-column>
+		<el-table-column prop="expirationTime" sort-by="expiration_time" label="有效期" width="180"></el-table-column>
+      <el-table-column label="操作" width="180">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" @click="handleEdit(row)" disabled>编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+	<parkingInfo-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></parkingInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ParkingInfoDetail from "./parkingInfo-detail";
+import parkingInfoApi from "@/api/base/parkingInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+		,				"delFlag":""
+		,				"parkingNumber":""
+		,				"parkingPrice":""
+		,				"rentPrice":""
+		,				"contractType":""
+		,				"ownerId":""
+		,				"effectiveTime":""
+		,				"expirationTime":""
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+	  self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+formData.append("id",self.queryModel.id);
+formData.append("createBy",self.queryModel.createBy);
+formData.append("createTime",self.queryModel.createTime);
+formData.append("updateBy",self.queryModel.updateBy);
+formData.append("updateTime",self.queryModel.updateTime);
+formData.append("delFlag",self.queryModel.delFlag);
+formData.append("parkingNumber",self.queryModel.parkingNumber);
+formData.append("parkingPrice",self.queryModel.parkingPrice);
+formData.append("rentPrice",self.queryModel.rentPrice);
+formData.append("contractType",self.queryModel.contractType);
+formData.append("ownerId",self.queryModel.ownerId);
+formData.append("effectiveTime",self.queryModel.effectiveTime);
+formData.append("expirationTime",self.queryModel.expirationTime);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      parkingInfoApi.pageList(formData).then(function(response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      }).catch((error)=>{
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        parkingInfoApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        parkingInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "parkingInfo-detail": ParkingInfoDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/layout/index.vue

@@ -95,7 +95,7 @@ export default {
   text-align: left;
   height: 70px !important;
   line-height:70px;
-  border-bottom: 2px solid rgb(193, 32, 26);
+  border-bottom: 2px solid rgb(36,61,162);
 }
 
 .el-header h3 {

src/views/sys/role-menu.vue

@@ -40,7 +40,7 @@ export default {
       showDialog: true,
       submitting: false
     };
-  },
+  }, 
   methods: {
     closeDialog() {
       this.$emit("close",false);
@@ -86,7 +86,7 @@ export default {
       self.relatedMenus= [];
 
       var queryData = new FormData();
-      queryData.append("limit",1000);
+      queryData.append("length",1000);
 
       menuApi.query(queryData)
         .then(response => {