住户管理接口联调

.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://101.200.198.249:8899/api/v1'
+#VITE_API_URL = 'http://101.200.198.249:8899/api/v1'
 VITE_IMG_URL = 'http://101.200.198.249:8899/'
 VITE_ASSESS_URL = 'http://zhgy.sagoo.cn/base-api/assess/v1'
-#VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
+VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
 # VITE_IMG_URL = 'http://sgadserver.wdeveloperw.xyz/'

src/api/heatingDistrict/index.ts

@@ -8,6 +8,7 @@ export default {
     edit: (data: object) => put('/region/plot/edit', data),
     del: (id: number) => del('/region/plot/del', { id }),
     detail: (id: number) => get('/region/plot/detail', { id }),
+    setStatus: (id: number, status: number) => put('/region/plot/editStatus', { id, status }),
   },
   floor: {
     allList: (params: object) => get('/region/floor/all', params),
@@ -16,6 +17,7 @@ export default {
     edit: (data: object) => put('/region/floor/edit', data),
     del: (id: number) => del('/region/floor/del', { id }),
     detail: (id: number) => get('/region/floor/detail', { id }),
+    setStatus: (id: number, status: number) => put('/region/floor/editStatus', { id, status }),
   },
   unit: {
     getListByFloorId: (params: object) => get('/region/unit/getInfoByFloorId', params),
@@ -24,6 +26,7 @@ export default {
     edit: (data: object) => put('/region/unit/edit', data),
     del: (id: number) => del('/region/unit/del', { id }),
     detail: (id: number) => get('/region/unit/getInfoById', { id }),
+    setStatus: (id: number, status: number) => put('/region/unit/editStatus', { id, status }),
   },
   resident: {
     allList: (params: object) => get('/region/resident/all', params),
@@ -31,6 +34,7 @@ export default {
     add: (data: object) => post('/region/resident/add', data),
     edit: (data: object) => put('/region/resident/edit', data),
     del: (id: number) => del('/region/resident/del', { id }),
-    detail: (id: number) => get('/region/resident/detail', { id }),
+    detail: (id: number) => get('/region/resident/getInfoById', { id }),
+    setStatus: (id: number, status: number) => put('/region/resident/editStatus', { id, status }),
   }
 }

src/views/heatingDistrict/floorManage/index.vue

@@ -78,6 +78,12 @@
           </template>
         </el-table-column>
 	    	<el-table-column label="更新时间" prop="createdAt" />
+				<el-table-column prop="status" label="启用状态" width="120" align="center">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+						</el-switch>
+					</template>
+				</el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenDialog(scope.row)">修改</el-button>
@@ -163,6 +169,25 @@ export default defineComponent({
 			editDicRef.value.plotList = plotList.value
 			editDicRef.value.openDialog(row);
 		};
+		
+		// 状态修改
+		const handleStatusChange = (row: any) => {
+			let text = row.status === 1 ? '启用' : '停用';
+			ElMessageBox.confirm('确认要"' + text + '"："' + row.name + '"楼宇吗?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(function () {
+					return api.floor.setStatus(row.id, row.status);
+				})
+				.then(() => {
+					ElMessage.success(text + '成功');
+				})
+				.catch(function () {
+					row.status = row.status === 0 ? 1 : 0;
+				});
+		};
 		// 删除产品
 		const onRowDel = (row: any) => {
 			// let msg = '你确定要删除所选数据？';
@@ -215,6 +240,7 @@ export default defineComponent({
 			resetQuery,
 			orgList,
 			plotList,
+			handleStatusChange,
 			...toRefs(state),
 		};
 	},

src/views/heatingDistrict/regionalManage/index.vue

@@ -61,6 +61,12 @@
 					</template>
 				</el-table-column>
 	    	<el-table-column label="更新时间" prop="createdAt" />
+				<el-table-column prop="status" label="启用状态" width="120" align="center">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+						</el-switch>
+					</template>
+				</el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)">修改</el-button>
@@ -140,6 +146,25 @@ export default defineComponent({
 			editDicRef.value.orgList = orgList.value
 			editDicRef.value.openDialog(row);
 		};
+		
+		// 状态修改
+		const handleStatusChange = (row: any) => {
+			let text = row.status === 1 ? '启用' : '停用';
+			ElMessageBox.confirm('确认要"' + text + '"："' + row.name + '"小区吗?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(function () {
+					return api.regionalManage.setStatus(row.id, row.status);
+				})
+				.then(() => {
+					ElMessage.success(text + '成功');
+				})
+				.catch(function () {
+					row.status = row.status === 0 ? 1 : 0;
+				});
+		};
 		// 删除产品
 		const onRowDel = (row: any) => {
 			// let msg = '你确定要删除所选数据？';
@@ -191,6 +216,7 @@ export default defineComponent({
 			queryList,
 			resetQuery,
 			orgList,
+			handleStatusChange,
 			...toRefs(state),
 		};
 	},

src/views/heatingDistrict/residentManage/component/edit.vue

@@ -198,7 +198,7 @@ export default defineComponent({
 				});
 		};
 		const getDetail = () => {
-			api.floor.detail(state.ruleForm.id)
+			api.resident.detail(state.ruleForm.id)
 				.then((res: any) => {
 					state.ruleForm = {
 						...res
@@ -207,7 +207,7 @@ export default defineComponent({
 		}
 		// 获取楼宇
 		const getFloorList = () => {
-			api.floor.allList({})
+			api.floor.allList({ plotId: state.ruleForm.plotId })
 				.then((res: any) => {
 					state.floorList = res.Info || []
 				})

src/views/heatingDistrict/residentManage/index.vue

@@ -86,12 +86,12 @@
         <el-table-column label="ID" align="center" prop="id" width="60" />
         <el-table-column label="组织名称" prop="">
           <template #default="{ row }">
-            {{ row.SysOrganization.name }}
+            {{ row.organizationInfo.name }}
           </template>
         </el-table-column>
         <el-table-column label="小区名称" prop="">
           <template #default="{ row }">
-            {{ row.ZhgyPlotInfo.name }}
+            {{ row.plotInfo.name }}
           </template>
         </el-table-column>
         <el-table-column label="楼宇名称" prop="">
@@ -99,10 +99,29 @@
             {{ row.floorInfo.name }}
           </template>
         </el-table-column>
-	    	<el-table-column label="单元名称" prop="name" />
-	    	<el-table-column label="单元号" prop="number" />
+	    	<el-table-column label="单元名称" prop="name">
+          <template #default="{ row }">
+            {{ row.unitInfo.name }}
+          </template>
+        </el-table-column>
+	    	<el-table-column label="单元号" prop="number">
+          <template #default="{ row }">
+            {{ row.unitInfo.number }}
+          </template>
+        </el-table-column>
 	    	<el-table-column label="住户姓名" prop="name" />
+	    	<el-table-column label="楼层" prop="floorLevel" />
+	    	<el-table-column label="房间号" prop="roomNumber" />
+	    	<el-table-column label="电话号码" prop="phone" />
+	    	<el-table-column label="建筑面积" prop="buildingArea" />
+	    	<el-table-column label="实供面积" prop="forRealArea" />
 	    	<el-table-column label="更新时间" prop="createdAt" />
+				<el-table-column prop="status" label="启用状态" width="120" align="center">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+						</el-switch>
+					</template>
+				</el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenDialog(scope.row)">修改</el-button>
@@ -193,7 +212,7 @@ export default defineComponent({
 		const queryList = () => {
 			api.resident.getList(state.tableData.param).then((res: any) => {
 				console.log(res);
-				state.tableData.data = res.Info || [];
+				state.tableData.data = res.Data || [];
 				state.tableData.total = res.Total;
 			});
 		};
@@ -223,6 +242,25 @@ export default defineComponent({
 			editDicRef.value.plotList = plotList.value
 			editDicRef.value.openDialog(row);
 		};
+		
+		// 状态修改
+		const handleStatusChange = (row: any) => {
+			let text = row.status === 1 ? '启用' : '停用';
+			ElMessageBox.confirm('确认要"' + text + '"："' + row.name + '"住户吗?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(function () {
+					return api.resident.setStatus(row.id, row.status);
+				})
+				.then(() => {
+					ElMessage.success(text + '成功');
+				})
+				.catch(function () {
+					row.status = row.status === 0 ? 1 : 0;
+				});
+		};
 		// 删除产品
 		const onRowDel = (row: any) => {
 			let msg = `此操作将永久删除住户：“${row.name}”，是否继续?`;
@@ -270,6 +308,7 @@ export default defineComponent({
 			unitList,
 			onPlotChange,
 			onFloorChange,
+			handleStatusChange,
 			...toRefs(state),
 		};
 	},

src/views/heatingDistrict/unitManage/index.vue

@@ -80,6 +80,12 @@
 	    	<el-table-column label="单元名称" prop="name" />
 	    	<el-table-column label="单元号" prop="number" />
 	    	<el-table-column label="更新时间" prop="updatedAt" />
+				<el-table-column prop="status" label="启用状态" width="120" align="center">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+						</el-switch>
+					</template>
+				</el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenDialog(scope.row)">修改</el-button>
@@ -181,6 +187,25 @@ export default defineComponent({
 			editDicRef.value.plotList = plotList.value
 			editDicRef.value.openDialog(row);
 		};
+		
+		// 状态修改
+		const handleStatusChange = (row: any) => {
+			let text = row.status === 1 ? '启用' : '停用';
+			ElMessageBox.confirm('确认要"' + text + '"："' + row.name + '"单元吗?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(function () {
+					return api.unit.setStatus(row.id, row.status);
+				})
+				.then(() => {
+					ElMessage.success(text + '成功');
+				})
+				.catch(function () {
+					row.status = row.status === 0 ? 1 : 0;
+				});
+		};
 		// 删除产品
 		const onRowDel = (row: any) => {
 			let msg = `此操作将永久删除单元：“${row.name}”，是否继续?`;
@@ -224,6 +249,7 @@ export default defineComponent({
 			plotList,
 			floorList,
 			onPlotChange,
+			handleStatusChange,
 			...toRefs(state),
 		};
 	},