sz

.env.production

@@ -1,2 +1,2 @@
-VUE_APP_BACKEND_URL=/jzcqb
-VUE_APP_IMAGE_URL=http://39.104.144.104/jzcqb-upload
+VUE_APP_BACKEND_URL=/
+VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net

src/api/base/alarmInfo.js

@@ -41,6 +41,10 @@ function batchRemove(idList){
   });
 }
 
+function queryNotify(formModel){
+  return request.post(constant.serverUrl + "/base/alarmInfo/queryNotify",formModel);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,queryNotify
 }

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

@@ -14,25 +14,15 @@
       要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 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"
@@ -50,8 +40,7 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-    </el-row>
+    <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
       style="min-height:400px;"
@@ -60,15 +49,13 @@
       @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="操作">
+      <el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
+      <el-table-column prop="message" sort-by="message_" label="报警信息" width="450"></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>
+          <el-button size="mini" disabled type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
     <el-pagination
       :current-page.sync="pageIndex"
@@ -78,12 +65,12 @@
       @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>
+    <alarmInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></alarmInfo-detail>
   </div>
 </template>
 <script>
@@ -98,18 +85,18 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"deviceNo":""
-		,				"channelName":""
-		,				"alertType":""
-		,				"type":"2"
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        deviceNo: "",
+        channelName: "",
+        alertType: "",
+        type: "2"
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -119,7 +106,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -129,7 +116,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -137,16 +124,16 @@ export default {
       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);
+      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);
@@ -156,18 +143,21 @@ export default {
         formData.append("direction", this.direction);
       }
 
-      alarmInfoApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      alarmInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -197,26 +187,28 @@ export default {
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        alarmInfoApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -248,16 +240,36 @@ export default {
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     },
-    handleOpenVideo(record){
+    handleOpenVideo(record) {
       window.open(record.videoUrl);
+    },
+    queryNotify() {
+      var self = this;
+      var formData = new FormData();
+      formData.append("type", 2);
+      alarmInfoApi.queryNotify(formData).then(function(response) {
+        var jsonData = response;
+        if (jsonData.data.result) {
+          self.$notify({
+            title: "警告",
+            message: jsonData.data.data,
+            position: "bottom-right",
+            type: "warning",
+            duration: 0
+          });
+        }
+      });
     }
   },
   mounted: function() {
     this.changePage(1);
+    window.setInterval(() => {
+      setTimeout(this.queryNotify(), 0);
+    }, 10000);
   },
   components: {
     "alarmInfo-detail": AlarmInfoDetail

src/views/base/alarmInfo-detail.vue

@@ -13,40 +13,40 @@
     @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-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>
@@ -57,31 +57,35 @@ import Constant from "@/constant";
 import alarmInfoApi from "@/api/base/alarmInfo";
 
 export default {
-  props: ["businessKey","title"],
+  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' }
-            ]              },
+        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,
@@ -90,41 +94,40 @@ export default {
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
       this.$refs["form"].validate(valid => {
         if (valid) {
-          (function(){
+          (function() {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return alarmInfoApi.add(self.formModel);
-            }
-            else{
+            } else {
               return alarmInfoApi.update(self.formModel);
             }
           })().then(function(response) {
-              var jsonData = response.data;
+            var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
 
-                this.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+              this.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
 
-                this.$emit("close",false);
-              }
-            });
+              this.$emit("close", false);
+            }
+          });
         }
       });
     }
@@ -132,25 +135,26 @@ export default {
   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;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return alarmInfoApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return alarmInfoApi.edit(self.menuId);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
+    })()
+      .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

@@ -14,25 +14,15 @@
       要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 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"
@@ -50,8 +40,7 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-    </el-row>
+    <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
       style="min-height:400px;"
@@ -60,15 +49,13 @@
       @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="操作">
+      <el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
+      <el-table-column prop="message" sort-by="message_" label="报警信息" width="450"></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>
+          <el-button size="mini" disabled type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
     <el-pagination
       :current-page.sync="pageIndex"
@@ -78,12 +65,12 @@
       @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>
