Merge branch 'nn' of sckj/mz-cloud into master

ruoyi-ui/src/views/search/xxtj/yljgtj/index.vue

@@ -12,34 +12,40 @@
                   :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1, activeName2, $event)">
                 </dept-tree>
               </div>
-              <Echarts-box v-if="index === 1 || index === 8 || index === 9" v-loading="loading" :title="
-                index === 1
+              <Echarts-box v-if="index === 1 || index === 8 || index === 9" v-loading="loading"
+	              :title="index === 1
                   ? '养老机构法人类型统计-月度'
                   : index === 8
                     ? '养老机构单位性质统计-月度'
-                    : '养老机构街道（乡镇）社区福利中心统计-月度'
-              " :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
+                    : '养老机构街道（乡镇）社区福利中心统计-月度'"
+	              :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
                 :labelKeys="formData[3 * index + 1].keys" type="line" :ruzhulv="index === 6 ? 'yes' : 'no'"
                 :unit="formData[3 * index + 1].unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
-              <Echarts-box3 v-else v-loading="loading" :title="
-                index === 0
+	            <Echarts-box5 v-else-if="index === 4" v-loading="loading"
+		            :zbz="formData[3*index+1].zbz"
+		            :title="'街道（乡镇）区域性养老中心-月度'"
+		            :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
+		            :labelKeys="formData[3 * index + 1].keys" type="line" :ruzhulv="index === 6 ? 'yes' : 'no'"
+		            :unit="formData[3 * index + 1].unit">
+		            <Echarts-select @change-year="getNewYear"></Echarts-select>
+	            </Echarts-box5>
+              <Echarts-box3 v-else v-loading="loading"
+	              :title="index === 0
                   ? '养老机构备案情况统计-月度'
                   : index === 2
                     ? '特困救助供养机构统计-月度'
                     : index === 3
                       ? '光荣院统计-月度'
-                      : index === 4
-                        ? '街道（乡镇）区域性养老中心-月度'
                         : index === 5
                           ? '养老机构兴办主体统计-月度'
                           : index === 6
                             ? '养老机构入住率统计-月度'
                             : index === 7
                               ? '医疗服务方式-月度'
-                              : ''
-              " :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
+                              : ''"
+	              :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
                 :labelKeys="formData[3 * index + 1].keys" type="line" :ruzhulv="index === 6 ? 'yes' : 'no'"
                 :unit="formData[3 * index + 1].unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>