Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/statistics/index.vue

@@ -579,7 +579,7 @@
       },
       getqualityData() {
         let pos = this.$store.getters.level.second?this.$store.getters.level.second:this.$store.getters.level.first
-        let sql="select id_,name_ from ibps_party_entity where name_ like '%组' and name_ NOT LIKE '%综合%' and name_ NOT LIKE '%质量%' and name_ NOT LIKE '%科研%'  and name_ NOT LIKE '%教学%' and PATH_ like '%"+pos+"%'"
+        let sql="select id_,name_ from ibps_party_entity where name_ like '%组' and name_ NOT LIKE '%助理%' and name_ NOT LIKE '%样品%' and name_ NOT LIKE '%急诊%' and name_ NOT LIKE '%综合%' and name_ NOT LIKE '%质量%' and name_ NOT LIKE '%科研%'  and name_ NOT LIKE '%教学%' and PATH_ like '%"+pos+"%'"
         let sql1="select id_,name_ from ibps_party_entity where name_ like '%组' and PATH_ like '%"+pos+"%'"
         
         Promise.all([repostCurd('sql', sql),repostCurd('sql', sql1)]).then(([response,response1]) => {
@@ -978,27 +978,44 @@
         // console.log(this.showFenZu,'678687678bjhjhjhk')
 
         clearInterval(this.timer1);
-        if(this.rollup == true){
-          this.fadeinout = false
-          this.timer1 = setInterval(()=>{
-            // console.log(Math.ceil(this.pageAll/2)+6,this.pageAll)
-            if(this.pageOT>=this.pageAll+6){
-              this.pageOT=1
+        this.fadeinout = false
+        this.timer1 = setInterval(()=>{
+          if(this.pageOT>=this.pageAll+6){
+            this.pageOT=1
+
+            this.showFenZu.title = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].name_:""
+            this.showFenZu.data = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].data:[]
+          }else{
+            this.pageOT = this.pageOT + 1
 
-              this.showFenZu.title = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].name_:""
-              this.showFenZu.data = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].data:[]
-            }else{
-              this.pageOT = this.pageOT + 1
-              if(this.pageOT<this.pageAll){
-                // console.log(this.pageOT,this.pageOT-1,'uiououoiu')
+            this.showFenZu.title = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].name_:""
+            this.showFenZu.data = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].data:[]
+          }
+          // console.log(this.showFenZu,this.showFenZu)
+        },4000)
+        this.rollup=true
+        // if(this.rollup == true){
+        //   this.fadeinout = false
+        //   this.timer1 = setInterval(()=>{
+        //     // console.log(Math.ceil(this.pageAll/2)+6,this.pageAll)
+        //     if(this.pageOT>=this.pageAll+6){
+        //       this.pageOT=1
 
-                this.showFenZu.title = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].name_:""
-                this.showFenZu.data = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].data:[]
+        //       this.showFenZu.title = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].name_:""
+        //       this.showFenZu.data = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].data:[]
+        //     }else{
+        //       this.pageOT = this.pageOT + 1
+        //       if(this.pageOT<this.pageAll){
+        //         // console.log(this.pageOT,this.pageOT-1,'uiououoiu')
+
+        //         this.showFenZu.title = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].name_:""
+        //         this.showFenZu.data = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].data:[]
                 
-              }
-            }
-          },4000)
-        }
+        //       }
+        //     }
+        //     console.log(this.showFenZu,this.showFenZu)
+        //   },4000)
+        // }
         
         
       },
@@ -1188,6 +1205,7 @@
             this.showFenZu.title = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].name_:""
             this.showFenZu.data = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].data:[]
           }
+          // console.log(this.showFenZu,this.showFenZu)
         },4000)
         this.rollup=true
       },

src/views/statistics/js/selectDB.js

@@ -47,7 +47,7 @@ export const getzaigangrenyuanObj = (end,info)=>{
   return "select COUNT(t_ndrypxjhzb.id_) as num from t_ndrypxjhzb JOIN t_lhndrypxjh on t_ndrypxjhzb.parent_id_ = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhndrypxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
 export const getzaigangrenyuanFBObj = (end,info)=>{
-  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.num as numA,IFNULL(b.num,0) as num  from (select t_lhndrypxjh.bian_zhi_bu_men_,COUNT(t_ndrypxjhzb.id_) as num from t_ndrypxjhzb JOIN t_lhndrypxjh on t_ndrypxjhzb.parent_id_ = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'  GROUP BY t_lhndrypxjh.bian_zhi_bu_men_) a LEFT JOIN (select t_lhndrypxjh.bian_zhi_bu_men_, COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhndrypxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"') b on a.bian_zhi_bu_men_ = b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.num as numA,IFNULL(b.num,0) as num  from (select t_lhndrypxjh.bian_zhi_bu_men_,COUNT(t_ndrypxjhzb.id_) as num from t_ndrypxjhzb JOIN t_lhndrypxjh on t_ndrypxjhzb.parent_id_ = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'  GROUP BY t_lhndrypxjh.bian_zhi_bu_men_) a LEFT JOIN (select t_lhndrypxjh.bian_zhi_bu_men_, COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhndrypxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_lhndrypxjh.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_ = b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
 }
 export const getgangqianpeixunObj = (end,info)=>{
   return "select COUNT(t_lhgqpxjhzb.id_) as num from t_lhgqpxjhzb JOIN t_lhgqpxjh on t_lhgqpxjhzb.parent_id_ = t_lhgqpxjh.id_ where FIND_IN_SET(t_lhgqpxjh.bian_zhi_bu_men_,'"+info+"') and t_lhgqpxjh.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhgqpxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhgqpxjh.id_ where FIND_IN_SET(t_lhgqpxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"