+    <alarmInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></alarmInfo-detail>
   </div>
 </template>
 <script>
@@ -98,18 +85,18 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"deviceNo":""
-		,				"channelName":""
-		,				"alertType":""
-		,				"type":"1"
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        deviceNo: "",
+        channelName: "",
+        alertType: "",
+        type: "1"
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -119,7 +106,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -129,7 +116,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -137,16 +124,16 @@ export default {
       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);
+      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);
@@ -156,18 +143,21 @@ export default {
         formData.append("direction", this.direction);
       }
 
-      alarmInfoApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      alarmInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -197,26 +187,28 @@ export default {
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        alarmInfoApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -248,16 +240,36 @@ export default {
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     },
-    handleOpenVideo(record){
+    handleOpenVideo(record) {
       window.open(record.videoUrl);
+    },
+    queryNotify() {
+      var self = this;
+      var formData = new FormData();
+      formData.append("type", 1);
+      alarmInfoApi.queryNotify(formData).then(function(response) {
+        var jsonData = response;
+        if (jsonData.data.result) {
+          self.$notify({
+            title: "警告",
+            message: jsonData.data.data,
+            position: "bottom-right",
+            type: "warning",
+            duration: 0
+          });
+        }
+      });
     }
   },
   mounted: function() {
     this.changePage(1);
+    window.setInterval(() => {
+      setTimeout(this.queryNotify(), 0);
+    }, 10000);
   },
   components: {
     "alarmInfo-detail": AlarmInfoDetail

src/views/base/electricClientInfo-detail.vue

@@ -97,7 +97,7 @@ export default {
       submitting: false,
       formModel: {},
       roomInfoList: [],
-      meterInfoList:[]
+      meterInfoList: []
     };
   },
   computed: {

src/views/base/electricClientInfo-list.vue

@@ -61,32 +61,23 @@
         sortable="custom"
         width="120"
       ></el-table-column>
+      <el-table-column prop="area.name" label="园区" sortable="custom" width="120"></el-table-column>
+      <el-table-column prop="building.name" label="楼栋" sortable="custom" width="120"></el-table-column>
+      <el-table-column prop="room.name" label="房间" sortable="custom" width="120"></el-table-column>
       <el-table-column
-        prop="area.name"
-        label="园区"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="building.name"
-        label="楼栋"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="room.name"
-        label="房间"
+        prop="meterName"
+        sort-by="meter_name"
+        label="电表名称"
         sortable="custom"
         width="120"
       ></el-table-column>
       <el-table-column
-        prop="meterName"
-        sort-by="meter_name"
-        label="电表名称"
+        prop="room.useTypeN"
+        sort-by="use_type"
+        label="用电类型"
         sortable="custom"
         width="120"
       ></el-table-column>
-      <el-table-column prop="room.useTypeN" sort-by="use_type" label="用电类型" sortable="custom" width="120"></el-table-column>
       <el-table-column
         prop="electricityRemaining"
         sort-by="electricity_remaining"

src/views/base/electricMeterInfo-list.vue

@@ -16,20 +16,20 @@
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
       <el-form-item label="所属终端" prop="terminalId">
         <el-select
-            v-model="queryModel.terminalId"
-            filterable
-            remote
-            placeholder
-            :remote-method="queryTerminal"
-            style="width:300px"
-          >
-            <el-option
-              v-for="terminal in queryTerminalResult"
-              :key="terminal.id"
-              :label="terminal.name"
-              :value="terminal.id"
-            ></el-option>
-          </el-select>
+          v-model="queryModel.terminalId"
+          filterable
+          remote
+          placeholder
+          :remote-method="queryTerminal"
+          style="width:300px"
+        >
+          <el-option
+            v-for="terminal in queryTerminalResult"
+            :key="terminal.id"
+            :label="terminal.name"
+            :value="terminal.id"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button

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

@@ -14,25 +14,25 @@
       要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 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"
@@ -50,8 +50,7 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-    </el-row>
+    <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
       style="min-height:400px;"
@@ -60,22 +59,22 @@
       @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">
+      <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>
+        </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="">
+        <template slot-scope>
           <el-button size="mini" type="success" disabled>已解决</el-button>
           <el-button size="mini" type="danger" disabled>结束</el-button>
         </template>
@@ -89,12 +88,12 @@
       @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>
+    <informationInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></informationInfo-detail>
   </div>
 </template>
 <script>
@@ -109,21 +108,21 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"ownerId":""
-		,				"community":""
-		,				"content":""
-		,				"status":""
-		,				"returnContent":""
-		,				"returnTime":""
-		,				"type":"1"
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        ownerId: "",
+        community: "",
+        content: "",
+        status: "",
+        returnContent: "",
+        returnTime: "",
+        type: "1"
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -133,7 +132,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -143,7 +142,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -151,19 +150,19 @@ export default {
       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);
+      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);
@@ -173,18 +172,21 @@ formData.append("type",self.queryModel.type);
         formData.append("direction", this.direction);
       }
 
