fix bug

张红振
1 parent 55bc0c23
Showing 10 changed files with 267 additions and 31 deletions
src/api/ownerManagement/owner.ts
src/api/request.ts
src/main.ts
src/router/index.ts
src/router/modules/ownerManagement.ts
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/residence/communityDetail.vue
src/views/community/residence/index.vue
src/views/ownerManagement/owner/index.vue
+import request from '../request'
+
+// 列表查询
+export function getTableList(params:any) {
+  return request({
+    method: 'get',
+    url: '/resident/residentList',
+    params: params
+  })
+}
+
+// 房屋信息
+export function getHouse(params:any) {
+  return request({
+    method: 'post',
+    url: '/house/getHouse',
+    params: params
+  })
+}
+// 删除
+export function deleteHouse(params:any) {
+  return request({
+    method: 'delete',
+    url: '/house/deleteHouse',
+    params: params
+  })
+}
 import axios from 'axios'
 import * as store from "@/pinia/index";
 import router from '@/router'
+import { ElMessage } from 'element-plus'
  
 // 不这样写报ts类型错误，import...有一个多余的boolean类型
-let url: any = import.meta.env 
+let url: any = import.meta.env
 let instance = axios.create({
   baseURL: url.VITE_BASE_URL,
   withCredentials: true,
@@ -25,16 +26,20 @@ instance.interceptors.request.use(
  
 instance.interceptors.response.use(
   response => {
-    if(response) {
+    if (response) {
       console.log(response?.data?.errorCode)
     }
-    switch(~~response?.data?.errorCode) {
+    switch (~~response?.data?.errorCode) {
       case 10002:
         console.log('跳转')
         router.push({
           path: 'login'
         })
-      break;
+        break;
+      case 500:
+        ElMessage.error(`${response?.data?.errorMessage},请联系管理员`)
+        Promise.reject(response?.data)
+        break;
     }
     return response
   },
@@ -5,7 +5,7 @@ import promise from &#39;es6-promise&#39;
 // import store from '@/store/index'
  
 import ElementPlus from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElMessage,ElMessageBox  } from 'element-plus'
 import 'element-plus/dist/index.css'
 import zhCn from 'element-plus/es/locale/lang/zh-cn' // TIP elementUI配置中文环境
  
@@ -38,6 +38,7 @@ for(const i in globalVariable) {
 // app.config.warnHandler = () => null;
 // app.config.errorHandler = () => null;
 app.provide("$message", ElMessage);
+app.provide("$messageBox", ElMessageBox );
  
 app
 // .use(store)
@@ -4,6 +4,7 @@ import User from &quot;./modules/user&quot;
 import Resident from "./modules/resident"
 import Property from "./modules/property"
 import Community from "./modules/community"
+import OwnerManagement from "./modules/ownerManagement"
 import Layout from '@/layout/enter.vue'
 const routes: Array<any> = [
   { path: '/', redirect: { path: '/dashboard' } },
@@ -42,7 +43,7 @@ const routes: Array&lt;any&gt; = [
   Resident,
   Property,
   Community,
-
+  OwnerManagement,
   {
     path: '/login',
     name: 'Login',
+
+import Layout from '@/layout/enter.vue'
+const OwnerManagement = {
+  path: '/',
+  component: Layout,
+  name: 'Owner',
+  children: [{
+    path: 'owner',
+    name: 'owner',
+    component: () => import('@/views/ownerManagement/owner/index.vue'),
+    meta: { title: '业主管理' }
+  }
+  ]
+}
+
+export default OwnerManagement
 <script setup lang="ts">
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
-import type { ElForm } from "element-plus";
 import { addOrUpdate } from "@/api/community/housekeeper.ts";
 import { getTableList } from "@/api/community/residence.ts";
  
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+
+
 // 声明props
 const props = defineProps({
   formObj: {
@@ -111,12 +112,14 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
     if (valid) {
       console.log("111");
       addOrUpdate(props.formObj).then((res) => {
-        console.log(res);
+        console.log(111)
+        loading.value = false;
         emit("success");
-      });
+      }).catch((err) => {
+        console.log(err)
+      })
     } else {
       instance?.proxy?.$message.error("请完善信息"); //调用
-
       loading.value = false;
       return false;
     }
 <script setup lang="ts">
-import { reactive, onMounted } from "vue";
-import { getTableList, deleteBuilding,getCurrentInstance } from "@/api/community/housekeeper.ts";
+import { reactive, onMounted, getCurrentInstance } from "vue";
+import { getTableList, deleteBuilding } from "@/api/community/housekeeper.ts";
 import { parseTime } from "@/utils/tool.ts";
 import HouseDetail from "./houseDetail.vue";
 import Pagination from "@/components/Pagination/index.vue";
+import { useRoute } from "vue-router";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+
+let route = useRoute(); // 路由
  
-let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 数据筛选
 const searchData = reactive({
   neighborhoodId: null,
@@ -55,10 +59,18 @@ const edit = (row: Object) =&gt; {
  * @param { number } buildingId 楼宇ID
  */
 const remove = (buildingId: number) => {
-  deleteBuilding({ buildingId: buildingId }).then((res) => {
-    instance?.proxy?.$message.success('操作成功')//调用
-    search();
-  });
+  instance?.proxy?.$messageBox
+    .confirm("确认要进行此操作？", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+    .then(() => {
+      deleteBuilding({ buildingId: buildingId }).then((res) => {
+        instance?.proxy?.$message.success("操作成功"); //调用
+        search();
+      });
+    })
+    .catch((err) => {});
 };
 /**
  * 组件操作成功回调
@@ -75,6 +87,9 @@ const dialogClose: void = () =&gt; {
   data.formObj = {};
 };
 onMounted(() => {
+  searchData.neighborhoodId = route.query.neighborhoodId
+    ? route.query.neighborhoodId
+    : null;
   search();
 });
 </script>
@@ -97,8 +112,8 @@ onMounted(() =&gt; {
       >
       <el-row>
         <el-form-item>
-          <el-button type="primary">导入</el-button>
-          <el-button type="primary">导出</el-button>
+          <!-- <el-button type="primary">导入</el-button>
+          <el-button type="primary">导出</el-button> -->
           <el-button type="primary" @click="data.dialogVisible = true"
             >新增</el-button
           >
 <script setup lang="ts">
 import { reactive, ref, onMounted,getCurrentInstance } from "vue";
 import type { ElForm } from "element-plus";
-import { ElMessage } from "element-plus";
 import { addOrUpdate } from "@/api/community/residence.ts";
+
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 声明props
@@ -84,6 +84,7 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
     if (valid) {
       console.log("111")
       addOrUpdate(props.formObj).then((res) => {
+         loading.value = false;
         emit("success");
       });
     } else {
 <script setup lang="ts">
-import { reactive, onMounted,getCurrentInstance } from "vue";
+import { reactive, onMounted, getCurrentInstance } from "vue";
 import { getTableList, deleteNeighborhood } from "@/api/community/residence.ts";
 import CommunityDetail from "./communityDetail.vue";
 import Pagination from "@/components/Pagination/index.vue";
  
-let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
 // 数据筛选
 const searchData = reactive({
-  propertyId: 1,
   type: 0,
   name: null,
   pageNum: 1,
@@ -45,6 +44,7 @@ const search = (): void =&gt; {
  * @param { Object } 列表对象
  */
 const edit = (row: Object) => {
+  data.title = "编辑小区";
   data.formObj = row;
   data.dialogVisible = true;
 };
@@ -53,10 +53,18 @@ const edit = (row: Object) =&gt; {
  * @param { number } neighborhoodId 小区ID
  */
 const remove = (neighborhoodId: number) => {
-  deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
-    instance?.proxy?.$message.success('操作成功')//调用
-    search();
-  });
+  instance?.proxy?.$messageBox
+    .confirm("确认要进行此操作？", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+    .then(() => {
+      deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
+        instance?.proxy?.$message.success("操作成功"); //调用
+        search();
+      });
+    })
+    .catch((err) => {});
 };
 /**
  * 组件操作成功回调
@@ -70,6 +78,7 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
+  data.title = "新增小区";
   data.formObj = {};
 };
 onMounted(() => {
@@ -82,7 +91,7 @@ onMounted(() =&gt; {
     <el-form :inline="true" :model="searchData" v-loading="data.loading">
       <el-form-item>
         <el-input
-          placeholder="请输入社区名称"
+          placeholder="输入小区名称"
           v-model="searchData.name"
           clearable
         ></el-input>
@@ -94,8 +103,8 @@ onMounted(() =&gt; {
       >
       <el-row>
         <el-form-item>
-          <el-button type="primary">导入</el-button>
-          <el-button type="primary">导出</el-button>
+          <!-- <el-button type="primary">导入</el-button>
+          <el-button type="primary">导出</el-button> -->
           <el-button type="primary" @click="data.dialogVisible = true"
             >新增</el-button
           >
@@ -119,7 +128,14 @@ onMounted(() =&gt; {
           <el-button type="text" size="mini" @click="remove(scope.row.id)"
             >删除</el-button
           >
-          <el-button type="text" size="mini">楼宇管理</el-button>
+          <router-link
+            :to="{
+              name: 'housekeeper',
+              query: { neighborhoodId: scope.row.id },
+            }"
+          >
+            <el-button type="text" size="mini">楼宇管理</el-button></router-link
+          >
         </template>
       </el-table-column>
     </el-table>
+<script setup lang="ts">
+import { reactive, onMounted, getCurrentInstance } from "vue";
+import { getTableList } from "@/api/ownerManagement/owner.ts";
+// import CommunityDetail from "./communityDetail.vue";
+import Pagination from "@/components/Pagination/index.vue";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+// 数据筛选
+const searchData = reactive({
+  isOwner: null,
+  pageNum: 1,
+  pageSize: 10,
+});
+// 展示
+const data = reactive({
+  total: 0,
+  tableList: [],
+  dialogVisible: false,
+  loading: false,
+  title: "新增小区",
+  formObj: {},
+});
+
+/**
+ * 列表查询
+ */
+const search = (): void => {
+  data.loading = true;
+  getTableList(searchData)
+    .then((res) => {
+      data.tableList = res.data.data.list;
+      data.total = res.data.data.total;
+      searchData.pageSize = res.data.data.pageSize;
+      data.loading = false;
+    })
+    .catch((err) => {
+      console.log(err);
+      data.loading = false;
+    });
+};
+/**
+ * 编辑
+ * @param { Object } 列表对象
+ */
+const edit = (row: Object) => {
+  data.formObj = row;
+  data.dialogVisible = true;
+};
+/**
+ * 删除
+ * @param { number } neighborhoodId 小区ID
+ */
+const remove = (neighborhoodId: number) => {
+  // deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
+  //   instance?.proxy?.$message.success('操作成功')//调用
+  //   search();
+  // });
+};
+/**
+ * 组件操作成功回调
+ */
+const changeData: void = () => {
+  data.dialogVisible = false;
+  search();
+};
+
+/**
+ * 弹框关闭
+ */
+const dialogClose: void = () => {
+  data.formObj = {};
+};
+onMounted(() => {
+  console.log("11");
+  search();
+});
+</script>
+<template>
+  <div class="app-container">
+    <!-- 搜索 -->
+    <el-form :inline="true" :model="searchData" v-loading="data.loading">
+      <el-form-item>
+        <el-input
+          placeholder="请输入社区名称"
+          v-model="searchData.name"
+          clearable
+        ></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" @click="data.dialogVisible = true"
+            >新增</el-button
+          >
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <!-- 表格 -->
+    <el-table border :data="data.tableList">
+      <el-table-column label="小区名称" prop="name"></el-table-column>
+      <el-table-column label="楼座数" prop="buildingCount"></el-table-column>
+      <el-table-column label="储藏室数" prop="storeroomCount"></el-table-column>
+      <el-table-column label="车位数" prop="truckSpaceCount"></el-table-column>
+      <el-table-column label="所在地区" prop="locality"></el-table-column>
+      <el-table-column label="详细地址" prop="address"></el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="text" size="mini" @click="edit(scope.row)"
+            >编辑</el-button
+          >
+          <el-button type="text" size="mini" @click="remove(scope.row.id)"
+            >删除</el-button
+          >
+          <el-button type="text" size="mini">楼宇管理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <Pagination
+      v-if="data.total > 0"
+      :total="data.total"
+      :currentPage="searchData.pageNum"
+      :pageSize="searchData.pageSize"
+      @pageChange="search"
+    ></Pagination>
+
+    <!-- 详情弹框 -->
+    <!-- <el-dialog
+      v-model="data.dialogVisible"
+      :title="data.title"
+      width="30%"
+      @close="dialogClose"
+    > -->
+    <!-- <CommunityDetail
+        @cancel="data.dialogVisible = false"
+        @success="changeData"
+        :formObj="data.formObj"
+      ></CommunityDetail> -->
+    <!-- </el-dialog> -->
+  </div>
+</template>
+
+<style></style>