消防7.18下午

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

@@ -11,7 +11,7 @@
     <div class="echarts-radio" v-if="isPie">
       <el-radio @change="changRadio(item)" v-model="radio" :label="item.prop" v-for="item in radioLabel" :key="item.prop">{{ item.label }}</el-radio>
     </div>
-    <div :id="echartsId" style="width: 750px; height: 400px" ref="charts"></div>
+    <div :id="echartsId" style="width: 900px; height: 400px" ref="charts"></div>
   </div>
 </template>
 

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

@@ -8,7 +8,7 @@
       <!-- 插入下拉多选框或者日期选择框 -->
       <slot></slot>
     </div>
-    <div class="echarts-radio">
+    <div class="echarts-radio" v-if="isXFTJTab1 === 'yes'">
       <el-form ref="formRef" :model="formData" label-width="80px">
         <div class="flexBox">
           <el-form-item label="检查年度" label-width="70px">
@@ -24,7 +24,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="问题名称">
-            <el-select size="mini" v-model="formData.formSelect2" @change="change2(formData.formSelect2)" >
+            <el-select size="mini" v-model="formData.formSelect2" @change="change2(formData.formSelect2)">
               <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
           </el-form-item>
@@ -37,7 +37,10 @@
         <el-radio @change="changRadio(item)" v-model="radio" :label="item.prop" v-for="item in radioLabel" :key="item.prop">{{ item.label }}</el-radio>
       </div> -->
     </div>
-    <div :id="echartsId" style="width: 750px; height: 400px" ref="charts"></div>
+    <div class="echarts-radio" v-if="isPie || isXFTJTab1 === 'no'">
+      <el-radio @change="changRadio(item)" v-model="radio" :label="item.prop" v-for="item in radioLabel" :key="item.prop">{{ item.label }}</el-radio>
+    </div>
+    <div :id="echartsId" style="width: 900px; height: 400px" ref="charts"></div>
   </div>
 </template>
 
