Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

杨泽宇
2 parents 222eb7e8 2cbd1f66
Showing 4 changed files with 118 additions and 15 deletions
src/api/community/index.ts
src/components/Pagination/index.vue
src/style/reset.scss
src/views/community/index.vue
+import request from '../request'
+
+// export const getTableList = async ( params: any ) => {
+//   let res: any = await request.post( '/neighborhood/getList',  params, {headers: {'X-Token': '2ebb4ca07a7ac8af47a1c4b182ea124435f4001e'}} )
+//   return res
+// }
+// export const getTableList = async ( params: any ) => {
+//   let res: any = await request.get( '/neighborhood/getList',{headers: {'X-Token': '2ebb4ca07a7ac8af47a1c4b182ea124435f4001e'}} )
+//   return res
+// }
+export function getTableList(params) {
+  return request({
+    method: 'post',
+    url: '/neighborhood/getList',
+    params: params,
+    headers: {'X-Token': '2ebb4ca07a7ac8af47a1c4b182ea124435f4001e'}
+  })
+}
@@ -67,6 +67,7 @@ const emit = defineEmits&lt;{
       :page-size="pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
+      background 
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     >
@@ -78,4 +79,8 @@ const emit = defineEmits&lt;{
 .pagination-container {
   padding: 10px;
 }
+.el-pagination {
+  margin-top: 30px;
+  text-align: right;
+}
 </style>
@@ -69,3 +69,6 @@ div:focus {
 .page-container {
   padding: 30px;
 }
+.app-container {
+  padding: 30px;
+}
 \ No newline at end of file
 <script setup lang="ts">
-</script>
-<template>
-<div class="app-container">
-<p>啦啦啦</p>
-<!-- <el-form>
-<el-button type="primary">查询</el-button>
+import { reactive, onMounted } from "vue";
+import { getTableList } from "@/api/community";
+import Pagination from "@/components/Pagination/index.vue";
  
-</el-form> -->
+interface Item {
+  name: string,
+  type: number, 
+  id:number,
+}
+ // 列表
+const tableData:Array<Item>  = reactive([])
  
-</div>
-</template>
+const data = reactive({
+  // 搜索列表参数
+  search: {
+    propertyId: 1,
+    type: 0,
+    name: null,
+  },
+  // 分页
+  total: 0,
+  pageNum: 1,
+  pageSize: 0,
  
-<style>
+});
  
-.app-container {
-  padding: 30px;
-  border: 1px solid #000
-}
+/**
+ * 列表查询
+ */
+const search = () => {
+  getTableList(data.search)
+    .then((res) => {
+      data.tableList = res.data.data.list;
+      tableData.push(...res.data.data.list) ;
+      tableData.push({name:12131,type:'1',id:'1'}) ;
+      data.total = res.data.data.total;
+      data.pageSize = res.data.data.pageSize;
+      data.pageNum = res.data.data.pageNum;
+      data.tableList = res.data.data.list;
+      console.log(data.tableList);
+      console.log(tableData);
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+};
  
+onMounted(() => {
+  search();
+});
+</script>
+<template>
+  <div class="app-container">
+    <el-form :inline="true" :model="data.search">
+      <el-form-item>
+        <el-input
+          placeholder="请输入社区名称"
+          v-model="data.search.name"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        ><el-button type="primary" @click="search"
+          >查询</el-button
+        ></el-form-item
+      >
+      <el-row>
+        <el-form-item>
+          <el-button type="primary">导入</el-button>
+          <el-button type="primary">导出</el-button>
+          <el-button type="primary">新增</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <el-table border :data="tableData">
+      <el-table-column label="小区名称" prop="name"></el-table-column>
+      <el-table-column label="楼座数"></el-table-column>
+      <el-table-column label="储藏室数"></el-table-column>
+      <el-table-column label="车位数"></el-table-column>
+      <el-table-column label="所在地区"></el-table-column>
+      <el-table-column label="详细地址"></el-table-column>
+      <el-table-column label="操作">
+        <template #default>
+          <el-button type="text" size="mini">编辑</el-button>
+          <el-button type="text" size="mini">删除</el-button>
+          <el-button type="text" size="mini">楼宇管理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      :total="data.total"
+      :currentPage="data.pageNum"
+      :pageSize="data.pageSize"
+      @pageChange="getTableList"
+    ></Pagination>
+  </div>
+</template>
  
-</style>
 \ No newline at end of file
+<style></style>