合并

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -18,10 +18,11 @@
         tp_building_owner_info
         <where>
             <if test="ownerName != null and ownerName != ''" >
-                AND owner_name = #{ownerName,jdbcType=VARCHAR}
+                AND owner_name like concat('%',#{ownerName,jdbcType=VARCHAR},'%')
+
             </if>
             <if test="ownerTel != null and ownerTel != ''" >
-                AND  owner_tel = #{ownerTel,jdbcType=VARCHAR}
+                AND owner_tel like concat('%',#{ownerTel,jdbcType=VARCHAR},'%')
             </if>
             <if test="VerifyStatus == 1 and VerifyStatus != ''" >
                 AND  verify_status = #{VerifyStatus,jdbcType=VARCHAR}

VUECODE/smart-operate-manage/src/components/chart/chart4.vue

@@ -1,23 +1,8 @@
 <template>
-  <div id="node4">
+  <div id="node4" v-if="showPage">
     <div class="top-title">已合作社区分布图</div>
-    <el-amap
-      ref="map"
-      :center="mapCenter"
-      :zoom="7"
-      :map-style="setMapStyle"
-      vid="amapDemo"
-      class="amap-demo"
-    >
-      <el-amap-marker
-        v-for="(item,index) in markers"
-        :key="index"
-        :position="item.position"
-        :icon="item.icon"
-        :title="item.title"
-        :offset="item.offset"
-        :content="item.content"
-      />
+    <el-amap ref="map" :center="mapCenter" :zoom="12" :map-style="setMapStyle" vid="amapDemo" class="amap-demo">
+      <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item.position" :icon="item.icon" :title="item.title" :offset="item.offset" :content="item.content" />
     </el-amap>
   </div>
 </template>
@@ -25,74 +10,75 @@
 <script>
 // import G2 from '@antv/g2'
 // import DataSet from '@antv/data-set'
-import $ from 'jquery'
+import $ from "jquery";
 // import AMapUI from 'AMapUI'
-import light1 from '@/assets/light1.png'
-import light2 from '@/assets/light2.png'
-import light3 from '@/assets/light3.png'
-import light4 from '@/assets/light4.png'
+import light1 from "@/assets/light1.png";
+import light2 from "@/assets/light2.png";
+import light3 from "@/assets/light3.png";
+import light4 from "@/assets/light4.png";
+import { mapState, mapActions } from "vuex";
 export default {
   data() {
     return {
+      showPage: false,
       light1,
       light2,
       light3,
       light4,
-      markers: [{
-        position: [118.633516, 32.069878],
-        title: '悦见山',
-        offset: [-60, -60],
-        content: `<div class='point'>
-        <img src='${light1}'>
-        <span>悦见山</span>
-        </div>`
-      }, {
-        position: [117.161777, 34.154014],
-        title: '致享城',
-        offset: [-60, -60],
-        content: `<div class='point'>
-        <img src='${light2}'>
-        <span>致享城</span>
-        </div>`
-      }, {
-        position: [118.753086, 31.972501],
-        title: '智慧社区',
-        offset: [-60, -60],
-        content: `<div class='point'>
-        <img src='${light3}'>
-        <span>智慧社区</span>
-        </div>`
-      }, {
-        position: [120.064082, 30.343891],
-        title: '云谷天境',
-        offset: [-60, -60],
-        content: `<div class='point'>
-        <img src='${light4}'>
-        <span>云谷天境</span>
-        </div>`
-      }],
+      markers: [],
       mapCenter: [118.753086, 31.972501],
-      setMapStyle: 'amap://styles/blue'
-    }
+      setMapStyle: "amap://styles/blue"
+    };
+  },
+  computed: {
+    ...mapState("community", {
+      list: s => s.list
+    })
   },
   mounted() {
-    setInterval(() => {
-      this.rander()
-    }, 1600)
+    this.FetchCommunityList({ pageNum: 1, pageSize: 10000 }).then(() => {
+      this.showPage = true;
+      let i = 0;
+      let arr = [this.light1, this.light2, this.light3, this.light4];
+      this.list.forEach(item => {
+        item.position = [];
+        item.position.push(item.longitude);
+        item.position.push(item.latitude);
+        item.title = item.communityName;
+        item.offset = [-60, -60];
+        item.content = `<div class='point'>
+        <img src='${arr[i]}'>
+        <span>${item.communityName}</span>
+        </div>`;
+        if (i < 3) {
+          i++;
+        } else {
+          i = 0;
+        }
+      });
+      console.log(this.list)
+      this.markers = this.list
+      setInterval(() => {
+        this.rander();
+      }, 1600);
+    });
   },
   methods: {
+    ...mapActions("community", ["FetchCommunityList"]),
     rander() {
-      $('.point img').animate({ opacity: 0 }, 800).animate({ opacity: 1 }, 800)
+      $(".point img")
+        .animate({ opacity: 0 }, 800)
+        .animate({ opacity: 1 }, 800);
     }
   }
-}
+};
 </script>
 
 <style lang="scss">
