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

ruoyi-ui/src/views/search/xxtj/cyrytj/yljg/index.vue

@@ -10,9 +10,9 @@
                 <p class="sxzd">行政区划</p>
                 <dept-tree  :isTj="true" :isLoad="treeliadzt[3*index+1]"  :ref="'dztree'+(3*index+1)"   :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
-              <Echarts-box danwei="人" v-loading="loading" title="养老机构从业人员统计-月度" :echartsId="'one' + dict.value" :tableList="formData[3*index+1].vales" :labelKeys="formData[3*index+1].keys" type="line" xStr="year" :unit="formData[3*index+1].unit">
+              <Echarts-box3 danwei="人" v-loading="loading" title="养老机构从业人员统计-月度" :echartsId="'one' + dict.value" :tableList="formData[3*index+1].vales" :labelKeys="formData[3*index+1].keys" type="line" xStr="year" :unit="formData[3*index+1].unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
-              </Echarts-box>
+              </Echarts-box3>
             </div>
             <!-- <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div> -->
             <!-- table区域 -->
@@ -25,7 +25,10 @@
               </div>
               <el-table v-loading="loading" :data="formData[3*index+1].vales" style="width: 100%" stripe>
                 <el-table-column align="center" type="index" label="序号"> </el-table-column>
-                <el-table-column align="center" v-for="item in formData[3*index+1].keys" :key="item.prop" :prop="item.prop" :label="item.label" :width="item.width"> </el-table-column>
+                <el-table-column align="center" v-for="item in formData[3*index+1].keys" :key="item.prop" :prop="item.prop" :label="item.label" :width="item.width">
+	                <el-table-column align="center" v-for="ite in item.data" :key="ite.prop + item.prop" :prop="ite.prop"
+		                :label="ite.label"> </el-table-column>
+                </el-table-column>
               </el-table>
             </div>
           </el-tab-pane>
@@ -35,9 +38,9 @@
                 <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+2]"  :ref="'dztree'+(3*index+2)"  :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
-              <Echarts-box danwei="人" v-loading="loading" title="养老机构从业人员统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="formData[3*index+2].vales" :labelKeys="formData[3*index+2].keys">
+              <Echarts-box3 danwei="人" v-loading="loading" title="养老机构从业人员统计-行政区划" :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>
+              </Echarts-box3>
             </div>
             <!-- <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div> -->
             <!-- table区域 -->
@@ -50,7 +53,10 @@
               </div>
               <el-table v-loading="loading" :data="formData[3*index+2].vales" style="width: 100%" stripe>
                 <el-table-column align="center" type="index" label="序号"> </el-table-column>
-                <el-table-column align="center" v-for="item in formData[3*index+2].keys" :key="item.prop" :prop="item.prop" :label="item.label" :width="item.width"> </el-table-column>
+                <el-table-column align="center" v-for="item in formData[3*index+2].keys" :key="item.prop" :prop="item.prop" :label="item.label" :width="item.width">
+	                <el-table-column align="center" v-for="ite in item.data" :key="ite.prop + item.prop" :prop="ite.prop"
+		                :label="ite.label"> </el-table-column>
+                </el-table-column>
               </el-table>
             </div>
           </el-tab-pane>
@@ -182,6 +188,30 @@ export default {
       // this.queryParams.pageNum = 1
       this.getTableList()
     },
+	  keys() {
+		  let arr = [];
+		  if (this.activeName2 !== '3') {
+			  this.formData[this.formDataidx].keys.forEach((item) => {
+				  if (item.type === 'fixed') {
+					  arr.push(item);
+				  } else if (item.type === 'select') {
+					  var temitem = JSON.parse(JSON.stringify(item));
+					  temitem.data = [
+						  { label: '总数', prop: 'dataA', type: 'select', width: '100' },
+						  { label: '公办', prop: 'dataG', type: 'select', width: '100' },
+						  { label: '民办', prop: 'dataM', type: 'select', width: '100' },
+					  ];
+					  arr.push(temitem);
+				  }
+			  });
+			  this.formData[this.formDataidx].keys = arr;
+			  this.formData[this.formDataidx].vales.forEach((item, index) => {
+				  item.dataA = (index + 1) * 4;
+				  item.dataG = (index + 1) * 2;
+				  item.dataM = (index + 1) * 2;
+			  });
+		  }
+	  },
     // 获取表格数据
     async getTableList() {
       // var para = {}
@@ -195,6 +225,7 @@ export default {
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
         this.formData[this.formDataidx] = data[0];
+				this.keys()
       }
     }
   },