-      informationInfoApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      informationInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -214,26 +216,28 @@ formData.append("type",self.queryModel.type);
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        informationInfoApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -265,7 +269,7 @@ formData.append("type",self.queryModel.type);
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/informationInfo-detail.vue

@@ -13,49 +13,49 @@
     @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-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>
@@ -66,37 +66,44 @@ import Constant from "@/constant";
 import informationInfoApi from "@/api/base/informationInfo";
 
 export default {
-  props: ["businessKey","title"],
+  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' }
-            ]              },
+        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,
@@ -105,41 +112,40 @@ export default {
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
       this.$refs["form"].validate(valid => {
         if (valid) {
-          (function(){
+          (function() {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return informationInfoApi.add(self.formModel);
-            }
-            else{
+            } else {
               return informationInfoApi.update(self.formModel);
             }
           })().then(function(response) {
-              var jsonData = response.data;
+            var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
 
-                this.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+              this.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
 
-                this.$emit("close",false);
-              }
-            });
+              this.$emit("close", false);
+            }
+          });
         }
       });
     }
@@ -147,25 +153,26 @@ export default {
   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;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return informationInfoApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return informationInfoApi.edit(self.menuId);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
+    })()
+      .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

@@ -14,25 +14,25 @@
       要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 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"
@@ -50,8 +50,7 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-    </el-row>
+    <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
       style="min-height:400px;"
@@ -60,28 +59,32 @@
       @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">
+      <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>
+        </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>
+          <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>
+          <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>
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -92,12 +95,12 @@
       @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>
+    <informationInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></informationInfo-detail>
   </div>
 </template>
 <script>
@@ -112,21 +115,21 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"ownerId":""
-		,				"community":""
-		,				"content":""
-		,				"status":""
-		,				"returnContent":""
-		,				"returnTime":""
-		,				"type":"2"
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        ownerId: "",
+        community: "",
+        content: "",
+        status: "",
+        returnContent: "",
+        returnTime: "",
+        type: "2"
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -136,7 +139,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -146,7 +149,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -154,19 +157,19 @@ export default {
       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);
+      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);
@@ -176,18 +179,21 @@ formData.append("type",self.queryModel.type);
         formData.append("direction", this.direction);
       }
 
-      informationInfoApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      informationInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -217,26 +223,28 @@ formData.append("type",self.queryModel.type);
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        informationInfoApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -268,7 +276,7 @@ formData.append("type",self.queryModel.type);
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/ownerInfo-detail.vue

@@ -13,64 +13,64 @@
     @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-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>
@@ -81,47 +81,47 @@ import Constant from "@/constant";
 import ownerInfoApi from "@/api/base/ownerInfo";
 
 export default {
-  props: ["businessKey","title"],
+  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' }
-            ]              },
+        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,
@@ -130,41 +130,40 @@ export default {
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
       this.$refs["form"].validate(valid => {
         if (valid) {
-          (function(){
+          (function() {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return ownerInfoApi.add(self.formModel);
-            }
-            else{
+            } else {
               return ownerInfoApi.update(self.formModel);
             }
           })().then(function(response) {
-              var jsonData = response.data;
+            var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
 
-                this.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+              this.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
 
-                this.$emit("close",false);
-              }
-            });
+              this.$emit("close", false);
+            }
+          });
         }
       });
     }