-#node4{
+#node4 {
   border-radius: 5px;
 }
-.top-title{
+.top-title {
   width: 100%;
   position: absolute;
   top: 0;
@@ -100,24 +86,24 @@ export default {
   text-align: center;
   margin-top: 30px;
   z-index: 20;
-  color: #A6B9C8;
+  color: #a6b9c8;
   font-size: 18px;
 }
-.point{
+.point {
   position: relative;
   width: 120px;
   height: 120px;
-  img{
+  img {
     position: absolute;
     top: 50%;
     left: 50%;
-    transform: translate(-50%,-50%);
+    transform: translate(-50%, -50%);
   }
-  span{
+  span {
     position: absolute;
     top: 80%;
     left: 50%;
-    transform: translate(-50%,-50%);
+    transform: translate(-50%, -50%);
     font-size: 12px;
     color: white;
   }

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -1,36 +1,24 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="listQuery.communityId" placeholder="社区编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <el-input v-model="listQuery.communityName" placeholder="社区名称" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-input v-model="listQuery.communityId" placeholder="社区编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
+      <el-input v-model="listQuery.communityName" placeholder="社区名称" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
       <el-select v-model="listQuery.provinceId" placeholder="省" style="width: 90px" class="filter-item" @change="getCityList">
-        <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id"/>
+        <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id" />
       </el-select>
       <el-select v-model="listQuery.cityId" placeholder="市" class="filter-item" style="width: 130px" @change="getDistrictList">
-        <el-option v-for="item in cityList" :key="item.id" :label="item.city" :value="item.id"/>
+        <el-option v-for="item in cityList" :key="item.id" :label="item.city" :value="item.id" />
       </el-select>
       <el-select v-model="listQuery.districtId" placeholder="区县乡" class="filter-item" style="width: 130px">
-        <el-option v-for="item in districtList" :key="item.id" :label="item.district" :value="item.id"/>
+        <el-option v-for="item in districtList" :key="item.id" :label="item.district" :value="item.id" />
       </el-select>
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-circle-plus" @click="handleCreate">添加</el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
     </div>
 
-    <el-table
-      v-loading="listLoading"
-      :key="tableKey"
-      :data="list"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%; margin-top: 20px;"
-      @sort-change="sortChange">
-      <el-table-column
-        label="序号"
-        align="center"
-        type="index"
-        width="50"/>
+    <el-table v-loading="listLoading" :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%; margin-top: 20px;" @sort-change="sortChange">
+      <el-table-column label="序号" align="center" type="index" width="50" />
       <el-table-column label="社区编号" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
@@ -94,57 +82,42 @@
     </el-table>
 
     <!-- <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 20, 30]" @pagination="getList" /> -->
-    <el-pagination
-      :total="total"
-      :current-page="listQuery.pageNum"
-      :page-sizes="[5, 10, 20, 30]"
-      :page-size="listQuery.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
+    <el-pagination :total="total" :current-page="listQuery.pageNum" :page-sizes="[5, 10, 20, 30]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="detail" label-position="left" label-width="100px" style="margin-left:50px;">
         <el-form-item label="社区名称*">
-          <el-input v-model="detail.communityName"/>
+          <el-input v-model="detail.communityName" />
         </el-form-item>
         <el-form-item label="社区别名">
-          <el-input v-model="detail.communityAlias"/>
+          <el-input v-model="detail.communityAlias" />
         </el-form-item>
         <el-form-item label="所在区县*">
-          <el-select v-model="detail.provinceId" placeholder="省" style="width: 90px" class="filter-item" @change="getEditCityList">
-            <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id"/>
+          <el-select v-model="detail.provinceId" placeholder="省" style="width: 90px" class="filter-item" @change="getEditCityList" @blur="changeCity()">
+            <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id" />
           </el-select>
-          <el-select v-model="detail.cityId" placeholder="市" class="filter-item" style="width: 130px" @change="getEditDistrictList">
-            <el-option v-for="item in editCityList" :key="item.id" :label="item.city" :value="item.id"/>
+          <el-select v-model="detail.cityId" placeholder="市" class="filter-item" style="width: 130px" @change="getEditDistrictList" @blur="changeDistrictList()">
+            <el-option v-for="item in editCityList" :key="item.id" :label="item.city" :value="item.id" />
           </el-select>
           <el-select v-model="detail.districtId" placeholder="区县乡" class="filter-item" style="width: 130px">
-            <el-option v-for="item in editDistrictList" :key="item.id" :label="item.district" :value="item.id"/>
+            <el-option v-for="item in editDistrictList" :key="item.id" :label="item.district" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="高德坐标*">
-          <el-input
-            v-model="detail.longitude"
-            placeholder="经度"/>
-          <el-input
-            v-model="detail.latitude"
-            placeholder="纬度"/>
+          <el-input v-model="detail.longitude" placeholder="经度" />
+          <el-input v-model="detail.latitude" placeholder="纬度" />
         </el-form-item>
         <!-- <el-amap-search-box class="search-box" :search-option="searchOption" :on-search-result="onSearchResult"></el-amap-search-box> -->
         <div style="width:100%;height:200px;">
-          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo" >
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
             <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
           </el-amap>
         </div>
         <el-form-item label="管理员姓名*">
-          <el-input
-            v-model="detail.userName"
-            placeholder="建议先填写运营人员姓名"/>
+          <el-input v-model="detail.userName" placeholder="建议先填写运营人员姓名" />
         </el-form-item>
         <el-form-item label="管理员账号*">
-          <el-input
-            v-model="detail.loginName"
-            placeholder="建议先填写运营人员手机号"/>
+          <el-input v-model="detail.loginName" placeholder="建议先填写运营人员手机号" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -170,7 +143,7 @@
         </el-form-item>
         <!-- <el-amap-search-box class="search-box" :search-option="searchOption" :on-search-result="onSearchResult"></el-amap-search-box> -->
         <div style="width:100%;height:200px;">
-          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo" >
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
             <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
           </el-amap>
         </div>
@@ -189,8 +162,8 @@
 
     <el-dialog :visible.sync="dialogPvVisible" title="Reading statistics">
       <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
-        <el-table-column prop="key" label="Channel"/>
-        <el-table-column prop="pv" label="Pv"/>
+        <el-table-column prop="key" label="Channel" />
+        <el-table-column prop="pv" label="Pv" />
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogPvVisible = false">确 定</el-button>
@@ -201,54 +174,54 @@
 </template>
 
 <script>
-import { mapState, mapActions, mapMutations } from 'vuex'
-import waves from '@/directive/waves' // Waves directive
-import { parseTime } from '@/utils'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import { mapState, mapActions, mapMutations } from "vuex";
+import waves from "@/directive/waves"; // Waves directive
+import { parseTime } from "@/utils";
+import Pagination from "@/components/Pagination"; // Secondary package based on el-pagination
 
 const calendarTypeOptions = [
-  { key: 'CN', display_name: 'China' },
-  { key: 'US', display_name: 'USA' },
-  { key: 'JP', display_name: 'Japan' },
-  { key: 'EU', display_name: 'Eurozone' }
-]
+  { key: "CN", display_name: "China" },
+  { key: "US", display_name: "USA" },
+  { key: "JP", display_name: "Japan" },
+  { key: "EU", display_name: "Eurozone" }
+];
 
 // arr to obj ,such as { CN : "China", US : "USA" }
 const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name
-  return acc
-}, {})
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: 'ComplexTable',
+  name: "ComplexTable",
   components: { Pagination },
   directives: { waves },
   filters: {
     statusFilter(status) {
       const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
+        published: "success",
+        draft: "info",
+        deleted: "danger"
+      };
+      return statusMap[status];
     },
     typeFilter(type) {
-      return calendarTypeKeyValue[type]
+      return calendarTypeKeyValue[type];
     }
   },
   data() {
-    var _self = this
+    var _self = this;
     return {
       events: {
-        click: (e) => {
+        click: e => {
           // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
-          _self.detail.longitude = e.lnglat.lng
-          _self.detail.latitude = e.lnglat.lat
+          _self.detail.longitude = e.lnglat.lng;
+          _self.detail.latitude = e.lnglat.lat;
         }
       },
       markers: [],
       searchOption: {
-        city: '南京',
+        city: "南京",
         citylimit: false
       },
       mapCenter: [118.789509, 32.019989],
@@ -265,28 +238,42 @@ export default {
       },
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
-      sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
-      statusOptions: ['published', 'draft', 'deleted'],
+      sortOptions: [
+        { label: "ID Ascending", key: "+id" },
+        { label: "ID Descending", key: "-id" }
+      ],
+      statusOptions: ["published", "draft", "deleted"],
       showReviewer: false,
       dialogFormVisible: false,
       dialogLookFormVisible: false,
-      dialogStatus: '',
+      dialogStatus: "",
       textMap: {
-        update: '编辑',
-        create: '新增'
+        update: "编辑",
+        create: "新增"
       },
       dialogPvVisible: false,
       pvData: [],
       rules: {
-        type: [{ required: true, message: 'type is required', trigger: 'change' }],
-        createData: [{ type: 'date', required: true, message: 'createData is required', trigger: 'change' }],
-        title: [{ required: true, message: 'title is required', trigger: 'blur' }]
+        type: [
+          { required: true, message: "type is required", trigger: "change" }
+        ],
+        createData: [
+          {
+            type: "date",
+            required: true,
+            message: "createData is required",
+            trigger: "change"
+          }
+        ],
+        title: [
+          { required: true, message: "title is required", trigger: "blur" }
+        ]
       },
       downloadLoading: false
-    }
+    };
   },
   computed: {
-    ...mapState('community', {
+    ...mapState("community", {
       list: s => s.list,
       detail: s => s.detail,
       total: s => s.total,
@@ -297,269 +284,325 @@ export default {
       editDistrictList: s => s.editDistrictList
     })
   },
+  // watch: {
+  //   detail: {
+  //     handler(New, Old) {
+  //       if (New.provinceId != Old.provinceId) {
+  //         this.detail.cityId = undefined;
+  //         this.detail.districtId = undefined;
+  //       }
+  //       if (New.cityId != Old.cityId) {
+  //         this.detail.districtId = undefined;
+  //       }
+  //     },
+  //     deep: true
+  //   }
+  // },
   created() {
-    this.getList()
-    this.getProvinceList()
+    this.getList();
+    this.getProvinceList();
   },
   methods: {
-    ...mapMutations('community', {
-      resetDetail: 'resetDetail',
-      setDetail: 'setDetail'
+    ...mapMutations("community", {
+      resetDetail: "resetDetail",
+      setDetail: "setDetail"
     }),
-    ...mapActions('community', [
-      'FetchCommunityList',
-      'CreateCommunity',
-      'UpdateCommunity',
-      'FetchProvinceList',
-      'FetchCityList',
-      'FetchDistrictList',
-      'FetchEditCityList',
-      'FetchEditDistrictList'
+    ...mapActions("community", [
+      "FetchCommunityList",
+      "CreateCommunity",
+      "UpdateCommunity",
+      "FetchProvinceList",
+      "FetchCityList",
+      "FetchDistrictList",
+      "FetchEditCityList",
+      "FetchEditDistrictList"
     ]),
-    onSearchResult(pois) { // 搜索地图
-      let latSum = 0
-      let lngSum = 0
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0;
+      let lngSum = 0;
       if (pois.length > 0) {
         pois.forEach(poi => {
-          const { lng, lat } = poi
-          lngSum += lng
-          latSum += lat
-          this.markers.push([poi.lng, poi.lat])
-        })
+          const { lng, lat } = poi;
+          lngSum += lng;
+          latSum += lat;
+          this.markers.push([poi.lng, poi.lat]);
+        });
         const center = {
           lng: lngSum / pois.length,
           lat: latSum / pois.length
-        }
-        this.mapCenter = [center.lng, center.lat]
+        };
+        this.mapCenter = [center.lng, center.lat];
       }
     },
     setCurrent(item) {
-      this.setDetail({ ...item })
+      this.setDetail({ ...item });
     },
     getList() {
-      this.listLoading = true
-      this.FetchCommunityList(this.listQuery).then(() => {
-        this.listLoading = false
-      }).catch(() => {
-        this.loading = false
-        console.log('get list error')
-      })
+      this.listLoading = true;
+      this.FetchCommunityList(this.listQuery)
+        .then(() => {
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          console.log("get list error");
+        });
     },
     getProvinceList() {
-      this.FetchProvinceList().then(() => {
-      }).catch(() => {
-        console.log('get list error')
-      })
+      this.FetchProvinceList()
+        .then(() => {})
+        .catch(() => {
+          console.log("get list error");
+        });
     },
     getCityList() {
-      this.listQuery.cityId = undefined
-      this.listQuery.districtId = undefined
-      this.FetchCityList(this.listQuery.provinceId).then(() => {
-      }).catch(() => {
-        console.log('get list error')
-      })
+      this.listQuery.cityId = undefined;
+      this.listQuery.districtId = undefined;
+      this.FetchCityList(this.listQuery.provinceId)
+        .then(() => {})
+        .catch(() => {
+          console.log("get list error");
+        });
     },
     getDistrictList() {
-      this.listQuery.districtId = undefined
-      this.FetchDistrictList(this.listQuery.cityId).then(() => {
-      }).catch(() => {
-        console.log('get list error')
-      })
+      this.listQuery.districtId = undefined;
+      this.FetchDistrictList(this.listQuery.cityId)
+        .then(() => {})
+        .catch(() => {
+          console.log("get list error");
+        });
     },
     getEditCityList() {
-      this.FetchEditCityList(this.detail.provinceId).then(() => {
-      }).catch(() => {
-        console.log('get list error')
-      })
+      this.FetchEditCityList(this.detail.provinceId)
+        .then(() => {})
+        .catch(() => {
+          console.log("get list error");
+        });
+    },
+    changeCity() {
+      console.log(1);
+      // this.detail.cityId = undefined;
+      // this.detail.districtId = undefined;
+      this.$set(this.detail,"cityId", undefined)
+      this.$set(this.detail,"districtId", undefined)
+      this.setDetail(this.detail);
+    },
+    changeDistrictList() {
+      console.log(2);
+      // this.detail.districtId = undefined;
+      this.$set(this.detail,"districtId", undefined)
+      this.setDetail(this.detail);
     },
     getEditDistrictList() {
-      this.FetchEditDistrictList(this.detail.cityId).then(() => {
-      }).catch(() => {
-        console.log('get list error')
-      })
+      this.FetchEditDistrictList(this.detail.cityId)
+        .then(() => {})
+        .catch(() => {
+          console.log("get list error");
+        });
     },
     clearListQuery() {
-      this.listQuery.pageNum = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.communityId = undefined
-      this.listQuery.communityName = undefined
-      this.listQuery.provinceId = undefined
-      this.listQuery.cityId = undefined
-      this.listQuery.districtId = undefined
-      this.getList()
+      this.listQuery.pageNum = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.communityId = undefined;
+      this.listQuery.communityName = undefined;
+      this.listQuery.provinceId = undefined;
+      this.listQuery.cityId = undefined;
+      this.listQuery.districtId = undefined;
+      this.getList();
     },
     handleFilter() {
-      this.listQuery.pageNum = 1
-      this.getList()
+      this.listQuery.pageNum = 1;
+      this.getList();
     },
     handleModifyStatus(row, status) {
       this.$message({
-        message: '操作成功',
-        type: 'success'
-      })
-      row.status = status
+        message: "操作成功",
+        type: "success"
+      });
+      row.status = status;
     },
     sortChange(data) {
-      const { prop, order } = data
-      if (prop === 'id') {
-        this.sortByID(order)
+      const { prop, order } = data;
+      if (prop === "id") {
+        this.sortByID(order);
       }
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.listQuery.pageSize = val
-      this.getList()
+      this.listQuery.pageSize = val;
+      this.getList();
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.listQuery.pageNum = val
-      this.getList()
+      this.listQuery.pageNum = val;
+      this.getList();
     },
     sortByID(order) {
-      if (order === 'ascending') {
-        this.listQuery.sort = '+id'
+      if (order === "ascending") {
+        this.listQuery.sort = "+id";
       } else {
-        this.listQuery.sort = '-id'
+        this.listQuery.sort = "-id";
       }
-      this.handleFilter()
+      this.handleFilter();
     },
     createData() {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs["dataForm"].validate(valid => {
         if (valid) {
-          this.CreateCommunity(this.detail).then((res) => {
-            this.dialogFormVisible = false
-            if (res.code === '0') {
+          this.CreateCommunity(this.detail).then(res => {
+            this.dialogFormVisible = false;
+            if (res.code === 0) {
               this.$message({
-                message: '创建成功',
-                type: 'success'
-              })
-              this.getList()
-            } else if (res.code === '1') {
+                message: "创建成功",
+                type: "success"
+              });
+              this.getList();
+            } else if (res.code === 0) {
               this.$message({
                 message: res.message,
-                type: 'warning'
-              })
+                type: "warning"
+              });
             }
-          })
+          });
         }
-      })
+      });
     },
     handleUpdate(row) {
-      this.setCurrent(row)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
+      this.setCurrent(row);
+      this.dialogStatus = "update";
+      this.dialogFormVisible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.getEditCityList()
-      this.getEditDistrictList()
+        this.$refs["dataForm"].clearValidate();
+      });
+      this.getEditCityList();
+      this.getEditDistrictList();
     },
     handleLook(row) {
-      this.setCurrent(row)
-      this.dialogLookFormVisible = true
+      this.setCurrent(row);
+      this.dialogLookFormVisible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.getEditCityList()
-      this.getEditDistrictList()
+        this.$refs["dataForm"].clearValidate();
+      });
+      this.getEditCityList();
+      this.getEditDistrictList();
     },
     handleCreate() {
-      this.resetDetail()
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
+      this.resetDetail();
+      this.dialogStatus = "create";
+      this.dialogFormVisible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
+        this.$refs["dataForm"].clearValidate();
+      });
     },
     updateData() {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs["dataForm"].validate(valid => {
         if (valid) {
-          this.UpdateCommunity(this.detail).then((res) => {
-            this.dialogFormVisible = false
-            if (res.code === '0') {
+          this.UpdateCommunity(this.detail).then(res => {
+            this.dialogFormVisible = false;
+            if (res.code === 0) {
               this.$message({
-                message: '更新成功',
-                type: 'success'
-              })
-              this.getList()
-            } else if (res.code === '1') {
-              this.$message.error(res.message)
+                message: "更新成功",
+                type: "success"
+              });
+              this.getList();
+            } else if (res.code === 0) {
+              this.$message.error(res.message);
             }
-          })
+          });
         }
-      })
+      });
     },
     handleDelete(row) {
       this.$notify({
-        title: '成功',
-        message: '删除成功',
-        type: 'success',
+        title: "成功",
+        message: "删除成功",
+        type: "success",
         duration: 2000
-      })
-      const index = this.list.indexOf(row)
-      this.list.splice(index, 1)
+      });
+      const index = this.list.indexOf(row);
+      this.list.splice(index, 1);
     },
     handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
