浏览代码

9.17.17.52

luosixu 2 年之前
父节点
当前提交
53031863c3

+ 1 - 0
ruoyi-ui/src/views/business/btgl/jgbthp/index.vue

@@ -229,6 +229,7 @@ export default {
   methods: {
     handleClose(val) {
       this.qdlbOpen = val
+      this.getList()
     },
     // 节点单击事件
     handleNodeClick(data) {

+ 1 - 0
ruoyi-ui/src/views/business/btgl/jgqd/index.vue

@@ -178,6 +178,7 @@ export default {
   methods: {
     handleClose(val) {
       this.qdlbOpen = val
+      this.getList()
     },
     // 节点单击事件
     handleNodeClick(data) {

+ 1 - 0
ruoyi-ui/src/views/business/btgl/lrbthp/index.vue

@@ -268,6 +268,7 @@ export default {
     getQdlbOpen(val) {
       console.log(val)
       this.qdlbOpen = val
+      this.getList()
     },
     // 节点单击事件
     handleNodeClick(data) {

+ 1 - 0
ruoyi-ui/src/views/business/btgl/lrqd/index.vue

@@ -188,6 +188,7 @@ export default {
     getQdlbOpen(val) {
       console.log(val)
       this.qdlbOpen = val
+      this.getList()
     },
     // 节点单击事件
     handleNodeClick(data) {

+ 1 - 4
ruoyi-ui/src/views/business/fwjggl/djpd/djzspb/index.vue

@@ -293,7 +293,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :disabled="isDisable" type="primary" @click="submitForm">提 交</el-button>
+        <el-button :loading="submitFormLoading" type="primary" @click="submitForm">提 交</el-button>
         <el-button @click="cancel">取 消</el-button>
 
       </div>
@@ -311,8 +311,6 @@ export default {
     dicts: ['CZ016', 'CZ017', 'CZ013', 'CZ012'],
     data() {
       return {
-        // 提交按钮禁用
-        isDisable:true,
         // 遮罩层
         loading: true,
         submitFormLoading: false,
@@ -714,7 +712,6 @@ export default {
                       sqzt: sqzt
                     }
                     this.$set(this.djzspbList, this.index, data)
-                    this.isDisable = false
                     this.getList()
                     // this.djzspbList = this.dataReplacement(
                     //   this.djzspbList,

+ 4 - 9
ruoyi-ui/src/views/business/fwjggl/djpd/pdzjCq/indexnew.vue

@@ -358,7 +358,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-          :disabled="submitFormDisable"
           type="primary"
           @click="submitForm"
           :loading="submitFormLoading"
@@ -417,7 +416,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-          :disabled="submitFormAutoDisable"
           type="primary"
           @click="submitFormAuto"
           :loading="submitFormLoading"
@@ -467,9 +465,6 @@ export default {
   ],
   data() {
     return {
-      // 两个提交按钮的禁用
-      submitFormDisable:true,
-      submitFormAutoDisable:true,
       // 遮罩层
       loading: true,
       submitFormLoading: false,
@@ -736,19 +731,20 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.submitFormLoading = true
           const pdzj = this.yxzList.map((i) => i.id);
           addPdzjCq({ ...this.form, pdzj: pdzj }).then((res) => {
             this.$modal.msgSuccess("分配成功");
-            this.submitFormDisable = false
             this.open = false;
             this.getList();
-          });
+          }).finally(() => (this.submitFormLoading = false));
         }
       });
     },
     submitFormAuto() {
       this.$refs["cqpzform"].validate((valid) => {
         if (valid) {
+          this.submitFormLoading = true
           let zjxzqh = "";
           if (Array.isArray(this.cqpzform.zjxzqh)) {
             zjxzqh = this.cqpzform.zjxzqh[this.cqpzform.zjxzqh.length - 1];
@@ -761,8 +757,7 @@ export default {
             this.yxzList = res.data;
             this.loading = false;
             this.openAuto = false;
-            this.submitFormAutoDisable = false
-          });
+          }).finally(() => (this.submitFormLoading = false));
         }
       });
     },

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -32,7 +32,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -57,7 +57,7 @@
           <el-tab-pane label="从业人员统计" name="3">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box danwei="人" v-loading="loading" title="从业人员统计" :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="formData[3*index+3].vales" :labelKeys="formData[3*index+3].keys" isX="value" isY="category"> </Echarts-box>
@@ -270,6 +270,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -32,7 +32,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -57,7 +57,7 @@
           <el-tab-pane label="按分类统计" name="3">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box danwei="人" v-loading="loading" title="从业人员统计" :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="formData[3*index+3].vales" :labelKeys="formData[3*index+3].keys" isX="value" isY="category"> </Echarts-box>
@@ -270,6 +270,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -218,7 +218,6 @@ export default {
 }
 .ssqh {
   width: 20%;
-  text-align: center;
   overflow-y: scroll;
 }
 .echarts {
@@ -281,9 +280,7 @@ export default {
   justify-content: space-between;
 }
 .sxzd {
-  text-decoration: underline;
   font-weight: 600;
-  text-align: center;
-  margin: 10px 0;
+  margin: 10px 15px;
 }
 </style>

+ 1 - 4
ruoyi-ui/src/views/search/xxtj/jlytj/index.vue

@@ -147,7 +147,6 @@ export default {
 }
 .ssqh {
   width: 20%;
-  text-align: center;
   overflow-y: scroll;
 }
 .echarts {
@@ -210,9 +209,7 @@ export default {
   justify-content: space-between;
 }
 .sxzd {
-  text-decoration: underline;
   font-weight: 600;
-  text-align: center;
-  margin: 10px 0;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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
@@ -42,7 +42,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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
@@ -76,7 +76,7 @@
           <el-tab-pane label="养老床位统计" name="3">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box
@@ -302,6 +302,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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
@@ -42,7 +42,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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="index === 0 ? '养老机构老人类型统计-行政区划' : '养老机构老人身体能力等级统计-行政区划'" :echartsId="'two' + dict.value" type="bar" xStr="ssqh" :tableList="formData[3*index+2].vales" :labelKeys="formData[3*index+2].keys">
@@ -67,7 +67,7 @@
           <el-tab-pane label="按分类统计" name="3">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box danwei="人" hengzhu="yes" v-loading="loading" title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="formData[3*index+3].vales" :labelKeys="formData[3*index+3].keys" isX="value" isY="category"> </Echarts-box>
@@ -280,6 +280,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -2,7 +2,7 @@
   <div class="app-container app-box">
     <!-- 地区搜索和图标区域 -->
     <div class="ssqh">
-      <span class="sxzd">所属行政区划</span>
+      <p class="sxzd">行政区划</p>
       <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
     </div>
     <!-- table区域 -->
@@ -209,6 +209,7 @@ export default {
   justify-content: space-between;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -2,7 +2,7 @@
   <div class="app-container app-box">
     <!-- 地区搜索和图标区域 -->
     <div class="ssqh">
-      <span class="sxzd">所属行政区划</span>
+      <p class="sxzd">行政区划</p>
       <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
     </div>
     <!-- table区域 -->
@@ -298,6 +298,7 @@ export default {
   display: flex;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -2,7 +2,7 @@
   <div class="app-container app-box">
     <!-- 地区搜索和图标区域 -->
     <div class="ssqh">
-      <span class="sxzd">所属行政区划</span>
+      <p class="sxzd">行政区划</p>
       <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
     </div>
     <!-- table区域 -->
@@ -291,6 +291,7 @@ export default {
   display: flex;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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
@@ -52,7 +52,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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
@@ -97,7 +97,7 @@
           <el-tab-pane label="按分类统计" name="3" v-if="index !== 2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box
@@ -315,6 +315,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -25,7 +25,7 @@
           <el-tab-pane label="统计表1" name="1">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :key="activeName2" :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
               <Echarts-box2
@@ -105,7 +105,7 @@
           <el-tab-pane label="统计表2" name="2" v-if="index === 0">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :key="activeName2" :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
               <div class="echarts">
@@ -534,6 +534,7 @@ export default {
   justify-content: space-around;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -5,7 +5,7 @@
         <!-- 地区搜索和图标区域 -->
         <div class="echarts-box">
           <div class="ssqh">
-            <span class="sxzd">所属行政区划</span>
+            <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
@@ -235,6 +235,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

+ 4 - 3
ruoyi-ui/src/views/search/xxtj/ylbttj/index.vue

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[1]"  ref="dztree1" :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
               <!-- 机构双饼图 -->
@@ -40,7 +40,7 @@
           <el-tab-pane label="补贴增长变化" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[2]"  ref="dztree2" :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"> </dept-tree>
               </div>
               <!-- 机构双柱图 -->
@@ -793,6 +793,7 @@ export default {
   align-items: center;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -32,7 +32,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -57,7 +57,7 @@
           <el-tab-pane label="养老床位统计" name="3">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box danwei="张" hengzhu="yes" v-loading="loading" title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="formData[3*index+3].vales" :labelKeys="formData[3*index+3].keys" isX="value" isY="category"> </Echarts-box>
@@ -273,6 +273,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -32,7 +32,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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">
@@ -57,7 +57,7 @@
           <el-tab-pane label="按分类统计" name="3">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
               <Echarts-box danwei="张" hengzhu="yes" v-loading="loading" title="养老床位统计" :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="formData[3*index+3].vales" :labelKeys="formData[3*index+3].keys" isX="value" isY="category"> </Echarts-box>
@@ -274,6 +274,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>

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

@@ -7,7 +7,7 @@
             <!-- 地区搜索和图标区域 -->
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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 v-loading="loading" :title="
@@ -24,7 +24,7 @@
                   : index === 5
                   ? '养老机构兴办主体统计-月度'
                   : index === 6
-                  ? '养老机构入住率统计'
+                  ? '养老机构入住率统计-月度'
                   : index === 7
                   ? '医疗服务方式-月度'
                   : '养老机构单位性质统计-月度'
@@ -37,7 +37,7 @@
             <!-- table区域 -->
             <div class="xxtj-table">
               <div class="flex-box1">
-                <span>单位:家</span>
+                <span></span>
                 <el-button type="primary" icon="el-icon-download" size="mini"
                   @click="handleExport(formData[3*index+1],dict.label,'养老机构')">
                   导出</el-button>
@@ -53,7 +53,7 @@
           <el-tab-pane label="按行政区划统计" name="2">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <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="
@@ -98,7 +98,7 @@
           <el-tab-pane label="按分类统计" name="3" v-if="index !== 2 && index !== 3 && index !== 4">
             <div class="echarts-box">
               <div class="ssqh">
-                <span class="sxzd">所属行政区划</span>
+                <p class="sxzd">行政区划</p>
 
                 <dept-tree :isTj="true" :isLoad="treeliadzt[3*index+3]"  :ref="'dztree'+(3*index+3)" :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1,activeName2,$event)"> </dept-tree>
               </div>
@@ -107,7 +107,7 @@
                 :echartsId="'three' + dict.value" type="pie" :isPie="false" :tableList="formData[3*index+3].vales"
                 :labelKeys="formData[3*index+3].keys">
               </Echarts-box>
-              <rzl-Echarts :isPie="false" v-if="index === 6" v-loading="loading" title="养老机构入住率统计-月度"
+              <rzl-Echarts :isPie="false" v-if="index === 6" v-loading="loading" title="养老机构入住率统计"
                 :echartsId="'six' + dict.value" :tableList="formData[3*index+3].vales"
                 :labelKeys="formData[3*index+3].keys" type="pie" :unit="formData[3*index+3].unit"></rzl-Echarts>
             </div>
@@ -410,6 +410,7 @@ export default {
   color: #000000a6;
 }
 .sxzd {
-  text-decoration: underline;
+  font-weight: 600;
+  margin: 10px 15px;
 }
 </style>