@@ -172,25 +171,26 @@ export default {
   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;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return ownerInfoApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return ownerInfoApi.edit(self.menuId);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
+    })()
+      .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

@@ -14,28 +14,28 @@
       要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 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"
@@ -54,7 +54,13 @@
     </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"
+        @click="handleAdd"
+      >新增业主信息</el-button>
       <el-button type="primary" size="small" plain icon="el-icon-circle-plus">批量导入</el-button>
       <el-button
         type="primary"
@@ -74,18 +80,30 @@
       @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 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>
@@ -104,12 +122,12 @@
       @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>
+    <ownerInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></ownerInfo-detail>
   </div>
 </template>
 <script>
@@ -124,26 +142,26 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"name":""
-		,				"tel":""
-		,				"park":""
-		,				"building":""
-		,				"area":""
-		,				"checkinTime":""
-		,				"propertyCosts":""
-		,				"cardNo":""
-		,				"authority":""
-		,				"carNo":""
-		,				"isAccessControl":""
-		,				"isThePublic":""
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        name: "",
+        tel: "",
+        park: "",
+        building: "",
+        area: "",
+        checkinTime: "",
+        propertyCosts: "",
+        cardNo: "",
+        authority: "",
+        carNo: "",
+        isAccessControl: "",
+        isThePublic: ""
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -153,7 +171,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -163,7 +181,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -171,24 +189,24 @@ export default {
       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);
+      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);
@@ -198,18 +216,21 @@ export default {
         formData.append("direction", this.direction);
       }
 
-      ownerInfoApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      ownerInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -226,14 +247,14 @@ export default {
     handleReset(name) {
       this.$refs[name].resetFields();
     },
-    formatBoolean: function (row, column, cellValue) {
-        var ret = ''  
-        if (cellValue) {
-            ret = "已绑定"  
-        } else {
-            ret = "未绑定"
-        }
-        return ret;
+    formatBoolean: function(row, column, cellValue) {
+      var ret = "";
+      if (cellValue) {
+        ret = "已绑定";
+      } else {
+        ret = "未绑定";
+      }
+      return ret;
     },
     handleAdd() {
       this.modalTitle = "新增";
@@ -248,26 +269,28 @@ export default {
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        ownerInfoApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -299,7 +322,7 @@ export default {
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/parkingApply-detail.vue

@@ -13,40 +13,44 @@
     @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-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>
@@ -57,31 +61,31 @@ import Constant from "@/constant";
 import parkingApplyApi from "@/api/base/parkingApply";
 
 export default {
-  props: ["businessKey","title"],
+  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' }
-            ]              },
+        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,
@@ -90,41 +94,40 @@ export default {
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
       this.$refs["form"].validate(valid => {
         if (valid) {
-          (function(){
+          (function() {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return parkingApplyApi.add(self.formModel);
-            }
-            else{
+            } else {
               return parkingApplyApi.update(self.formModel);
             }
           })().then(function(response) {
-              var jsonData = response.data;
+            var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
 
-                this.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+              this.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
 
-                this.$emit("close",false);
-              }
-            });
+              this.$emit("close", false);
+            }
+          });
         }
       });
     }
@@ -132,25 +135,26 @@ export default {
   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;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return parkingApplyApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return parkingApplyApi.edit(self.menuId);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
+    })()
+      .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

@@ -14,28 +14,28 @@
       要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 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"
@@ -53,9 +53,7 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-
-    </el-row>
+    <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
       style="min-height:400px;"
@@ -64,15 +62,25 @@
       @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 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="">
+        <template slot-scope>
           <el-button size="mini" type="success" disabled>已通过</el-button>
           <el-button size="mini" type="warning" disabled>删除</el-button>
         </template>
@@ -86,12 +94,12 @@
       @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>
+    <parkingApply-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></parkingApply-detail>
   </div>
 </template>
 <script>