+      this.downloadLoading = true;
+      import("@/vendor/Export2Excel").then(excel => {
+        const tHeader = ["timestamp", "title", "type", "importance", "status"];
+        const filterVal = [
+          "timestamp",
+          "title",
+          "type",
+          "importance",
+          "status"
+        ];
+        const data = this.formatJson(filterVal, this.list);
         excel.export_json_to_excel({
           header: tHeader,
           data,
-          filename: 'table-list'
-        })
-        this.downloadLoading = false
-      })
+          filename: "table-list"
+        });
+        this.downloadLoading = false;
+      });
     },
     padDate(value) {
-      value = value < 10 ? '0' + value : value
-      return value
+      value = value < 10 ? "0" + value : value;
+      return value;
     },
     formatDate(val) {
-      var value = new Date(val)
-      var year = value.getFullYear()
-      var month = this.padDate(value.getMonth() + 1)
-      var day = this.padDate(value.getDate())
-      var hour = this.padDate(value.getHours())
-      var minutes = this.padDate(value.getMinutes())
-      var seconds = this.padDate(value.getSeconds())
-      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      var value = new Date(val);
+      var year = value.getFullYear();
+      var month = this.padDate(value.getMonth() + 1);
+      var day = this.padDate(value.getDate());
+      var hour = this.padDate(value.getHours());
+      var minutes = this.padDate(value.getMinutes());
+      var seconds = this.padDate(value.getSeconds());
+      return (
+        year +
+        "-" +
+        month +
+        "-" +
+        day +
+        " " +
+        hour +
+        ":" +
+        minutes +
+        ":" +
+        seconds
+      );
     },
     formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          if (j === "timestamp") {
+            return parseTime(v[j]);
+          } else {
+            return v[j];
+          }
+        })
+      );
     },
     getProvinceName(provinceId) {
-      const tempProvince = this.provinceList
+      const tempProvince = this.provinceList;
       for (const i in tempProvince) {
         if (tempProvince[i].id === provinceId) {
-          return tempProvince[i].province
+          return tempProvince[i].province;
         }
       }
     },
     getCityName(cityId) {
-      const tempCity = this.editCityList
+      const tempCity = this.editCityList;
       for (const i in tempCity) {
         if (tempCity[i].id === cityId) {
-          return tempCity[i].city
+          return tempCity[i].city;
         }
       }
     },
     getDistrictName(districtId) {
-      const tempDistrict = this.editDistrictList
+      const tempDistrict = this.editDistrictList;
       for (const i in tempDistrict) {
         if (tempDistrict[i].id === districtId) {
-          return tempDistrict[i].district
+          return tempDistrict[i].district;
         }
       }
     }
   }
-}
+};
 </script>

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
-          <el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button>
+          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1547546690">下载模板</a></el-button>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -3,10 +3,10 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item class="filter-item" label="手机号">
-        <el-input v-model="listQuery.ownerName" placeholder="手机号" />
+        <el-input v-model="listQuery.ownerTel" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
       </el-form-item>
       <el-form-item class="filter-item" label="姓名" >
-        <el-input v-model="listQuery.ownerTel" placeholder="姓名" />
+        <el-input v-model="listQuery.ownerName" placeholder="姓名" />
       </el-form-item>
       <el-form-item label="审核状态">
         <el-select v-model="listQuery.verifyStatus" placeholder="请选择">