@@ -93,6 +96,16 @@ export default {
     isTwoBar: {
       type: String,
       default: 'no'
+    },
+    // 是否时消防统计的第二大页
+    isXFTJTab1: {
+      type: String,
+      default: 'no'
+    },
+    // 用来判断改变第二大页的小柱的名字
+    isTabs1: {
+      type: String,
+      default: 'no'
     }
   },
   data() {
@@ -128,8 +141,8 @@ export default {
       tjwd: '',
       // 绑定选择日期范围
       yearChoose: '',
-      radio: 'total',
-      filterc:'data1',
+      radio: 'data1',
+      filterc: 'data1',
       newKeys: [],
       newTableList: [],
       newUnit: '',
@@ -154,23 +167,23 @@ export default {
     // }
   },
   methods: {
+    // 单选框改变事件
+    changRadio(item) {
+      this.$emit('change-radio', this.radio)
+      this.setTable(this.xStr, 'total', this.radio, 'data2', 'data3')
+      this.echartsInit(this.echartsId, this.type, this.newUnit, this.x, this.y, this.isX, this.isY)
+    },
     // 改变多选框数据格式
-    change1(value)
-    {
-      this.$emit('changeData', value);
-
+    change1(value) {
+      this.$emit('changeData', value)
     },
-    change2(value)
-    {
+    change2(value) {
       //alert(value);
-      this.filterc=value;
-
+      this.filterc = value
 
-      this.setTable(this.xStr, this.radio,this.filterc)
+      this.setTable(this.xStr, 'total', this.filterc)
 
       this.echartsInit(this.echartsId, this.type, this.newUnit, this.x, this.y, this.isX, this.isY)
-
-
     },
     changeSelectSJGS() {
       let options = []
@@ -179,7 +192,7 @@ export default {
         return true
       })
       array.forEach((item, index) => {
-        if (index==0) this.formData.formSelect2 =item.prop;
+        if (index == 0) this.formData.formSelect2 = item.prop
         let obj = {
           label: '',
           value: ''
@@ -188,7 +201,7 @@ export default {
         obj.value = item.prop
         options.push(obj)
       })
-      this.formData.formSelect1 ='01';
+      this.formData.formSelect1 = '01'
       this.options2 = options
     },
     startTime() {},
@@ -239,29 +252,32 @@ export default {
     //   console.log(this.radioLabel)
     // },
     // 改变table中X轴的数据的数据格式 参数是 x轴对应的数据名字，y轴对应的数据名字
-    setTable(xAxis,yAxis1, yAxis2) {
+    setTable(xAxis, yAxis1, yAxis2, yAxis3, yAxis4) {
       // x轴
       let arrX = []
       let arrY = []
       let arrYa = []
       let arrYb = []
+      // 大页2中的小柱
+      // let arrYc = []
       this.newTableList.forEach((item) => {
         arrX.push(item[xAxis])
         arrYa.push(item[yAxis1])
         arrYb.push(item[yAxis2])
-      });
-
-
-      arrY[0]={};
-      arrY[0].label='已检查机构总数';
-      arrY[0].data=arrYa;
+        // arrYc.push(item[yAxis3] + ',' + item[yAxis4])
+      })
+      console.log(arrYb)
+      arrY[0] = {}
+      arrY[0].label = '已检查机构总数'
+      arrY[0].data = arrYa
 
-      arrY[1]={};
-      if (this.formData.formSelect1=='01')
-        arrY[1].label=this.options1[0].label;
-      else
-        arrY[1].label=this.options1[1].label;
-      arrY[1].data=arrYb;
+      arrY[1] = {}
+      if (this.formData.formSelect1 == '01') arrY[1].label = this.options1[0].label
+      else arrY[1].label = this.options1[1].label
+      arrY[1].data = arrYb
+      // if (this.isTabs1 === 'yes') {
+      //   arrY[1].data = arrYc
+      // }
       this.x = arrX
       this.y = arrY
       if (this.isfftj === true) {
@@ -283,7 +299,7 @@ export default {
         rich: {
           name: {}
         }
-      };
+      }
       // 是否显示xy轴
       let isShow = true
       let yAxis = yData
@@ -294,21 +310,17 @@ export default {
         })
       }
 
-
       var myChart = this.$echarts.init(document.getElementById(id))
       var option = {
         // color: ['#288DEF'],
-        title: {
-        },
+        title: {},
         tooltip: {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
           }
         },
-        legend: {
-
-        },
+        legend: {},
         xAxis: {
           type: isX,
           show: isShow,
@@ -333,26 +345,27 @@ export default {
             color: '#000',
             nameLocation: 'start'
           },
-          data: xAxis
+          data: xAxis,
+          axisLabel: {}
         },
         series: [
           {
-            type: "bar",
+            type: 'bar',
             data: yAxis[0].data,
             radius: ['35%', '65%'],
             hoverAnimation: true,
             avoidLabelOverlap: false,
-            name:yAxis[0].label,
-            label:labelOption
+            name: yAxis[0].label,
+            label: labelOption
           },
           {
-            type: "bar",
+            type: 'bar',
             data: yAxis[1].data,
             radius: ['35%', '65%'],
             hoverAnimation: true,
             avoidLabelOverlap: false,
-            name:yAxis[1].label,
-            label:labelOption
+            name: yAxis[1].label,
+            label: labelOption
           }
         ]
       }
@@ -369,11 +382,11 @@ export default {
     labelKeys(newVal) {
       this.newKeys = newVal
       this.changeSelectSJGS()
-
     },
     tableList(newVal) {
       this.newTableList = newVal
-      this.setTable(this.xStr, this.radio,this.filterc)
+      console.log(this.newTableList)
+      this.setTable(this.xStr, 'total', this.filterc, 'data2', 'data3')
       this.echartsInit(this.echartsId, this.type, this.newUnit, this.x, this.y, this.isX, this.isY)
     }
   }

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

@@ -9,14 +9,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施从业人员统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="社区养老服务机构和设施从业人员统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +27,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施从业人员统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="社区养老服务机构和设施从业人员统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +45,7 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
+              <Echarts-box v-loading="loading" title="从业人员统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,6 +76,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -146,7 +147,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -9,14 +9,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老机构从业人员统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="养老机构从业人员统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +27,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老机构从业人员统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box v-loading="loading" title="养老机构从业人员统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +45,7 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="从业人员统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,6 +76,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -146,7 +147,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

ruoyi-ui/src/views/search/xxtj/lnrtj/sqylfwjghss/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName1" @tab-click="handleClick">
-      <el-tab-pane :label="dict.label" :name="dict.value" v-for="dict in dict.type.TJ006" :key="dict.value">
+      <el-tab-pane :label="dict.label" :name="dict.value" v-for="(dict, index) in dict.type.TJ006" :key="dict.value">
         <el-tabs type="card" v-model="activeName2" @tab-click="handleTabsClick">
           <el-tab-pane label="按月度统计" name="1">
             <!-- 地区搜索和图标区域 -->
@@ -9,14 +9,24 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施老人类型统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box
+                v-loading="loading"
+                :key="queryParams.para2"
+                :title="index === 0 ? '社区养老服务机构和设施老人类型统计-月度' : '社区养老服务机构和设施老人身体能力等级统计-月度'"
+                :echartsId="'one' + dict.value"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+                type="line"
+                xStr="year"
+                :unit="formData.unit"
+              >
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +37,23 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施老人类型统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box
+                v-loading="loading"
+                :key="queryParams.para2"
+                :title="index === 0 ? '社区养老服务机构和设施老人类型统计-行政区划' : '社区养老服务机构和设施老人身体能力等级统计-行政区划'"
+                :echartsId="'two' + dict.value"
+                type="bar"
+                xStr="ssqh"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+              >
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +64,8 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
+              <Echarts-box v-loading="loading" :title="index === 0 ? '社区养老服务机构和设施老人类型统计' : '社区养老服务机构和设施老人身体能力等级统计'" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category">
+              </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,6 +96,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -146,7 +167,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName1" @tab-click="handleClick">
-      <el-tab-pane :label="dict.label" :name="dict.value" v-for="dict in dict.type.TJ005" :key="dict.value">
+      <el-tab-pane :label="dict.label" :name="dict.value" v-for="(dict, index) in dict.type.TJ005" :key="dict.value">
         <el-tabs type="card" v-model="activeName2" @tab-click="handleTabsClick">
           <el-tab-pane label="按月度统计" name="1">
             <!-- 地区搜索和图标区域 -->
@@ -9,14 +9,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老机构床位统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" :title="index === 0 ? '养老机构老人类型统计-月度' : '养老机构老人身体能力等级统计-月度'" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +27,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老机构床位统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" :title="index === 0 ? '养老机构老人类型统计-行政区划' : '养老机构老人身体能力等级统计-行政区划'" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +45,7 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
+              <Echarts-box v-loading="loading" title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,6 +76,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -146,7 +147,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -36,14 +36,14 @@
                 </el-tabs>
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box yName="data1" title="留守老年人数量统计-行政区划" :echartsId="'two' + dict.value" type="bar" :xStr="xStr" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" yName="data1" title="留守老年人数量统计-行政区划" :echartsId="'two' + dict.value" type="bar" :xStr="xStr" :tableList="tableData" :labelKeys="formData.keys">
                 <!-- <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date> -->
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -54,7 +54,7 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="留守老年人数量统计" :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="tableData" :labelKeys="formData.keys"> </Echarts-box>
+              <Echarts-box v-loading="loading" title="留守老年人数量统计" :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="tableData" :labelKeys="formData.keys"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -85,6 +85,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -168,7 +169,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

ruoyi-ui/src/views/search/xxtj/sjtbqktj/sjtbtj/index.vue

@@ -6,8 +6,10 @@
     </div>
     <!-- table区域 -->
     <div class="echarts">
+      <el-button @click="handleExport" size="mini" type="primary" icon="el-icon-download">导出</el-button>
+
       <div class="xxtj-table" style="margin-top: 30px">
-        <el-table :data="formData.vales" style="width: 100%" stripe>
+        <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
           <el-table-column 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"> </el-table-column>
         </el-table>
@@ -33,6 +35,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 是否全指标填报多选框绑定值
       sfqzbtbSelect: '',
       // 单位名称绑定值
@@ -67,6 +70,16 @@ export default {
     }
   },
   methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        'business/lrqd/export',
+        {
+          ...this.queryParams
+        },
+        `lrqd_${new Date().getTime()}.xlsx`
+      )
+    },
     // 接收月日期改变的数据
     changeDateMonth(val) {
       this.queryParams.para4 = val
@@ -108,7 +121,9 @@ export default {
 
     // 获取表格数据
     async getTableList() {
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

ruoyi-ui/src/views/search/xxtj/sjtbqktj/sqylfwjghssqzb/index.vue

@@ -24,10 +24,10 @@
       </div> -->
       <el-form ref="formRef" :model="form" label-width="80px">
         <div class="flexBox">
-          <el-form-item label="活动名称">
+          <el-form-item label="单位名称：" label-width="100px">
             <el-input v-model="form.dwmc"></el-input>
           </el-form-item>
-          <el-form-item label="活动名称">
+          <el-form-item label="是否全指标填报：" label-width="160px">
             <el-select v-model="form.sfqzbtb" placeholder="请选择">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
@@ -36,13 +36,17 @@
             <el-button type="primary" icon="el-icon-search" size="mini">查询</el-button>
             <el-button type="primary" icon="el-icon-refresh-right" size="mini">重置</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button @click="handleExport" size="mini" type="primary" icon="el-icon-download">导出</el-button>
+          </el-form-item>
         </div>
       </el-form>
       <div class="xxtj-table" style="margin-top: 30px">
-        <el-table :data="formData.vales" style="width: 100%" stripe>
+        <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
           <el-table-column 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"> </el-table-column>
         </el-table>
+        <pagination style="margin-bottom: 20px" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getTableList" />
       </div>
     </div>
   </div>
@@ -65,6 +69,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 是否全指标填报多选框绑定值
       sfqzbtbSelect: '',
       // 单位名称绑定值
@@ -89,7 +94,9 @@ export default {
         para1: '1',
         para2: null,
         para3: '1',
-        para4: null
+        para4: null,
+        pageNum: 1,
+        pageSize: 10
       },
       formData: {
         unit: null,
@@ -99,10 +106,59 @@ export default {
       form: {
         dwmc: null,
         sfqzbtb: null
-      }
+      },
+      // 总条数
+      total: 1
     }
   },
   methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        'business/lrqd/export',
+        {
+          ...this.queryParams
+        },
+        `lrqd_${new Date().getTime()}.xlsx`
+      )
+    },
+    // 重置
+    reset() {
+      this.form.dwmc = null
+      this.form.sfqzbtb = null
+      this.getTableList()
+    },
+    // 搜索事件，根据表单过滤table数组
+    search() {
+      console.log(this.form)
+      if (this.form.sfqzbtb === 'yes') {
+        // 当时yes的时候过滤掉没有值的数组
+        const newArr = arr.filter((item) => Object.values(item).every((itemValue) => itemValue !== '' && itemValue !== '0' && itemValue !== null))
+        this.formData.vales = newArr
+        if (this.form.dwmc) {
+          newArr.filter((item) => item.dwmc.search(this.form.dwmc))
+          this.formData.vales = newArr
+        }
+      }
+      if (this.form.sfqzbtb === 'no') {
+        const array2 = arr.filter((item) => {
+          for (let i in item) {
+            if (item[i] === '' || item[i] === '0' || item[i] === null) {
+              return item
+            }
+          }
+        })
+        this.formData.vales = array2
+        if (this.form.dwmc) {
+          array2.filter((item) => item.dwmc.search(this.form.dwm))
+          this.formData.vales = array2
+        }
+      }
+      if (this.form.dwmc) {
+        const array3 = this.formData.vales.filter((item) => item.dwmc.search(this.form.dwm))
+        this.formData.vales = array3
+      }
+    },
     // 接收月日期改变的数据
     changeDateMonth(val) {
       this.queryParams.para4 = val
@@ -144,7 +200,9 @@ export default {
 
     // 获取表格数据
     async getTableList() {
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

ruoyi-ui/src/views/search/xxtj/sjtbqktj/yljgqzb/index.vue

@@ -24,25 +24,29 @@
       </div> -->
       <el-form ref="formRef" :model="form" label-width="80px">
         <div class="flexBox">
-          <el-form-item label="活动名称">
+          <el-form-item label="单位名称：" label-width="100px">
             <el-input v-model="form.dwmc"></el-input>
           </el-form-item>
-          <el-form-item label="活动名称">
+          <el-form-item label="是否全指标填报：" label-width="160px">
             <el-select v-model="form.sfqzbtb" placeholder="请选择">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="活动名称">
-            <el-button type="primary" icon="el-icon-search" size="mini">查询</el-button>
-            <el-button type="primary" icon="el-icon-refresh-right" size="mini">重置</el-button>
+          <el-form-item>
+            <el-button @click="search" type="primary" icon="el-icon-search" size="mini">查询</el-button>
+            <el-button @click="reset" type="primary" icon="el-icon-refresh-right" size="mini">重置</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="handleExport" size="mini" type="primary" icon="el-icon-download">导出</el-button>
           </el-form-item>
         </div>
       </el-form>
       <div class="xxtj-table" style="margin-top: 30px">
-        <el-table :data="formData.vales" style="width: 100%" stripe>
+        <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
           <el-table-column 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"> </el-table-column>
         </el-table>
+        <pagination style="margin-bottom: 20px" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getTableList" />
       </div>
     </div>
   </div>
@@ -65,11 +69,12 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 是否全指标填报多选框绑定值
-      sfqzbtbSelect: '',
-      // 单位名称绑定值
-      dwmcInput: '',
-      // 搜索多选框配置项
+      form: {
+        dwmc: null,
+        sfqzbtb: null
+      },
       options: [
         {
           value: 'yes',
@@ -89,20 +94,67 @@ export default {
         para1: '1',
         para2: null,
         para3: '1',
-        para4: null
+        para4: null,
+        pageNum: 1,
+        pageSize: 10
       },
       formData: {
         unit: null,
         vales: null,
         keys: null
       },
-      form: {
-        dwmc: null,
-        sfqzbtb: null
-      }
+      // 总条数
+      total: 1
     }
   },
   methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        'business/lrqd/export',
+        {
+          ...this.queryParams
+        },
+        `lrqd_${new Date().getTime()}.xlsx`
+      )
+    },
+    // 重置
+    reset() {
+      this.form.dwmc = null
+      this.form.sfqzbtb = null
+      this.getTableList()
+    },
+    // 搜索事件，根据表单过滤table数组
+    search() {
+      console.log(this.form)
+      if (this.form.sfqzbtb === 'yes') {
+        // 当时yes的时候过滤掉没有值的数组
+        const newArr = arr.filter((item) => Object.values(item).every((itemValue) => itemValue !== '' && itemValue !== '0' && itemValue !== null))
+        this.formData.vales = newArr
+        if (this.form.dwmc) {
+          newArr.filter((item) => item.dwmc.search(this.form.dwmc))
+          this.formData.vales = newArr
+        }
+      }
+      if (this.form.sfqzbtb === 'no') {
+        const array2 = arr.filter((item) => {
+          for (let i in item) {
+            if (item[i] === '' || item[i] === '0' || item[i] === null) {
+              return item
+            }
+          }
+        })
+        this.formData.vales = array2
+        if (this.form.dwmc) {
+          array2.filter((item) => item.dwmc.search(this.form.dwm))
+          this.formData.vales = array2
+        }
+      }
+      if (this.form.dwmc) {
+        const array3 = this.formData.vales.filter((item) => item.dwmc.search(this.form.dwm))
+        this.formData.vales = array3
+      }
+    },
     // 接收月日期改变的数据
     changeDateMonth(val) {
       this.queryParams.para4 = val
@@ -144,7 +196,9 @@ export default {
 
     // 获取表格数据
     async getTableList() {
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -9,14 +9,36 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box :key="queryParams.para2" title="社区养老服务机构和设施类别统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box
+                v-loading="loading"
+                :key="queryParams.para2"
+                :title="
+                  index === 0
+                    ? '社区养老服务机构和设施类别统计-月度'
+                    : index === 1
+                    ? '社区养老服务机构和设施法人类型统计-月度'
+                    : index === 2
+                    ? '街道（乡镇）区域性养老服务中心-月度'
+                    : index === 3
+                    ? '社区养老服务机构和设施兴办主体统计-月度'
+                    : index === 4
+                    ? '社区养老服务机构单位性质统计-月度'
+                    : '社区养老服务机构和设施医疗服务方式统计-月度'
+                "
+                :echartsId="'one' + dict.value"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+                type="line"
+                xStr="year"
+                :unit="formData.unit"
+              >
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +49,35 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box :key="queryParams.para2" title="社区养老服务机构和设施类别统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box
+                v-loading="loading"
+                :key="queryParams.para2"
+                :title="
+                  index === 0
+                    ? '社区养老服务机构和设施类别统计-行政区划'
+                    : index === 1
+                    ? '社区养老服务机构和设施法人类型统计-行政区划'
+                    : index === 2
+                    ? '街道（乡镇）区域性养老服务中心-行政区划'
+                    : index === 3
+                    ? '社区养老服务机构和设施兴办主体统计-行政区划'
+                    : index === 4
+                    ? '社区养老服务机构单位性质统计-行政区划'
+                    : '社区养老服务机构和设施医疗服务方式统计-行政区划'
+                "
+                :echartsId="'two' + dict.value"
+                type="bar"
+                xStr="ssqh"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+              >
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +88,16 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施类别统计" :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="tableData" :labelKeys="formData.keys"> </Echarts-box>
+              <Echarts-box
+                v-loading="loading"
+                :title="index === 0 ? '社区养老服务机构和设施类别统计' : index === 1 ? '社区养老服务机构和设施法人类型统计' : index === 2 ? '' : index === 3 ? '社区养老服务机构和设施兴办主体统计' : index === 4 ? '社区养老服务机构单位性质统计' : '社区养老服务机构和设施医疗服务方式统计'"
+                :echartsId="'three' + dict.value"
+                type="pie"
+                :isPie="false"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+              >
+              </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,6 +128,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -147,7 +200,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -27,10 +27,25 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box2 isTwoBar="yes" @changeData="changeDataA" v-if="index === 0" title="养老机构消防安全问题统计" :echartsId="'two' + dict.value" type="bar" xStr="year" :tableList="table1Data" :labelKeys="formData.keys"> </Echarts-box2>
-              <Echarts-box isTwoBar="yes" v-if="index === 1" title="养老机构备案情况统计-月度" :echartsId="'w' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="bar" xStr="xzqh" :unit="formData.unit">
+              <Echarts-box2
+                :isPie="false"
+                isXFTJTab1="yes"
+                v-loading="loading"
+                :key="queryParams.para2"
+                isTwoBar="yes"
+                @changeData="changeDataA"
+                v-if="index === 0"
+                title="养老机构消防安全问题统计"
+                :echartsId="'two' + dict.value"
+                type="bar"
+                xStr="year"
+                :tableList="table1Data"
+                :labelKeys="formData.keys"
+              >
+              </Echarts-box2>
+              <Echarts-box2 isTabs1="yes" v-loading="loading" :key="queryParams.para2" isTwoBar="yes" v-if="index === 1" title="统计存在问题的机构数量及整改完成率-行政区划" :echartsId="'w' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="bar" xStr="xzqh" :unit="formData.unit">
                 <el-date-picker @change="changDateYear" value-format="yyyy" v-model="formParams.ccnd" type="year" placeholder="选择年"> </el-date-picker>
-              </Echarts-box>
+              </Echarts-box2>
               <div v-if="index === 2" class="echarts">
                 <div>
                   <div>按行政区划统计每个机构存在问题数及整改完成率</div>
@@ -51,7 +66,7 @@
                     </div>
                   </el-form>
                 </div>
-                <el-table border :data="formData.vales" style="width: 100%">
+                <el-table v-loading="loading" border :data="formData.vales" style="width: 100%">
                   <el-table-column v-for="item in formData.keys" :key="item.prop" :prop="item.prop" :label="item.label" width="180"> </el-table-column>
                 </el-table>
               </div>
@@ -59,7 +74,7 @@
             <!-- <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div> -->
             <!-- table区域 -->
             <div class="xxtj-table" v-if="index !== 2">
-              <el-table :data="index === 1 || index === 2 ? tableData : table1Data" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="index === 1 || index === 2 ? tableData : table1Data" style="width: 100%" stripe>
                 <el-table-column type="index" label="序号"> </el-table-column>
                 <el-table-column align="center" v-for="(item, index) in formData.keys" :key="item.prop" :prop="item.prop" :label="item.label"> </el-table-column>
               </el-table>
@@ -88,7 +103,7 @@
                     </div>
                   </el-form>
                 </div>
-                <el-table v-if="index === 0" border :data="formData.vales" style="width: 100%">
+                <el-table v-loading="loading" v-if="index === 0" border :data="formData.vales" style="width: 100%">
                   <el-table-column 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="180">
                     <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>
@@ -129,6 +144,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -162,27 +178,23 @@ export default {
       ccnd: '',
       // 表格1中的数据源
       table1Data: [],
-      tabdata1:[],
-      tabdata2:[],
+      tabdata1: [],
+      tabdata2: []
     }
   },
   methods: {
     changeDataA(ret) {
-      this.table1Data=[];
-      if (ret=='02')
-        this.table1Data=this.tabdata2;
-      else
-        this.table1Data=this.tabdata1;
+      this.table1Data = []
+      if (ret == '02') this.table1Data = this.tabdata2
+      else this.table1Data = this.tabdata1
     },
     table1Keys() {
-
       this.formData.keys.forEach((item, index) => {
         let num = index - 2
         if (index > 2) {
           item.prop = 'data' + num
         }
       })
-
     },
     vales() {
       this.formData.vales.forEach((item) => {
@@ -222,18 +234,16 @@ export default {
           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() {
-
-     // console.log(JSON.stringify(this.formData), 'this.formData')
+      // console.log(JSON.stringify(this.formData), 'this.formData')
 
       let arr = []
       if (this.activeName1 === '1') {
@@ -245,22 +255,19 @@ export default {
             arr.push(item)
           } else if (item.type === 'select') {
             if (num % number === 0) {
-
-              var temitem=JSON.parse(JSON.stringify(item));
+              var temitem = JSON.parse(JSON.stringify(item))
               temitem.data = []
               temitem.data.push({ ...item, label: unit[num % number] })
               arr.push(temitem)
             } else {
-
               arr[arr.length - 1].data.push({ ...item, label: unit[num % number] })
             }
 
-            num++;
-
+            num++
           }
         })
         this.formData.keys = arr
-      //  console.log(arr, 'arr')
+        //  console.log(arr, 'arr')
       }
     },
     startTime() {},
@@ -317,8 +324,8 @@ export default {
       this.queryParams.para1 = this.activeName1
       this.getTableList()
       this.table1Data = []
-      this.tabdata1=[]
-      this.tabdata2=[]
+      this.tabdata1 = []
+      this.tabdata2 = []
     },
     // 子tabs栏切换事件
     handleTabsClick() {
@@ -326,8 +333,8 @@ export default {
       this.formData.keys = []
       this.formData.vales = []
       this.table1Data = []
-      this.tabdata1=[]
-      this.tabdata2=[]
+      this.tabdata1 = []
+      this.tabdata2 = []
       this.getTableList()
     },
     // 节点单击事件
@@ -341,8 +348,9 @@ export default {
     },
     // 获取表格数据
     async getTableList() {
-
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
         this.formData = data[0]
@@ -350,13 +358,11 @@ export default {
           this.keys()
         }
         if (this.activeName1 === '1') {
-
           this.vales()
         }
         if (this.activeName1 === '1' && this.activeName2 === '1') {
           this.table1Keys()
         }
-
       }
     }
   },

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

@@ -7,12 +7,23 @@
           <div class="ssqh">
             <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
           </div>
-          <Echarts-box :title="index === 0 ? '养老机构消防设施配备情况统计-行政区划' : '配备每种消防设施的养老机构数量统计-消防设施类别'" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit"> </Echarts-box>
+          <Echarts-box
+            v-loading="loading"
+            :key="queryParams.para2"
+            :title="index === 0 ? '养老机构消防设施配备情况统计-行政区划' : '配备每种消防设施的养老机构数量统计-消防设施类别'"
+            :echartsId="'one' + dict.value"
+            :tableList="tableData"
+            :labelKeys="formData.keys"
+            type="line"
+            xStr="year"
+            :unit="formData.unit"
+          >
+          </Echarts-box>
         </div>
         <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
         <!-- table区域 -->
         <div class="xxtj-table">
-          <el-table :data="formData.vales" style="width: 100%" stripe>
+          <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
             <el-table-column 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"> </el-table-column>
           </el-table>
@@ -40,6 +51,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
@@ -104,7 +116,9 @@ export default {
     // },
     // 获取表格数据
     async getTableList() {
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

ruoyi-ui/src/views/search/xxtj/ylcwtj/sqylfwjghss/index.vue

@@ -9,14 +9,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施床位统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="社区养老服务机构和设施床位统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +27,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="社区养老服务机构和设施床位统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="社区养老服务机构和设施床位统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +45,7 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
+              <Echarts-box v-loading="loading" title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,12 +76,13 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
       activeName2: '1',
       queryParams: {
-        dictType: 'TJ001',
+        dictType: 'TJ004',
         para1: '1',
         para2: null,
         para3: null,
@@ -146,7 +147,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName1" @tab-click="handleClick">
-      <el-tab-pane :label="dict.label" :name="dict.value" v-for="dict in dict.type.TJ003" :key="dict.value">
+      <el-tab-pane :label="dict.label" :name="dict.value" v-for="(dict, index) in dict.type.TJ003" :key="dict.value">
         <el-tabs type="card" v-model="activeName2" @tab-click="handleTabsClick">
           <el-tab-pane label="按月度统计" name="1">
             <!-- 地区搜索和图标区域 -->
@@ -9,14 +9,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老机构床位统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="养老机构床位统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -27,14 +27,14 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老机构床位统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box v-loading="loading" :key="queryParams.para2" title="养老机构床位统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。 对于大集中部署模式的省份则是数据未填报。</div>
             <!-- table区域 -->
             <div class="xxtj-table">
-              <el-table :data="formData.vales" style="width: 100%" stripe>
+              <el-table v-loading="loading" :data="formData.vales" style="width: 100%" stripe>
                 <el-table-column 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"> </el-table-column>
               </el-table>
@@ -45,7 +45,7 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
+              <Echarts-box v-loading="loading" title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="tableData" :labelKeys="formData.keys" isX="value" isY="category"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -76,12 +76,13 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
       // 内侧tabs绑定的name
       activeName2: '1',
       queryParams: {
-        dictType: 'TJ001',
+        dictType: 'TJ003',
         para1: '1',
         para2: null,
         para3: null,
@@ -146,7 +147,9 @@ export default {
       // para.outType = '0'
       // para.para1 = '1'
       // para.para2 = '277f45bc79f040839848fba510be1c6d'
+      this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
       console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)

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

@@ -9,7 +9,35 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box v-loading="loading" :key="queryParams.para2" title="养老机构备案情况统计-月度" :echartsId="'one' + dict.value" :tableList="tableData" :labelKeys="formData.keys" type="line" xStr="year" :unit="formData.unit">
+              <Echarts-box
+                v-loading="loading"
+                :key="queryParams.para2"
+                :title="
+                  index === 0
+                    ? '养老机构备案情况统计-月度'
+                    : index === 1
+                    ? '养老机构法人类型统计-月度'
+                    : index === 2
+                    ? '特困救助供养机构统计-月度'
+                    : index === 3
+                    ? '光荣院统计-月度'
+                    : index === 4
+                    ? '街道（乡镇）区域性养老中心-月度'
+                    : index === 5
+                    ? '养老机构兴办主体统计-月度'
+                    : index === 6
+                    ? '养老机构入住率统计-月度'
+                    : index === 7
+                    ? '医疗服务方式-月度'
+                    : '养老机构单位性质统计-月度'
+                "
+                :echartsId="'one' + dict.value"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+                type="line"
+                xStr="year"
+                :unit="formData.unit"
+              >
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
               </Echarts-box>
             </div>
@@ -28,7 +56,34 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box v-loading="loading" :key="queryParams.para2" title="养老机构备案情况统计-行政区划" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="tableData" :labelKeys="formData.keys">
+              <Echarts-box
+                v-loading="loading"
+                :key="queryParams.para2"
+                :title="
+                  index === 0
+                    ? '养老机构备案情况统计-行政区划'
+                    : index === 1
+                    ? '养老机构法人类型统计-行政区划'
+                    : index === 2
+                    ? '特困救助供养机构统计-行政区划'
+                    : index === 3
+                    ? '光荣院统计-行政区划'
+                    : index === 4
+                    ? '街道（乡镇）区域性养老中心-行政区划'
+                    : index === 5
+                    ? '养老机构兴办主体统计-行政区划'
+                    : index === 6
+                    ? '养老机构入住率统计-行政区划'
+                    : index === 7
+                    ? '医疗服务方式-行政区划'
+                    : '养老机构单位性质统计-行政区划'
+                "
+                :echartsId="'two' + dict.value"
+                type="bar"
+                xStr="ssqh"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+              >
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
               </Echarts-box>
             </div>
@@ -46,7 +101,16 @@
               <div class="ssqh">
                 <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
-              <Echarts-box v-loading="loading" title="养老机构备案情况统计" :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="tableData" :labelKeys="formData.keys"> </Echarts-box>
+              <Echarts-box
+                v-loading="loading"
+                :title="index === 0 ? '养老机构备案情况统计' : index === 1 ? '养老机构法人类型统计' : index === 2 ? '' : index === 3 ? '' : index === 4 ? '' : index === 5 ? '养老机构兴办主体统计' : index === 6 ? '养老机构入住率统计' : index === 7 ? '医疗服务方式' : '养老机构单位性质统计'"
+                :echartsId="'three' + dict.value"
+                type="pie"
+                :isPie="false"
+                :tableList="tableData"
+                :labelKeys="formData.keys"
+              >
+              </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -77,6 +141,18 @@ export default {
   },
   data() {
     return {
+      ydtitle: '',
+      // ydtitle: {
+      //   0: '养老机构备案情况统计-月度',
+      //   1: '养老机构法人类型统计-月度',
+      //   2: '特困救助供养机构统计-月度',
+      //   3: '光荣院统计-月度',
+      //   4: '街道（乡镇）区域性养老中心-月度',
+      //   5: '养老机构兴办主体统计-月度',
+      //   6: '养老机构入住率统计-月度',
+      //   7: '医疗服务方式-月度',
+      //   8: '养老机构单位性质统计-月度'
+      // },
       loading: true,
       // 外侧tabs绑定的name
       activeName1: '1',
@@ -97,6 +173,38 @@ export default {
     }
   },
   methods: {
+    // 月度标题方法
+    changeTitle(index) {
+      switch (index) {
+        case 0:
+          this.ydtitle = '养老机构备案情况统计-月度'
+          return this.ydtitle
+        case 1:
+          this.ydtitle = '养老机构法人类型统计-月度'
+          return this.ydtitle
+        case 2:
+          this.ydtitle = '特困救助供养机构统计-月度'
+          return this.ydtitle
+        case 3:
+          this.ydtitle = '光荣院统计-月度'
+          return this.ydtitle
+        case 4:
+          this.ydtitle = '街道（乡镇）区域性养老中心-月度'
+          return this.ydtitle
+        case 5:
+          this.ydtitle = '养老机构兴办主体统计-月度'
+          return this.ydtitle
+        case 6:
+          this.ydtitle = '养老机构入住率统计-月度'
+          return this.ydtitle
+        case 7:
+          this.ydtitle = '医疗服务方式-月度'
+          return this.ydtitle
+        case 8:
+          this.ydtitle = '养老机构单位性质统计-月度'
+          return this.ydtitle
+      }
+    },
     // 接收月日期改变的数据
     changeDateMonth(val) {
       this.queryParams.para4 = val
@@ -122,11 +230,15 @@ export default {
       this.activeName2 = '1'
       this.queryParams.para3 = this.activeName2
       this.queryParams.para1 = this.activeName1
+      this.queryParams.para2 = null
+      this.queryParams.para4 = null
       this.getTableList()
     },
     // 子tabs栏切换事件
     handleTabsClick() {
       this.queryParams.para3 = this.activeName2
+      this.queryParams.para2 = null
+      this.queryParams.para4 = null
       this.getTableList()
     },
     // 节点单击事件