bug

CODE/smart-community/operate-api/src/main/resources/mapper/ToCommunitiesMapper.xml

@@ -165,5 +165,6 @@
     <if test="districtId != null and districtId != ''" >
       and district_id = #{districtId,jdbcType=INTEGER}
     </if>
+    order by create_date desc
   </select>
 </mapper>

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -3,8 +3,8 @@
     <div class="filter-container">
       <label>标题</label>
       <el-input v-model="listQuery.title" placeholder="请输入标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <label>跳转概述</label>
-      <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <!-- <label>跳转概述</label>
+      <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/> -->
       <label>选择小区</label>
       <el-select v-model="listQuery.communityId" placeholder="选择小区" clearable style="width: 200px" class="filter-item">
         <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
@@ -36,48 +36,48 @@
       <span>{{ scope.row.id }}</span>
       </template> -->
       <!-- </el-table-column> -->
-      <el-table-column label="编号" width="150px" align="center">
+      <el-table-column label="编号" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="标题" min-width="150px" align="center">
+      <el-table-column label="标题" align="center">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
           <el-tag>{{ scope.row.title }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="适用社区" width="200" align="center">
+      <el-table-column label="适用社区" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.communityName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="banner位置" width="200" align="center">
+      <el-table-column label="banner位置" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.bannerPositionName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="权重" width="200" align="center">
+      <el-table-column label="权重" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.sort }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="生效时间" align="center" width="200">
+      <el-table-column label="生效时间" align="center">
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.effTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="失效时间" class-name="status-col" width="200" align="center">
+      <el-table-column label="失效时间" class-name="status-col" align="center">
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.expTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="修改时间" class-name="status-col" width="200" align="center">
+      <el-table-column label="修改时间" class-name="status-col" align="center">
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.updateDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="修改人" class-name="status-col" width="200" align="center">
+      <el-table-column label="修改人" class-name="status-col" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.updateUserName }}</span>
         </template>

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

@@ -12,6 +12,7 @@
       <el-select v-model="listQuery.districtId" placeholder="区县乡" clearable class="filter-item" style="width: 130px">
         <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="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
       <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>
     </div>
@@ -30,69 +31,77 @@
         align="center"
         type="index"
         width="50"/>
-      <el-table-column label="社区编号" align="center" width="105">
+      <el-table-column label="社区编号" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="社区名称" align="center" width="115">
+      <el-table-column label="社区名称" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.communityName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="社区别名" align="center" width="115">
+      <el-table-column label="社区别名" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.communityAlias }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="所在地区" align="center" width="305">
+      <el-table-column label="所在地区" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.provinceId }}{{ scope.row.cityId }}{{ scope.row.districtId }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="物业人员数量" align="center" width="120">
+      <el-table-column label="物业人员数量" align="center">
         <template slot-scope="scope">
           <span>52</span>
         </template>
       </el-table-column>
-      <el-table-column label="已核业主数量" align="center" width="120">
+      <el-table-column label="已核业主数量" align="center">
         <template slot-scope="scope">
           <span>123</span>
         </template>
       </el-table-column>
-      <el-table-column label="已核家属数量" align="center" width="120">
+      <el-table-column label="已核家属数量" align="center">
         <template slot-scope="scope">
           <span>345</span>
         </template>
       </el-table-column>
-      <el-table-column label="已核租客数量" align="center" width="120">
+      <el-table-column label="已核租客数量" align="center">
         <template slot-scope="scope">
           <span>234</span>
         </template>
       </el-table-column>
-      <el-table-column label="物业管理员" align="center" width="125">
+      <el-table-column label="物业管理员" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.userName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="高德坐标" align="center" width="150">
+      <el-table-column label="高德坐标" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.longitude }},{{ scope.row.latitude }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="录入时间" width="180px" align="center">
+      <el-table-column label="录入时间" align="center">
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.createDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :page-size.sync="listQuery.pageSize" @pagination="getList" />
+    <!-- <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-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;">
@@ -332,6 +341,16 @@ export default {
         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()
+    },
     handleFilter() {
       this.listQuery.pageNum = 1
       this.getList()
@@ -349,6 +368,16 @@ export default {
         this.sortByID(order)
       }
     },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.listQuery.pageNum = val
+      this.getList()
+    },
     sortByID(order) {
       if (order === 'ascending') {
         this.listQuery.sort = '+id'