@@ -106,18 +114,18 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"parkingId":""
-		,				"ownerId":""
-		,				"contractType":""
-		,				"contractDuration":""
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        parkingId: "",
+        ownerId: "",
+        contractType: "",
+        contractDuration: ""
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -127,7 +135,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -137,7 +145,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -145,16 +153,16 @@ export default {
       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);
+      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);
@@ -164,18 +172,21 @@ formData.append("contractDuration",self.queryModel.contractDuration);
         formData.append("direction", this.direction);
       }
 
-      parkingApplyApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      parkingApplyApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -205,26 +216,28 @@ formData.append("contractDuration",self.queryModel.contractDuration);
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        parkingApplyApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -256,7 +269,7 @@ formData.append("contractDuration",self.queryModel.contractDuration);
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/parkingInfo-detail.vue

@@ -13,51 +13,51 @@
     @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="
+      <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="请输入
+          <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-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>
@@ -68,37 +68,40 @@ import Constant from "@/constant";
 import parkingInfoApi from "@/api/base/parkingInfo";
 
 export default {
-  props: ["businessKey","title"],
+  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' }
-            ]              },
+        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,
@@ -107,41 +110,40 @@ export default {
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
       this.$refs["form"].validate(valid => {
         if (valid) {
-          (function(){
+          (function() {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return parkingInfoApi.add(self.formModel);
-            }
-            else{
+            } else {
               return parkingInfoApi.update(self.formModel);
             }
           })().then(function(response) {
-              var jsonData = response.data;
+            var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
 
-                this.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+              this.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
 
-                this.$emit("close",false);
-              }
-            });
+              this.$emit("close", false);
+            }
+          });
         }
       });
     }
@@ -149,25 +151,26 @@ export default {
   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;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return parkingInfoApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return parkingInfoApi.edit(self.menuId);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
+    })()
+      .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

@@ -14,28 +14,28 @@
       要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 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"
@@ -53,8 +53,7 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-    </el-row>
+    <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
       style="min-height:400px;"
@@ -63,15 +62,15 @@
       @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 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>
@@ -86,12 +85,12 @@
       @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>
+    <parkingInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></parkingInfo-detail>
   </div>
 </template>
 <script>
@@ -106,21 +105,21 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-		,				"delFlag":""
-		,				"parkingNumber":""
-		,				"parkingPrice":""
-		,				"rentPrice":""
-		,				"contractType":""
-		,				"ownerId":""
-		,				"effectiveTime":""
-		,				"expirationTime":""
-					  },
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        parkingNumber: "",
+        parkingPrice: "",
+        rentPrice: "",
+        contractType: "",
+        ownerId: "",
+        effectiveTime: "",
+        expirationTime: ""
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -130,7 +129,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -140,7 +139,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -148,19 +147,19 @@ export default {
       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);
+      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);
@@ -170,18 +169,21 @@ formData.append("expirationTime",self.queryModel.expirationTime);
         formData.append("direction", this.direction);
       }
 
-      parkingInfoApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      parkingInfoApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          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;
@@ -211,26 +213,28 @@ formData.append("expirationTime",self.queryModel.expirationTime);
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        parkingInfoApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -262,7 +266,7 @@ formData.append("expirationTime",self.queryModel.expirationTime);
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/rechange-list.vue

@@ -55,24 +55,9 @@
         sortable="custom"
         width="120"
       ></el-table-column>
-      <el-table-column
-        prop="area.name"
-        label="园区"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="building.name"
-        label="楼栋"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="room.name"
-        label="房间"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
+      <el-table-column prop="area.name" label="园区" sortable="custom" width="120"></el-table-column>
+      <el-table-column prop="building.name" label="楼栋" sortable="custom" width="120"></el-table-column>
+      <el-table-column prop="room.name" label="房间" sortable="custom" width="120"></el-table-column>
       <el-table-column
         prop="meterName"
         sort-by="meter_name"

src/views/base/rechargeRecord-list.vue

@@ -60,24 +60,9 @@
         sortable="custom"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="area.name"
