换热站、供热区bug修改

src/api/system/index.ts

@@ -74,6 +74,7 @@ export default {
   },
   user: {
     getList: (params: object) => get('/system/user/list', params),
+    getAllList: (params: object) => get('/system/user/getAll', params),
     params: () => get('/system/user/params'),
     detail: (id: number) => get('/system/user/getInfoById', { id }),
     add: (data: object) => post('/system/user/add', data),

src/views/heatStation/heatStation/component/edit.vue

@@ -24,7 +24,15 @@
 					<el-input v-model="ruleForm.position" placeholder="请输入换热站位置" />
 				</el-form-item>
 				<el-form-item label="负责人" prop="principal">
-					<el-input v-model="ruleForm.principal" placeholder="请输入负责人" />
+					<!-- <el-input v-model="ruleForm.principal" placeholder="请输入负责人" /> -->
+					<el-select v-model="ruleForm.principal" clearable style="width: 100%;" placeholder="请选择">
+						<el-option
+							v-for="item in userList"
+							:key="item.id"
+							:label="item.userNickname"
+							:value="item.id">
+						</el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item label="状态" prop="status">
 					<el-radio v-model="ruleForm.status" :label="1">在线</el-radio>
@@ -64,6 +72,7 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent, ref, unref, nextTick, onMounted } from 'vue';
 import api from '/@/api/heatStation';
+import userApi from '/@/api/system';
 import datahubApi from '/@/api/datahub';
 import { ElMessage } from 'element-plus';
 import { useStore } from '/@/store/index';
@@ -106,6 +115,7 @@ export default defineComponent({
 			},
 			treeData: [],
 			dataHubList: [],
+			userList: [],
 			mapLocal: null as any
 		})
 		const store = useStore();
@@ -113,6 +123,7 @@ export default defineComponent({
 		const openDialog = (row: any, tree: any) => {
 			resetForm()
 			queryDataHubList()
+			queryUserList()
 			state.treeData = tree
 
 			if (row) {
@@ -131,6 +142,12 @@ export default defineComponent({
 					state.dataHubList = res.list || [];
 				});
 		};
+		const queryUserList = () => {
+			userApi.user.getAllList({})
+				.then((res: any) => {
+					state.userList = res || [];
+				});
+		};
 		const resetForm = () => {
 			state.ruleForm = {
 				id: 0,

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

@@ -201,7 +201,8 @@ export default defineComponent({
 			api.resident.detail(state.ruleForm.id)
 				.then((res: any) => {
 					state.ruleForm = {
-						...res
+						...res,
+						heatStaId: res.heatStaId || ''
 					}
 				})
 		}

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

@@ -161,7 +161,8 @@ export default defineComponent({
 			api.unit.detail(state.ruleForm.id)
 				.then((res: any) => {
 					state.ruleForm = {
-						...res
+						...res,
+						heatStaId: res.heatStaId || ''
 					}
 				})
 		}

src/views/heatingDistrict/unitManage/index.vue

@@ -77,6 +77,7 @@
         <el-table-column label="组织名称" prop="organizationInfo.name" min-width="100" />
         <el-table-column label="小区名称" prop="plotInfo.name" min-width="100" />
         <el-table-column label="楼宇名称" prop="floorInfo.name" min-width="100" />
+        <el-table-column label="楼号" prop="floorInfo.number" min-width="100" />
 	    	<el-table-column label="单元名称" prop="name" min-width="100" />
 	    	<el-table-column label="单元号" prop="number" min-width="100" />
 	    	<el-table-column label="更新时间" prop="updatedAt" width="180" />