Bladeren bron

换热站问题修改

picasso 3 jaren geleden
bovenliggende
commit
7d13f58476

+ 2 - 2
.env.development

@@ -2,11 +2,11 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://zhgy.sagoo.cn:8899/api/v1'
+#VITE_API_URL = 'http://zhgy.sagoo.cn:8899/api/v1'
 VITE_IMG_URL = 'http://zhgy.sagoo.cn:8899/'
 VITE_ASSESS_URL = 'http://zhgy.sagoo.cn/base-api/assess/v1'
 VITE_SCREEN_URL = 'http://home.yanglizhi.cn:10003'
 VITE_TOPO_URL = 'http://home.yanglizhi.cn:10001'
 VITE_WS_URL = 'ws://zhgy.sagoo.cn:8899/api/v1/websocket'
-#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/'

+ 2 - 2
src/views/heatStation/heatStation/component/detail.vue

@@ -8,8 +8,8 @@
 				<el-form-item label="换热站位置" prop="position">
 					{{ ruleForm.position }}
 				</el-form-item>
-				<el-form-item label="负责人" prop="principal">
-					{{ ruleForm.principal }}
+				<el-form-item label="负责人" prop="principalInfo.userNickname">
+					{{ ruleForm.principalInfo.userNickname }}
 				</el-form-item>
 				<el-form-item label="状态" prop="status">
 					{{ ruleForm.status === 1 ? '在线' : '不在线' }}

+ 2 - 1
src/views/heatStation/heatStation/component/edit.vue

@@ -157,7 +157,8 @@ export default defineComponent({
 			api.heatStation.detail(state.ruleForm.id)
 				.then((res: any) => {
 					state.ruleForm = {
-						...res
+						...res,
+						parentId: res.parentId === -1 ? '' : res.parentId
 					}
 				})
 		}

+ 6 - 0
src/views/heatStation/heatStation/index.vue

@@ -44,6 +44,12 @@
 	    	<el-table-column label="换热站" prop="name" :show-overflow-tooltip="true" />
 	    	<el-table-column label="换热站编号" prop="code" :show-overflow-tooltip="true" />
 	    	<el-table-column label="位置" prop="position" :show-overflow-tooltip="true" />
+	    	<el-table-column label="负责人" prop="principalInfo.userNickname" width="80"/>
+	    	<el-table-column label="状态" prop="status" width="80">
+          <template #default="scope">
+						{{ scope.row.status === 1 ? '在线' : '不在线' }}
+          </template>
+        </el-table-column>
 	    	<el-table-column label="创建时间" prop="createdAt" :show-overflow-tooltip="true" />
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">