diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
index 789cd3e..06c0512 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
@@ -857,6 +857,11 @@
设置当月已办结项目数
Y
+
+ 大屏网格信息
+ 设置大屏网格信息变量
+ Y
+
已关闭议题数
@@ -3602,6 +3607,286 @@ WHERE
Y
+
+ 大屏网格信息
+ TableInput
+
+ Y
+
+ 1
+
+ none
+
+
+ source_ys_admin
+ SELECT
+ village_num,
+ building_num,
+ house_master_num AS housemaster_num,
+ focus_groups_num,
+ person_num,
+ party_num,
+ grid_master AS gridmaster
+FROM
+ epdc_screen_dept_info
+WHERE
+ DEL_FLAG = '0'
+AND DEPT_ID = ${gridId}
+ORDER BY
+ id ASC
+ 0
+
+ N
+ Y
+ N
+ N
+
+
+ Integer
+ normal
+ village_num
+ 9
+ 0
+ 大屏网格信息
+ village_num
+ ####0;-####0
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ Integer
+ normal
+ building_num
+ 9
+ 0
+ 大屏网格信息
+ building_num
+ ####0;-####0
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ Integer
+ normal
+ housemaster_num
+ 9
+ 0
+ 大屏网格信息
+ housemaster_num
+ ####0;-####0
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ Integer
+ normal
+ focus_groups_num
+ 9
+ 0
+ 大屏网格信息
+ focus_groups_num
+ ####0;-####0
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ Integer
+ normal
+ person_num
+ 9
+ 0
+ 大屏网格信息
+ person_num
+ ####0;-####0
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ Integer
+ normal
+ party_num
+ 9
+ 0
+ 大屏网格信息
+ party_num
+ ####0;-####0
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+ String
+ normal
+ gridmaster
+ 32
+ -1
+ 大屏网格信息
+ gridmaster
+
+ .
+ ,
+
+ none
+ N
+ Y
+ 0
+ N
+ N
+ N
+ zh_CN
+ Asia/Shanghai
+ N
+
+
+
+
+
+
+
+
+
+
+ 784
+ 736
+ Y
+
+
+
+ 设置大屏网格信息变量
+ SetVariable
+
+ Y
+
+ 1
+
+ none
+
+
+
+
+ village_num
+ village_num
+ PARENT_JOB
+
+
+
+ building_num
+ building_num
+ PARENT_JOB
+
+
+
+ housemaster_num
+ housemaster_num
+ PARENT_JOB
+
+
+
+ focus_groups_num
+ focus_groups_num
+ PARENT_JOB
+
+
+
+ person_num
+ person_num
+ PARENT_JOB
+
+
+
+ party_num
+ party_num
+ PARENT_JOB
+
+
+
+ gridmaster
+ gridmaster
+ PARENT_JOB
+
+
+
+ Y
+
+
+
+
+
+
+
+
+ 1024
+ 736
+ Y
+
+
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
index dd789cd..c4028db 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb
@@ -321,7 +321,7 @@
N
Y
0
- 240
+ 352
320
@@ -359,7 +359,7 @@
N
Y
0
- 704
+ 528
320
@@ -397,7 +397,7 @@
N
Y
0
- 896
+ 736
320
@@ -419,7 +419,7 @@
N
Y
0
- 112
+ 192
320
@@ -457,508 +457,10 @@
N
Y
0
- 1088
+ 912
320
-
- 检验字段的值
-
- SIMPLE_EVAL
-
- variable
-
- ${communityGrid}
- string
-
- 第一网格
-
-
- contains
- equal
- false
- N
- N
- Y
- 0
- 384
- 128
-
-
-
- 检验字段的值 2
-
- SIMPLE_EVAL
-
- variable
-
- ${communityGrid}
- string
-
- 第二网格
-
-
- contains
- equal
- false
- N
- N
- Y
- 0
- 384
- 208
-
-
-
- 检验字段的值 3
-
- SIMPLE_EVAL
-
- variable
-
- ${communityGrid}
- string
-
- 第三网格
-
-
- contains
- equal
- false
- N
- N
- Y
- 0
- 384
- 288
-
-
-
- 检验字段的值 4
-
- SIMPLE_EVAL
-
- variable
-
- ${communityGrid}
- string
-
- 第四网格
-
-
- contains
- equal
- false
- N
- N
- Y
- 0
- 384
- 368
-
-
-
- 检验字段的值 5
-
- SIMPLE_EVAL
-
- variable
-
- ${communityGrid}
- string
-
- 第五网格
-
-
- contains
- equal
- false
- N
- N
- Y
- 0
- 384
- 448
-
-
-
- 检验字段的值 6
-
- SIMPLE_EVAL
-
- variable
-
- ${communityGrid}
- string
-
- 第六网格
-
-
- contains
- equal
- false
- N
- N
- Y
- 0
- 384
- 528
-
-
-
- 设置变量
-
- SET_VARIABLES
-
- Y
-
- CURRENT_JOB
-
-
- village_num
- 1
- CURRENT_JOB
-
-
- building_num
- 8
- CURRENT_JOB
-
-
- housemaster_num
- 7
- CURRENT_JOB
-
-
- focus_groups_num
- -1
- CURRENT_JOB
-
-
- party_num
- 100
- CURRENT_JOB
-
-
- gridmaster
- 赵泽诗
- CURRENT_JOB
-
-
- N
- Y
- 0
- 528
- 128
-
-
-
- 设置变量 2
-
- SET_VARIABLES
-
- Y
-
- CURRENT_JOB
-
-
- village_num
- 6
- CURRENT_JOB
-
-
- building_num
- 11
- CURRENT_JOB
-
-
- housemaster_num
- 8
- CURRENT_JOB
-
-
- focus_groups_num
- -1
- CURRENT_JOB
-
-
- party_num
- 113
- CURRENT_JOB
-
-
- gridmaster
- 刘东军
- CURRENT_JOB
-
-
- N
- Y
- 0
- 528
- 208
-
-
-
- 设置变量 3
-
- SET_VARIABLES
-
- Y
-
- CURRENT_JOB
-
-
- village_num
- 2
- CURRENT_JOB
-
-
- building_num
- 8
- CURRENT_JOB
-
-
- housemaster_num
- 8
- CURRENT_JOB
-
-
- focus_groups_num
- -1
- CURRENT_JOB
-
-
- party_num
- 41
- CURRENT_JOB
-
-
- gridmaster
- 孔凡代
- CURRENT_JOB
-
-
- N
- Y
- 0
- 528
- 288
-
-
-
- 设置变量 4
-
- SET_VARIABLES
-
- Y
-
- CURRENT_JOB
-
-
- village_num
- 1
- CURRENT_JOB
-
-
- building_num
- 10
- CURRENT_JOB
-
-
- housemaster_num
- 7
- CURRENT_JOB
-
-
- focus_groups_num
- -1
- CURRENT_JOB
-
-
- party_num
- 174
- CURRENT_JOB
-
-
- gridmaster
- 朱向阳
- CURRENT_JOB
-
-
- N
- Y
- 0
- 528
- 368
-
-
-
- 设置变量 5
-
- SET_VARIABLES
-
- Y
-
- CURRENT_JOB
-
-
- village_num
- 0
- CURRENT_JOB
-
-
- building_num
- 0
- CURRENT_JOB
-
-
- housemaster_num
- 2
- CURRENT_JOB
-
-
- focus_groups_num
- -1
- CURRENT_JOB
-
-
- party_num
- 0
- CURRENT_JOB
-
-
- gridmaster
- 李玉锋
- CURRENT_JOB
-
-
- N
- Y
- 0
- 528
- 448
-
-
-
- 设置变量 6
-
- SET_VARIABLES
-
- Y
-
- CURRENT_JOB
-
-
- village_num
- 1
- CURRENT_JOB
-
-
- building_num
- 16
- CURRENT_JOB
-
-
- housemaster_num
- 6
- CURRENT_JOB
-
-
- focus_groups_num
- -1
- CURRENT_JOB
-
-
- party_num
- 18
- CURRENT_JOB
-
-
- gridmaster
- 王坤
- CURRENT_JOB
-
-
- N
- Y
- 0
- 528
- 528
-
-
-
- 成功
-
- SUCCESS
-
- N
- Y
- 0
- 464
- 80
-
-
-
- 成功 2
-
- SUCCESS
-
- N
- Y
- 0
- 464
- 160
-
-
-
- 成功 3
-
- SUCCESS
-
- N
- Y
- 0
- 464
- 240
-
-
-
- 成功 4
-
- SUCCESS
-
- N
- Y
- 0
- 464
- 320
-
-
-
- 成功 5
-
- SUCCESS
-
- N
- Y
- 0
- 464
- 400
-
-
-
- 成功 6
-
- SUCCESS
-
- N
- Y
- 0
- 464
- 480
-
-
@@ -990,150 +492,6 @@
网格ID,NAME
- 检验字段的值
- 0
- 0
- Y
- Y
- N
-
-
- 网格ID,NAME
- 检验字段的值 2
- 0
- 0
- Y
- Y
- N
-
-
- 网格ID,NAME
- 检验字段的值 3
- 0
- 0
- Y
- Y
- N
-
-
- 网格ID,NAME
- 检验字段的值 4
- 0
- 0
- Y
- Y
- N
-
-
- 网格ID,NAME
- 检验字段的值 5
- 0
- 0
- Y
- Y
- N
-
-
- 网格ID,NAME
- 检验字段的值 6
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值
- 设置变量
- 0
- 0
- Y
- Y
- N
-
-
- 设置变量
- 获取网格信息变量
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值 2
- 设置变量 2
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值 3
- 设置变量 3
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值 4
- 设置变量 4
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值 5
- 设置变量 5
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值 6
- 设置变量 6
- 0
- 0
- Y
- Y
- N
-
-
- 设置变量 2
- 获取网格信息变量
- 0
- 0
- Y
- Y
- N
-
-
- 设置变量 3
- 获取网格信息变量
- 0
- 0
- Y
- Y
- N
-
-
- 设置变量 4
- 获取网格信息变量
- 0
- 0
- Y
- Y
- N
-
-
- 设置变量 5
获取网格信息变量
0
0
@@ -1141,69 +499,6 @@
Y
N
-
- 设置变量 6
- 获取网格信息变量
- 0
- 0
- Y
- Y
- N
-
-
- 检验字段的值
- 成功
- 0
- 0
- Y
- N
- N
-
-
- 检验字段的值 2
- 成功 2
- 0
- 0
- Y
- N
- N
-
-
- 检验字段的值 3
- 成功 3
- 0
- 0
- Y
- N
- N
-
-
- 检验字段的值 4
- 成功 4
- 0
- 0
- Y
- N
- N
-
-
- 检验字段的值 5
- 成功 5
- 0
- 0
- Y
- N
- N
-
-
- 检验字段的值 6
- 成功 6
- 0
- 0
- Y
- N
- N
-