-        label="园区"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="building.name"
-        label="楼栋"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="room.name"
-        label="房间"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
+      <el-table-column prop="area.name" label="园区" sortable="custom" width="120"></el-table-column>
+      <el-table-column prop="building.name" label="楼栋" sortable="custom" width="120"></el-table-column>
+      <el-table-column prop="room.name" label="房间" sortable="custom" width="120"></el-table-column>
       <el-table-column
         prop="buyElectricity"
         sort-by="buy_electricity"
@@ -92,13 +77,7 @@
         sortable="custom"
         width="120"
       ></el-table-column>
-      <el-table-column
-        prop="buyType"
-        sort-by="buy_type"
-        label="支付类型"
-        sortable="custom"
-        width="120"
-      ></el-table-column>
+      <el-table-column prop="buyType" sort-by="buy_type" label="支付类型" sortable="custom" width="120"></el-table-column>
       <el-table-column
         prop="paymentStatus"
         sort-by="payment_status"

src/views/base/roomInfo-detail.vue

@@ -79,14 +79,14 @@ import roomInfoApi from "@/api/base/roomInfo";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 
 export default {
-  props: ["businessKey", "title","parentId"],
+  props: ["businessKey", "title", "parentId"],
   data() {
     var validateUseType = (rule, value, callback) => {
-        if(this.formModel.type == 3 && value==='') {
-          callback(new Error('用电类型不能为空!'));
-        } else {
-          callback();
-        }
+      if (this.formModel.type == 3 && value === "") {
+        callback(new Error("用电类型不能为空!"));
+      } else {
+        callback();
+      }
     };
 
     return {
@@ -99,9 +99,7 @@ export default {
             trigger: "change"
           }
         ],
-        useType: [
-          { validator: validateUseType, trigger: "blur" }
-        ],
+        useType: [{ validator: validateUseType, trigger: "blur" }],
         sortNo: [{ required: true, message: "排序号不能为空", trigger: "blur" }]
       },
       roomInfoList: [],
@@ -123,11 +121,11 @@ export default {
 
       var roomMap = {};
 
-      self.roomInfoList.forEach((room)=>{
+      self.roomInfoList.forEach(room => {
         roomMap[room.id] = room;
       });
 
-      for(var key in roomMap){
+      for (var key in roomMap) {
         list.push(roomMap[key]);
       }
 
@@ -160,8 +158,8 @@ export default {
               });
 
               self.$emit("close", {
-                result : true,
-                data : jsonData.data
+                result: true,
+                data: jsonData.data
               });
             } else {
               self.$message({
@@ -170,7 +168,7 @@ export default {
               });
 
               self.$emit("close", {
-                result : false
+                result: false
               });
             }
           });
@@ -228,7 +226,7 @@ export default {
   async mounted() {
     var self = this;
     self.loading = true;
-    
+
     await this.queryUseType("d18b7e03-63ed-4d86-b2b3-b93a7de2673b");
     await this.queryRoomInfo("");
 
@@ -242,7 +240,7 @@ export default {
       .then(response => {
         var jsonData = response.data;
         self.loading = false;
-        
+
         if (jsonData.result) {
           self.formModel = jsonData.data;
 

src/views/base/roomInfo-list.vue

@@ -25,7 +25,7 @@
         icon="el-icon-circle-plus"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
-      >删除选中项</el-button> -->
+      >删除选中项</el-button>-->
     </el-row>
     <el-table
       :data="tableData"
@@ -57,9 +57,12 @@
       <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
-          <el-button size="mini" type="primary" @click="handleAdd(row)" v-show="row.type!=3">
-              {{row.type==1 ? "添加楼栋" : "添加房间"}}
-          </el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            @click="handleAdd(row)"
+            v-show="row.type!=3"
+          >{{row.type==1 ? "添加楼栋" : "添加房间"}}</el-button>
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
         </template>
@@ -111,9 +114,9 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      operation:'',
+      operation: "",
       businessKey: "",
-      selectedRecord : null
+      selectedRecord: null
       //loadNodeMap: new Map()
     };
   },
@@ -122,7 +125,7 @@ export default {
       if (row != null) {
         const id = row.id;
         var formData = new FormData();
-        
+
         formData.append("parentId", id);
         // const pid = tree.id;
         // this.loadNodeMap.set(pid, { tree, treeNode, resolve });
@@ -201,10 +204,9 @@ export default {
       this.operation = "add";
       this.businessKey = "";
 
-      if(record!=null){
+      if (record != null) {
         this.selectedRecord = record;
-      }
-      else{
+      } else {
         this.selectedRecord = {};
       }
 
@@ -217,40 +219,40 @@ export default {
       this.selectedRecord = record;
       this.showModal = true;
     },
-    loopDelete(list,id){
+    loopDelete(list, id) {
       var rs = false;
 
-      for(var i=0;i<list.length;i++){
-        if(list[i].id == id){
-          list.splice(i,1);
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].id == id) {
+          list.splice(i, 1);
           rs = true;
           break;
         }
 
-        if(list[i].children!=null){
-          rs = this.loopDelete(list[i].children,id);
+        if (list[i].children != null) {
+          rs = this.loopDelete(list[i].children, id);
 
-          if(rs){
+          if (rs) {
             break;
           }
         }
       }
 
       return rs;
-    },    
-    loopFind(list,id){
+    },
+    loopFind(list, id) {
       var rs = null;
 
-      for(var i=0;i<list.length;i++){
-        if(list[i].id == id){
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].id == id) {
           rs = list[i];
           break;
         }
 
-        if(list[i].children!=null){
-          rs = this.loopFind(list[i].children,id);
+        if (list[i].children != null) {
+          rs = this.loopFind(list[i].children, id);
 
-          if(rs!=null){
+          if (rs != null) {
             break;
           }
         }
@@ -261,7 +263,8 @@ export default {
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
+      self
+        .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -271,7 +274,7 @@ export default {
             var jsonData = response.data;
 
             if (jsonData.result) {
-              var rs = self.loopDelete(self.tableData,record.id);
+              var rs = self.loopDelete(self.tableData, record.id);
 
               self.$message({
                 type: "success",
@@ -314,34 +317,32 @@ export default {
       if (retObj.result) {
         var retData = retObj.data;
 
-        if(this.operation=="edit"){
+        if (this.operation == "edit") {
           this.selectedRecord.name = retData.name;
           this.selectedRecord.number = retData.number;
           this.selectedRecord.type = retData.type;
           this.selectedRecord.useType = retData.useType;
           this.selectedRecord.sortNo = retData.sortNo;
 
-          if(this.selectedRecord.parentId != retData.parentId){
-            this.loopDelete(this.tableData,this.selectedRecord.id);
+          if (this.selectedRecord.parentId != retData.parentId) {
+            this.loopDelete(this.tableData, this.selectedRecord.id);
 
-            var parent = this.loopFind(this.tableData,retData.parentId);
+            var parent = this.loopFind(this.tableData, retData.parentId);
 
-            if(parent!=null){
-              if(parent.children==null){
-                parent.children = []
+            if (parent != null) {
+              if (parent.children == null) {
+                parent.children = [];
               }
 
               parent.children.push(retData);
             }
           }
-        }
-        else if(this.operation=="add"){
-          if(this.selectedRecord.id==null){
+        } else if (this.operation == "add") {
+          if (this.selectedRecord.id == null) {
             console.log("tableData.push");
             this.tableData.push(retData);
-          }
-          else{
-            if(this.selectedRecord.children==null){
+          } else {
+            if (this.selectedRecord.children == null) {
               this.selectedRecord.children = [];
             }
 

src/views/base/terminalInfo-detail.vue

@@ -39,7 +39,9 @@ export default {
   data() {
     return {
       ruleValidate: {
-        name: [{ required: true, message: "终端名称不能为空", trigger: "blur" }],
+        name: [
+          { required: true, message: "终端名称不能为空", trigger: "blur" }
+        ],
         sortNo: [{ required: true, message: "排序号不能为空", trigger: "blur" }]
       },
       showDialog: true,