diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index bf9ae01de..a7272b167 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -3,148 +3,212 @@ - - 开发区围栏列表 - - + + 开发区围栏列表 + + - <#include "/common_js.ftl" /> - <#include "/layout/header.ftl" /> -
- +<#include "/common_js.ftl" /> +<#include "/layout/header.ftl" /> +
+ -
-
- <#if developmentZone??> - - +
+ + <#if developmentZone??> + + - - - - - - - - -
- <#if developmentZone??> - <@d_city defaultValue="${developmentZone.cityName!}" callback="changeCity" callbackField="display" name="cityDisplay" /> - <#else> - <@d_city defaultValue="上海" callback="changeCity" callbackField="display" name="cityDisplay" /> - - - - - - - - - - - - - - - -
- -
-
- -
-
+ + + + + + + + +
+ <#if developmentZone??> + <@d_city defaultValue="${developmentZone.cityName!}" callback="changeCity" callbackField="display" name="cityDisplay" /> + <#else> + <@d_city defaultValue="上海" callback="changeCity" callbackField="display" name="cityDisplay" /> + + + + + + + + + + + + + + + +
+ +
+
+ +
+
- - - - - - - + + + + + + + - + + + - \ No newline at end of file + diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl index 9f895e23c..3a162b0af 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl @@ -40,6 +40,7 @@ 开发区级别 省份 区块 + 是否有围栏 操作人员 操作 @@ -50,8 +51,11 @@ ${it.province!} ${it.block!} - ${it.operator!} + <#if it.bdShape?has_content> + 已有围栏 + + ${it.operator!} 查看 新建围栏