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

ruoyi-ui/src/components/xxtjEcharts/EchartsBox/index.vue

@@ -5,7 +5,7 @@
         <span class="black-box"></span>
         <span>{{ title }}</span>
       </div>
-      <div v-if="this.xfsspbqk === 'yes'">{{ '已检查机构总数' + total + '个' }}</div>
+      <div v-if="this.xfsspbqk === 'yes'">{{ '已检查机构总数' + total + '家' }}</div>
       <!-- 插入下拉多选框或者日期选择框 -->
       <slot></slot>
     </div>
@@ -90,6 +90,11 @@ export default {
     xfsspbqk: {
       type: String,
       default: 'no'
+    },
+    // 是否是入住率
+    ruzhulv:{
+      type:String,
+      default:'no'
     }
   },
   data() {
@@ -264,6 +269,9 @@ export default {
           }
         ]
       }
+      if(this.ruzhulv === 'yes'){
+        option.yAxis.name = ''
+      }
       if (type === 'bar' || type === 'line') {
         option.series[0].label = {
           show: true,

ruoyi-ui/src/components/xxtjEcharts/EchartsBox2/index.vue

@@ -500,7 +500,7 @@ export default {
           }
         }
         if (this.istabs2 === 'yes') {
-          option.yAxis.name = '单位：' + unit
+          option.yAxis.name = ''
         }
       }
 

ruoyi-ui/src/views/organization/yggl/ygBtxx/index.vue

@@ -27,7 +27,7 @@ export default {
   },
    data(){
     return{
-      title:'培训经历信息',
+      title:'补贴信息',
       open:false,
       oldId:null,
     }

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

@@ -16,8 +16,9 @@
           <el-table-column align="center" type="index" label="序号" width="60"> </el-table-column>
           <el-table-column v-for="item in formData.keys" :key="item.prop" :prop="item.prop" :label="item.label" :width="item.width">
             <el-table-column v-for="ite in item.data" :key="ite.prop + item.prop" :prop="ite.prop" :label="ite.label" width="120"> </el-table-column>
-            <!-- <el-table-column v-if="index !== 0 && index !== 1" prop="province" label="累计问题数量" width="120"> </el-table-column>
-                    <el-table-column v-if="index !== 0 && index !== 1" prop="city" label="现存问题数量" width="120"> </el-table-column> -->
+              <!-- <el-table-column  label="累计问题数量" width="120"> </el-table-column>
+              <el-table-column  label="现存问题数量" width="120"> </el-table-column>
+              <el-table-column  label="现存问题数量" width="120"> </el-table-column> -->
           </el-table-column>
         </el-table>
       </div>
@@ -131,55 +132,54 @@ export default {
         console.log(this.formData)
       }
     },
-    vales() {
-      this.formData.vales.forEach((item) => {
-        /*组成全是data对象 */
+    // vales() {
+    //   this.formData.vales.forEach((item) => {
+    //     /*组成全是data对象 */
 
-        let arr = Object.values(item)
-        let newArr = arr.splice(3)
+    //     let arr = Object.values(item)
+    //     let newArr = arr.splice(3)
 
-        let OUArr = newArr.filter((item, index) => {
-          return index % 2 === 0
-        })
-        let JIarr = newArr.filter((item, index) => {
-          return index % 2 === 1
-        })
+    //     let OUArr = newArr.filter((item, index) => {
+    //       return index % 2 === 0
+    //     })
+    //     let JIarr = newArr.filter((item, index) => {
+    //       return index % 2 === 1
+    //     })
 
-        let newOBj1 = {}
-        OUArr.forEach((item, index) => {
-          let num = index + 1
-          let str = 'data' + num
-          newOBj1[str] = item
-        })
-        let newOBj2 = {}
-        JIarr.forEach((item, index) => {
-          let num = index + 1
-          let str = 'data' + num
-          newOBj2[str] = item
-        })
-        /*取对象前3项操作 */
-        let keysArr = Object.keys(item)
-        let twoKeyArr = keysArr.splice(0, 3)
+    //     let newOBj1 = {}
+    //     OUArr.forEach((item, index) => {
+    //       let num = index + 1
+    //       let str = 'data' + num
+    //       newOBj1[str] = item
+    //     })
+    //     let newOBj2 = {}
+    //     JIarr.forEach((item, index) => {
+    //       let num = index + 1
+    //       let str = 'data' + num
+    //       newOBj2[str] = item
+    //     })
+    //     /*取对象前3项操作 */
+    //     let keysArr = Object.keys(item)
+    //     let twoKeyArr = keysArr.splice(0, 3)
 
-        // 前两项的value
-        let twoValueArr = arr.splice(0, 3)
+    //     // 前两项的value
+    //     let twoValueArr = arr.splice(0, 3)
 
-        let twoOBJ = {}
-        twoKeyArr.forEach((item, index) => {
-          twoOBJ[item] = twoValueArr[index]
-        })
+    //     let twoOBJ = {}
+    //     twoKeyArr.forEach((item, index) => {
+    //       twoOBJ[item] = twoValueArr[index]
+    //     })
 
-        let obja = Object.assign(newOBj1, twoOBJ)
-        let objb = Object.assign(newOBj2, twoOBJ)
-        this.tabdata1.push(obja)
-        this.tabdata2.push(objb)
-        this.table1Data.push(obja)
-      })
-    },
+    //     let obja = Object.assign(newOBj1, twoOBJ)
+    //     let objb = Object.assign(newOBj2, twoOBJ)
+    //     this.tabdata1.push(obja)
+    //     this.tabdata2.push(objb)
+    //     this.table1Data.push(obja)
+    //   })
+    // },
     // 表变表格2数据格式
     keys() {
       let arr = []
-      if (this.activeName1 === '1') {
         let unit = this.formData.unit.split(',')
         let number = unit.length
         let num = 0
@@ -195,12 +195,11 @@ export default {
             } else {
               arr[arr.length - 1].data.push({ ...item, label: unit[num % number] })
             }
-
             num++
           }
         })
         this.formData.keys = arr
-      }
+        console.log(this.formData.keys);
     }
   },
   mounted() {},

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

@@ -43,6 +43,7 @@
             <!-- <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div> -->
             <!-- table区域 -->
             <div class="xxtj-table">
+              <span style="margin-left:15px;">单位：人</span>
               <el-table v-loading="loading" :data="formData.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.keys" :key="item.prop" :prop="item.prop" :label="item.label" :width="item.width"> </el-table-column>

ruoyi-ui/src/views/search/xxtj/xfaqjcqktj/xfsspbqktj/index.vue

@@ -11,7 +11,7 @@
           <Echarts-box
             :isPie="index === 1 ? false : true"
             :xfsspbqk="index === 1 ? 'yes' : 'no'"
-            :danwei="index === 0 ? '家' : '个'"
+            danwei="家"
             v-loading="loading"
             :title="index === 0 ? '养老机构消防设施配备情况统计-行政区划' : '配备每种消防设施的养老机构数量统计-消防设施类别'"
             :echartsId="'one' + dict.value"

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

@@ -29,7 +29,7 @@
                   ? '医疗服务方式-月度'
                   : '养老机构单位性质统计-月度'
               " :echartsId="'one' + dict.value" :tableList="formData[3*index+1].vales"
-                :labelKeys="formData[3*index+1].keys" type="line" :unit="formData[3*index+1].unit">
+                :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>
             </div>