角色权限修改，请求参数修改

src/api/home.js

@@ -25,7 +25,7 @@ export function commonMethod(param) {
 
         }
       }
-      param.wd = _wd
+      param.wd = JSON.stringify(_wd)
     }
 
 

src/components/userJoin/screenTwoPag1.vue

@@ -850,10 +850,10 @@
           ]
         },
         themeidnow: 13,
-        themeID: 7, // 慢病在管ID
-        themeID2: 13, // 慢病高血压
-        themeID3: 19, // 慢病管理 糖尿病
-        themeID4: 10, // 慢病管理 肿瘤
+        themeID: 9, // 慢病在管ID
+        themeID2: 15, // 慢病高血压
+        themeID3: 21, // 慢病管理 糖尿病
+        themeID4: 12, // 慢病管理 肿瘤
         pageNo: 1,
         DieaNo: 1,
         gtopdata: [],
@@ -1119,7 +1119,7 @@
         _this.agedatayg = []
         if (_this.DieaNo == 1) {
           
-          this.themeidnow = 13 // 柱状图请求ID
+          this.themeidnow = 15 // 柱状图请求ID
           this.bottominit() // 数据请求、柱状图图标渲染
           _this.gtopdata = _this.agdata[0]
           _this.qtopdata = _this.aqdata[0]
@@ -1160,7 +1160,7 @@
           })
         } else if (_this.DieaNo == 2) {
           console.log("糖尿病输出");
-          this.themeidnow = 19 // 底部柱状图ID
+          this.themeidnow = 21 // 底部柱状图ID
           this.bottominit() // 数据请求、柱状图图标渲染
           _this.gtopdata = _this.agdata[1]
           _this.qtopdata = _this.aqdata[1]
@@ -1199,7 +1199,7 @@
             _this.agedatayg.push(item.zbxx[1].ZXZ)
           })
         } else {
-          this.themeidnow = 10
+          this.themeidnow = 12
           this.bottominit()
           let _this = this
           setTimeout(function(){_this.zhongliu()},500)

src/components/userJoin/screenTwoPag2.vue

@@ -212,7 +212,7 @@
         g_personAutoNumTbl: [], //在管数据 -- 去年 人群自动上传血压血糖合格人数
         q_personAutoNum: [], // 签 数据 -- 今年  签约 同上
         q_personAutoNumTbl: [], // 签数据  -- 去年 同上
-        themeId: 28,
+        themeId: 30,
         agestructId: 34,
         bleedtype: '血压',
         selectID: 1, // 用于切换 规范管理
@@ -391,28 +391,7 @@
               return res
             }
           },
-          dataZoom: {
-            start: 0, //默认为0
-            end: 50, //默认为100
-            type: 'slider',
-            show: true ,
-            xAxisIndex: [0] ,
-            handleSize: 20 , //滑动条的 左右2个滑动条的大小
-            height: 5 , //组件高度
-            left: 50, //左边的距离
-            right: 45, //右边的距离
-            bottom: 40, //右边的距离
-            backgroundColor: '#ccc', //两边未选中的滑动条区域的颜色
-            showDataShadow: true, //是否显示数据阴影 默认auto
-            handleStyle: {
-                borderColor: "#CBBCDB",
-                borderWidth: "1",
-                shadowBlur: 1,
-                background: "#000",
-                shadowColor: "#000",
-            },
-            filterMode: 'filter',
-          },
+
           legend: {
             textStyle: {
               color: '#8393A9',
@@ -918,17 +897,13 @@
 
           console.log("现在处于一级状态");
         }
-
         else if (this.pageLevel === 'sq') {
-
           this.pageLevel = 'qj'
           this._group = 'YLJGDM'
           this.tablename = "社区"
           this.thname = "医院"
           this.arname = '社区'
           this.areaname = this.areaname2
-
-
         }
         this.homeinit(this.themeId)
         this.change_age(1)
@@ -940,7 +915,6 @@
       },
       changeReplay() {
 
-
         if ('city' === this.userRole) {//市角色
           this._xzqh = ""
           this._group = "XZQH"
@@ -948,7 +922,7 @@
 
           this.areaname = ''
           this.tablename = '各区'
-          this.themeId = 28
+          this.themeId = 30
           this.thname = '各区'
           this.arname = '各区'
           this.homeinit(this.themeId)
@@ -986,7 +960,6 @@
 
       },
       dataSearch() {
-       
         this.homeinit(this.themeId)
         this.change_age(1)
         
@@ -1007,7 +980,6 @@
           this.arname = '社区'
           this.areaname = name
 
-
         }else if (this.pageLevel === 'qj') {
           //  点击区 -- 展示城镇信息
           this.pageLevel = 'sq'
@@ -1020,8 +992,6 @@
           this.thname = '医院'
           this.arname = '社区'
           this.areaname = name
-
-
         }else if (this.pageLevel === 'sq') {
 
           return false
@@ -1704,24 +1674,7 @@
               Listtemp5.push(item.g0) // BMI 异常数据获取
               Listtemp6.push(item.q0) // BMI 异常数据获取
             })
