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

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

@@ -12,40 +12,34 @@
                   :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"
+              <Echarts-box v-if="index === 1 || index === 3 || index === 8 || index === 9" v-loading="loading"
 	              :title="index === 1
                   ? '养老机构法人类型统计-月度'
-                  : index === 8
-                    ? '养老机构单位性质统计-月度'
-                    : '养老机构街道（乡镇）社区福利中心统计-月度'"
-	              :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
+                  : index === 3
+                    ? '光荣院统计-月度'
+                    : index === 8
+                      ? '养老机构单位性质统计-月度'
+                      : '养老机构街道（乡镇）社区福利中心统计-月度'"
+                :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-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 === 5
-                          ? '养老机构兴办主体统计-月度'
-                          : index === 6
-                            ? '养老机构入住率统计-月度'
-                            : index === 7
-                              ? '医疗服务方式-月度'
-                              : ''"
-	              :echartsId="'one' + dict.value" :tableList="formData[3 * index + 1].vales"
+                    : index === 4
+                      ? '街道（乡镇）区域性养老中心-月度'
+                      : index === 5
+                        ? '养老机构兴办主体统计-月度'
+                        : index === 6
+                          ? '养老机构入住率统计-月度'
+                          : index === 7
+                            ? '医疗服务方式-月度'
+                            : ''"
+                :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>
@@ -79,16 +73,13 @@
                   :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1, activeName2, $event)">
                 </dept-tree>
               </div>
-              <Echarts-box v-if="index === 1 || index === 6 || index === 8 || index === 9" danwei="家"
-                v-loading="loading" :title="
-                  index === 1
-                    ? '养老机构法人类型统计-行政区划'
-                    : index === 6
-                      ? '养老机构入住率统计-行政区划'
-                      : index === 8
-                        ? '养老机构单位性质统计-行政区划'
-                        : '养老机构街道（乡镇）社区福利中心统计-行政区划'
-                " :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="formData[3 * index + 2].vales"
+              <Echarts-box v-if="index === 1 || index === 8 || index === 9" danwei="家" v-loading="loading"
+	              :title="index === 1
+                  ? '养老机构法人类型统计-行政区划'
+                    : index === 8
+                      ? '养老机构单位性质统计-行政区划'
+                      : '养老机构街道（乡镇）社区福利中心统计-行政区划'"
+                :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="formData[3 * index + 2].vales"
                 :labelKeys="formData[3 * index + 2].keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
@@ -103,9 +94,12 @@
                         ? '街道（乡镇）区域性养老中心-行政区划'
                         : index === 5
                           ? '养老机构兴办主体统计-行政区划'
-                          : index === 7
-                            ? '医疗服务方式-行政区划'
-                            : ''" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="formData[3 * index + 2].vales"
+                          : index === 6
+                            ? '养老机构入住率统计-行政区划'
+                            : index === 7
+                              ? '医疗服务方式-行政区划'
+                              : ''"
+                :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="formData[3 * index + 2].vales"
                 :labelKeys="formData[3 * index + 2].keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box3>
@@ -301,7 +295,8 @@ export default {
       let unit = ["总数", "公办", "民办"]
       let number = 3
       let num = 0
-      if ((this.activeName1 !== '2' && this.activeName1 !== '7' && this.activeName1 !== '9' && this.activeName1 !== '10') && (this.activeName2 !== '3')) {
+      if ((this.activeName1 !== '2' && this.activeName1 !== '4' && this.activeName1 !== '9' && this.activeName1 !== '10') && (this.activeName2 !== '3')) {
+	      console.log('aaaa');
         // let unit = this.formData[this.formDataidx].unit.split(',')
         this.formData[this.formDataidx].keys.forEach((item) => {
           if (item.type === 'fixed') {
@@ -320,6 +315,7 @@ export default {
         })
         this.formData[this.formDataidx].keys = arr;
       } else if (this.activeName1 === '7' && this.activeName2 === '1') {
+	      console.log('bbbbbb');
         this.formData[this.formDataidx].keys.forEach((item) => {
           if (item.type === 'fixed') {
             arr.push(item)
@@ -347,10 +343,10 @@ export default {
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
         this.formData[this.formDataidx] = data[0];
-				// 临时添加
-				if(this.formDataidx === 19 || this.formDataidx === 20){
-					this.formData[this.formDataidx].keys = this.formData[this.formDataidx].keys.slice(0,11)
-				}
+        // 临时添加
+        if (this.formDataidx === 19 || this.formDataidx === 20) {
+          this.formData[this.formDataidx].keys = this.formData[this.formDataidx].keys.slice(0, 11)
+        }
         this.keys();
       }
     }