-            // this.g_autoup_list = []
-            // this.q_autoup_list = []
-            // this.g_normal_list = []
-            // this.q_normal_list = []
-
-            // g_personAutoNum:[], //
-            // g_personAutoNumTbl:[],
-            // this.option2.series[0].data = this.g_autoup_list
-            // this.option2.series[1].data = this.q_autoup_list
-            // this.option2.series[2].data = this.g_normal_list
-            // this.option2.series[3].data = this.q_normal_list
-
-            // this.option2.series[4].data = Listtemp1 // 自动上传血压控制率 管
-            // this.option2.series[5].data = Listtemp3 // 自动上传血压控制率 签
-            // this.option2.series[6].data = Listtemp2
-            // this.option2.series[7].data = Listtemp4
-            // this.option2.series[8].data = Listtemp5
-            // this.option2.series[9].data = Listtemp6
+
             this.option2.xAxis[0].data = ListPlace
             let legendMy = []
 
@@ -1760,14 +1713,14 @@
                         )
                       }
                     },
-                    barWidth: null,
+                    barWidth: 8,
                     data: this.g_autoup_list
                   },
                   {
                     name: '管理/签约人群自动上传血压合格人数',
-                    type: 'line',
-                    stack: "1",
-                    barWidth: null,
+                    type: 'bar',
+                    stack: "2",
+                    barWidth: 8,
                     itemStyle: {
                       normal: {
                         color: '#4093E9'
@@ -1803,12 +1756,13 @@
                         )
                       }
                     },
-                    barWidth: null,
+                    barWidth: 8,
                     data: this.g_normal_list
                   },
                   {
                     name: '去年管理/签约人群自动上传血压合格人数',
-                    type: 'line',
+                    type: 'bar',
+                    stack: "2",
                     barWidth: 8,
                     itemStyle: {
                       normal: {
@@ -1834,7 +1788,6 @@
                         )
                       }
                     },
-                    stack: "1",
                     data: this.q_normal_list
                   },
                   {
@@ -2048,7 +2001,8 @@
                     data: Listtemp6
                   }
                 ]
-              } else {
+              }
+              else {
 
                 legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年',
                   '管·报告血压控制率/去年', '签·报告血压控制率/去年'
@@ -2083,14 +2037,14 @@
                         )
                       }
                     },
-                    barWidth: null,
+                    barWidth: 8,
                     data: this.g_autoup_list
                   },
                   {
                     name: '管理/签约人群自动上传血压合格人数',
-                    type: 'line',
-                    stack: "1",
-                    barWidth: null,
+                    type: 'bar',
+                    stack: "2",
+                    barWidth: 8,
                     itemStyle: {
                       normal: {
                         color: '#4093E9'
@@ -2101,7 +2055,7 @@
                   {
                     name: '去年管理/签约人群自动上传血压合格人数',
                     type: 'bar',
-                    stack: '1',
+                    stack: '2',
                     itemStyle: {
                       normal: {
                         color: new this.$echarts.graphic.LinearGradient(
@@ -2126,13 +2080,13 @@
                         )
                       }
                     },
-                    barWidth: null,
+                    barWidth: 8,
                     data: this.g_normal_list
                   },
                   {
                     name: '去年管理/签约人群自动上传血压合格人数',
-                    type: 'line',
-                    barWidth: 8,
+                    type: 'bar',
+                    stack: '1',
                     itemStyle: {
                       normal: {
                         color: new this.$echarts.graphic.LinearGradient(
@@ -2157,7 +2111,6 @@
                         )
                       }
                     },
-                    stack: "1",
                     data: this.q_normal_list
                   },
                   {
@@ -2891,12 +2844,12 @@
 
         this.DieaNo = Num
         if (Num == 1) {
-          this.themeId = 28
+          this.themeId = 30
           this.homeinit(this.themeId)
           this.bleedtype = "血压"
           this.pagedisname = '高血压'
         } else {
-          this.themeId = 28
+          this.themeId = 33
           this.homeinit(this.themeId)
           this.bleedtype = "血糖"
           this.pagedisname = '糖尿病'
@@ -3192,8 +3145,6 @@
         this._group = "XZQH"
         this.pageLevel = 'sj'
 
-        this.homeinit(this.themeId)
-        this.change_age(1)
       } else if ('area' === this.userRole) {//区角色
 
         this._xzqh = sessionStorage.getItem("organizcode")
@@ -3206,10 +3157,6 @@
         this.arname = '社区'
 
         this.areaname = sessionStorage.getItem("organizcodeName")
-
-        this.homeinit(this.themeId)
-        this.change_age(1)
-
       } else if ('hospital' === this.userRole) {//社区角色
         this._xzqh = sessionStorage.getItem("organizcode")
         this._group = "YWSJ"
@@ -3219,11 +3166,9 @@
         this.thname = "医院"
         this.arname = '社区'
         this.areaname = sessionStorage.getItem("organizcodeName")
-
-        this.homeinit(this.themeId)
-        this.change_age(1)
       }
-
+      this.homeinit(this.themeId)
+      this.change_age(1)
 
 
       const obj = setInterval(() => {