Преглед на файлове

看板sql,数据兼容,鼠标事件时间子组件穿透,销毁组件时鼠标事件再次触发造成定时器未清除

cyy преди 2 години
родител
ревизия
c25384bd7e
променени са 53 файла, в които са добавени 932 реда и са изтрити 151 реда
  1. 7 0
      .vscode/settings.json
  2. 73 26
      src/views/statistics/index.vue
  3. 45 25
      src/views/statistics/indexold.vue
  4. 1 1
      src/views/statistics/item/s11biaoZhunWu.vue
  5. 1 0
      src/views/statistics/item/s11biaoZhunWuCol.vue
  6. 1 1
      src/views/statistics/item/s12fengXian.vue
  7. 1 0
      src/views/statistics/item/s12fengXianCol.vue
  8. 1 1
      src/views/statistics/item/s13shengWu.vue
  9. 1 0
      src/views/statistics/item/s13shengWuCol.vue
  10. 1 0
      src/views/statistics/item/s14bufuhexiangCol.vue
  11. 1 1
      src/views/statistics/item/s15tousu.vue
  12. 1 0
      src/views/statistics/item/s15tousuCol.vue
  13. 1 1
      src/views/statistics/item/s16bzJunZhu.vue
  14. 1 0
      src/views/statistics/item/s16bzJunZhuCol.vue
  15. 1 1
      src/views/statistics/item/s17bzXiBao.vue
  16. 1 0
      src/views/statistics/item/s17bzXiBaoCol.vue
  17. 127 0
      src/views/statistics/item/s18renYuanPeiXun.vue
  18. 295 0
      src/views/statistics/item/s18renYuanPeiXunCol.vue
  19. 1 1
      src/views/statistics/item/s1jianCe.vue
  20. 1 0
      src/views/statistics/item/s1jianCeColumnar.vue
  21. 3 3
      src/views/statistics/item/s1zhiLiangMuBiao.vue
  22. 1 0
      src/views/statistics/item/s1zhiLiangMuBiaoCol.vue
  23. 1 0
      src/views/statistics/item/s2manYiDuPro.vue
  24. 3 3
      src/views/statistics/item/s3tousu.vue
  25. 4 3
      src/views/statistics/item/s3tousuCol.vue
  26. 1 0
      src/views/statistics/item/s4renYuanPeiXunCol.vue
  27. 1 1
      src/views/statistics/item/s7sheBeiJiaoZhun.vue
  28. 1 0
      src/views/statistics/item/s7sheBeiJiaoZhunCol.vue
  29. 3 1
      src/views/statistics/item/s7sheBeiJiaoZhunCol2.vue
  30. 1 1
      src/views/statistics/item/s8sheBeiHeCha.vue
  31. 1 0
      src/views/statistics/item/s8sheBeiHeChaCol.vue
  32. 3 1
      src/views/statistics/item/s8sheBeiHeChaCol2.vue
  33. 3 3
      src/views/statistics/item/s9neiBuZhiLiang.vue
  34. 4 1
      src/views/statistics/item/s9neiBuZhiLiangCol.vue
  35. 18 12
      src/views/statistics/js/selectDB.js
  36. 37 28
      src/views/statistics/js/selectDBDSRW.js
  37. 6 1
      src/views/statistics/properties/s11biaoZhunWuPro.vue
  38. 6 1
      src/views/statistics/properties/s12fengXianPro.vue
  39. 6 1
      src/views/statistics/properties/s13shengWuPro.vue
  40. 6 1
      src/views/statistics/properties/s14bufehexiangPro.vue
  41. 6 1
      src/views/statistics/properties/s15tousuPro.vue
  42. 6 1
      src/views/statistics/properties/s16bzJunZhuPro.vue
  43. 6 1
      src/views/statistics/properties/s17bzXiBaoPro.vue
  44. 138 0
      src/views/statistics/properties/s18renYuanPeiXunPro.vue
  45. 6 1
      src/views/statistics/properties/s1jianCePro.vue
  46. 6 1
      src/views/statistics/properties/s1zhiLiangMuBiaoPro.vue
  47. 11 2
      src/views/statistics/properties/s2manYiDuPro.vue
  48. 7 2
      src/views/statistics/properties/s3tousuPro.vue
  49. 6 1
      src/views/statistics/properties/s4renYuanPeiXunPro.vue
  50. 6 1
      src/views/statistics/properties/s7sheBeiJiaoZhunPro.vue
  51. 6 1
      src/views/statistics/properties/s8sheBeiHeChaPro.vue
  52. 8 3
      src/views/statistics/properties/s9neiBuZhiLiangPro.vue
  53. 49 17
      src/views/statistics/sendDatas.js

+ 7 - 0
.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#600327",
+        "titleBar.activeBackground": "#860437",
+        "titleBar.activeForeground": "#FFFBFD"
+    }
+}

+ 73 - 26
src/views/statistics/index.vue

@@ -181,8 +181,10 @@
           <div class="componentsData" v-if="relOf">
               <s4renYuanPeiXun :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
-              <s5renYuanJianDu :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
+              <!-- <s5renYuanJianDu :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/> -->
+              <s18renYuanPeiXun :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[9]" :data = "getS18gangqian()"/>
               <!-- <div class="clear"></div> -->
 
           </div>
@@ -215,15 +217,15 @@
 
           <div class="ttitle" style="text-align: center;">质量管理</div>
           <div class="componentsData" v-if="relOf">
-              <s9neiBuZhiLiang :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s9neiBuZhiLiang :height="'290%'" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
-              <s10waiBuNengLi :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
-              <s14bufuhexiang :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <!-- <s10waiBuNengLi :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/> -->
+              <s14bufuhexiang :height="'290%'" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[18]" :data = "getS14bufuhexiang()"/>
-              <s15tousu :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s15tousu :height="'290%'" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[19]" :data = "getS3tousu()"/>
-              <s12fengXian :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s12fengXian :height="'290%'" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[16]" :data = "getS12fengXian()"/>
               <div class="clear"></div>
 
@@ -253,6 +255,7 @@
   import s2manYiDu from './item/s2manYiDu.vue'
   import s3tousu from './item/s3tousu.vue'
   import s4renYuanPeiXun from './item/s4renYuanPeiXun.vue'
+  import s18renYuanPeiXun from './item/s18renYuanPeiXun.vue'
   import s5renYuanJianDu from './item/s5renYuanJianDu.vue'
   import s6sheBeiWeiHu from './item/s6sheBeiWeiHu.vue'
   import s7sheBeiJiaoZhun from './item/s7sheBeiJiaoZhun.vue'
@@ -299,7 +302,8 @@ import * as forEach from 'lodash/forEach'
       s14bufuhexiang,
       s15tousu,
       s16bzJunZhu,
-      s17bzXiBao
+      s17bzXiBao,
+      s18renYuanPeiXun
     },
     props:{
     shows:{ //传入的内容显示序号
@@ -312,6 +316,7 @@ import * as forEach from 'lodash/forEach'
       }
    },
     mixins: [sendDatas],
+    provide(){ return{ rollcontinue:this.rollcontinue,rollstop:this.rollstop } },
     mounted() {
       /*以shows是否有参数来判断, 是否需要仅显示部分子组件*/
       if(this.shows.length>0){
@@ -335,6 +340,7 @@ import * as forEach from 'lodash/forEach'
     },
     data() {
       return {
+        midNianFen:2023,
         height:(window.screen.height-200)+"px",
         BeginDate: '',
         endDate: '',
@@ -354,6 +360,7 @@ import * as forEach from 'lodash/forEach'
         showAll:true,
         timer: '',
         timer1: '',
+        statusJC:'',
         showComponents:{},//显示全部统计子组件 , 若有新增,往后累计。 供动态表单进行查阅使用。
         dataScope: [],
         colorw: '#fff',
@@ -368,12 +375,32 @@ import * as forEach from 'lodash/forEach'
         ]
       }
     },
-     beforeDestroy() {
+    beforeDestroy() {
       if(screenfull.isFullscreen){
         screenfull.toggle()
       }
+      this.statusJC='tuichu'
+      console.log('jinlaimei~~')
       clearInterval(this.timer);
+      clearInterval(this.timer1);
     },
+    // destoryed(){
+    //   clearInterval(this.timer);
+    //   clearInterval(this.timer1);
+    //   console.log('jinlaimei!!!!')
+    // },
+    // beforeRouteLeave(to,from ,next){
+    //   next()
+    //   console.log('jinlaimei!!!!')
+    //   // clearInterval(this.timer);
+    //   // clearInterval(this.timer1);
+    //   this.$off('click', this.rollcontinue)
+    //   // this.$off('mouseenter', this.rollstop)
+
+    //   // this.timer=null
+    //   // this.timer1=null
+      
+    // },
     methods: {
       /* 判断是否统计子组件中传递过来的,是否需要隐藏。若需要则进行隐藏的遍历  */
       isShowComponents(){
@@ -398,15 +425,19 @@ import * as forEach from 'lodash/forEach'
       },
       /* 查询统计配置中的完成率*/
       getConfigData() {
-        repostCurd('sql', getConfig()).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getConfig1():getConfig()
+        // console.log(sqlCon,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.config = response.variables.data //结果一定存在第0个,因为只有一条数据
-          console.log(this.endDate,'this.endDate')
+          // console.log(this.endDate,'this.endDate')
           this.getJiaoYanObjData(this.endDate)
 
         })
       },
       getJiaoYanObjData(end) {
-        repostCurd('sql', getJiaoYanObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getJiaoYanObj1(end):getJiaoYanObj(end)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.jiaoyanObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(end,this.jiaoyanObj,"nmnakak")
@@ -414,21 +445,27 @@ import * as forEach from 'lodash/forEach'
         })
       },
       gethechaObjData(end) {
-        repostCurd('sql', gethechaObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?gethechaObj1(end):gethechaObj(end)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.hechaObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           this.getnengliObjData(this.endDate)
         })
       },
       getnengliObjData(end) {
-        repostCurd('sql', getnengliObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getnengliObj1(end):getnengliObj(end)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.nengliObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           this.getbiaozhunObjData(this.endDate)
         })
       },
       getbiaozhunObjData(end) {
-        repostCurd('sql', getbiaozhunObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getbiaozhunObj1(end):getbiaozhunObj(end)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.biaozhunObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(this.biaozhunObj,'8888')
@@ -442,7 +479,9 @@ import * as forEach from 'lodash/forEach'
         })
       },
       getbzJunZhuObjData(end) {
-        repostCurd('sql', getbzJunZhuObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getbzJunZhuObj1(end):getbzJunZhuObj(end)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.bzJunZhuObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(this.biaozhunObj,'8888')
@@ -456,7 +495,9 @@ import * as forEach from 'lodash/forEach'
         })
       },
       getbzXiBaoObjData(end) {
-        repostCurd('sql', getbzXiBaoObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getbzXiBaoObj1(end):getbzXiBaoObj(end)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           this.bzXiBaoObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(this.biaozhunObj,'8888')
@@ -472,7 +513,9 @@ import * as forEach from 'lodash/forEach'
       /* 通过拼接的sql进行查询全部数据*/
       getData(beg, end, of, scope) {
         // console.log(2222,DBData(beg, end, scope))
-        repostCurd('sql', DBData(beg, end, scope)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?DBData1(beg, end, scope):DBData(beg, end, scope)
+        // console.log(sql,'sqlCon')
+        repostCurd('sql', sql).then(response => {
           if(typeof response.variables.data[0] === "undefined"){
             this.relData = [0] //结果一定存在第0个,因为只有一条数据
 
@@ -569,18 +612,22 @@ import * as forEach from 'lodash/forEach'
       goBack(){
         this.$router.back(-1)
         clearInterval(this.timer1);
+        clearInterval(this.timer);
       },
       rollcontinue(){
-        this.timer1 = setInterval(()=>{
-          this.pageOT = !this.pageOT
-          console.log(this.pageOT)
-        },8000)
-        console.log('111111111111111111122222222222222222222222222')
-        this.rollup=true
+        if(this.statusJC!='tuichu'){
+          this.timer1 = setInterval(()=>{
+            this.pageOT = !this.pageOT
+            console.log(this.pageOT)
+          },8000)
+          console.log('111111111111111111122222222222222222222222222')
+          this.rollup=true
+        }
+        
       },
       rollstop(){
         clearInterval(this.timer1);
-        console.log('333333333333333333333333333333333333444444444444444444444444')
+        console.log('333333333333333333333333333344444444444444')
 
         this.rollup=false
       }

+ 45 - 25
src/views/statistics/indexold.vue

@@ -39,15 +39,15 @@
         </div>
         <!-- <div class="ttitle">质量目标统计</div> -->
         <div class="componentsData" v-if="relOf">
-            <s1zhiLiangMuBiao :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+            <s1zhiLiangMuBiao :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[1]" :data = "getS1renwu()"/>
-            <s1jianCe :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+            <s1jianCe :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
-            <s2manYiDu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+            <s2manYiDu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[7]"  :data = "getS2manYiDu()"/>
-            <s3tousu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+            <s3tousu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
-            <s13shengWu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+            <s13shengWu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[17]" :data = "getS3tousu()"/>
             <!-- <s1zhiLiang1 :width="static=='row' ? '20%': '100%'"
             v-if="showAll || showComponents[2]"    />
@@ -82,10 +82,12 @@
         </div>
         <div class="ttitle">人员培训与管理</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s4renYuanPeiXun :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+            <s4renYuanPeiXun :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
-            <s5renYuanJianDu :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-            v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
+            <!-- <s5renYuanJianDu :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+            v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/> -->
+            <s18renYuanPeiXun :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[9]" :data = "getS18gangqian()"/>
             <!-- <div class="clear"></div>
 
         </div>
@@ -106,18 +108,18 @@
         </div>
         <div class="ttitle">质量控制</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s9neiBuZhiLiang :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+            <s9neiBuZhiLiang :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
-            <s10waiBuNengLi :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-            v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
-            <s14bufuhexiang :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+            <!-- <s10waiBuNengLi :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+            v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/> -->
+            <s14bufuhexiang :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[18]" :data = "getS14bufuhexiang()"/>
             <!-- <div class="clear"></div>
 
         </div>
         <div class="ttitle">风险控制</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s12fengXian :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+            <s12fengXian :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[16]" :data = "getS12fengXian()"/>
             <div class="clear"></div>
 
@@ -146,6 +148,7 @@
   import s2manYiDu from './item/s2manYiDu.vue'
   import s3tousu from './item/s3tousu.vue'
   import s4renYuanPeiXun from './item/s4renYuanPeiXun.vue'
+  import s18renYuanPeiXun from './item/s18renYuanPeiXun.vue'
   import s5renYuanJianDu from './item/s5renYuanJianDu.vue'
   import s6sheBeiWeiHu from './item/s6sheBeiWeiHu.vue'
   import s7sheBeiJiaoZhun from './item/s7sheBeiJiaoZhun.vue'
@@ -164,6 +167,7 @@
   import none from './item/none.vue'
 
   import { DBData ,getConfig,getJiaoYanObj, gethechaObj, getnengliObj, getbiaozhunObj,getbiaozhunTObj,getbzJunZhuObj,getbzJunZhuTObj,getbzXiBaoObj,getbzXiBaoTObj} from './js/selectDB.js'
+  import { DBData1 ,getConfig1,getJiaoYanObj1, gethechaObj1, getnengliObj1, getbiaozhunObj1,getbiaozhunTObj1,getbzJunZhuObj1,getbzJunZhuTObj1,getbzXiBaoObj1,getbzXiBaoTObj1} from './js/selectDBDSRW.js'
   import sendDatas from './sendDatas.js'
   import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
   export default {
@@ -190,7 +194,8 @@
       s14bufuhexiang,
       s15tousu,
       s16bzJunZhu,
-      s17bzXiBao
+      s17bzXiBao,
+      s18renYuanPeiXun
     },
     props:{
     shows:{ //传入的内容显示序号
@@ -257,14 +262,17 @@
       },
       /* 查询统计配置中的完成率*/
       getConfigData() {
-        repostCurd('sql', getConfig()).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getConfig1():getConfig()
+        repostCurd('sql', sql).then(response => {
           this.config = response.variables.data //结果一定存在第0个,因为只有一条数据
           this.getJiaoYanObjData(this.endDate)
 
         })
       },
       getJiaoYanObjData(end) {
-        repostCurd('sql', getJiaoYanObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getJiaoYanObj1(end):getJiaoYanObj(end)
+
+        repostCurd('sql', sql).then(response => {
           this.jiaoyanObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(end,this.jiaoyanObj,"nmnakak")
@@ -272,21 +280,27 @@
         })
       },
       gethechaObjData(end) {
-        repostCurd('sql', gethechaObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?gethechaObj1(end):gethechaObj(end)
+
+        repostCurd('sql', sql).then(response => {
           this.hechaObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           this.getnengliObjData(this.endDate)
         })
       },
       getnengliObjData(end) {
-        repostCurd('sql', getnengliObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getnengliObj1(end):getnengliObj(end)
+
+        repostCurd('sql', sql).then(response => {
           this.nengliObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           this.getbiaozhunObjData(this.endDate)
         })
       },
       getbiaozhunObjData(end) {
-        repostCurd('sql', getbiaozhunObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getbiaozhunObj1(end):getbiaozhunObj(end)
+
+        repostCurd('sql', sql).then(response => {
           this.biaozhunObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(this.biaozhunObj,'8888')
@@ -300,7 +314,9 @@
         })
       },
       getbzJunZhuObjData(end) {
-        repostCurd('sql', getbzJunZhuObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getbzJunZhuObj1(end):getbzJunZhuObj(end)
+
+        repostCurd('sql', sql).then(response => {
           this.bzJunZhuObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(this.biaozhunObj,'8888')
@@ -314,7 +330,9 @@
         })
       },
       getbzXiBaoObjData(end) {
-        repostCurd('sql', getbzXiBaoObj(end)).then(response => {
+        let sql = this.endDate*1>this.midNianFen?getbzXiBaoObj1(end):getbzXiBaoObj(end)
+
+        repostCurd('sql', sql).then(response => {
           this.bzXiBaoObj = response.variables.data //结果一定存在第0个,因为只有一条数据
           // this.getData(this.BeginDate, this.endDate, true, this.dataScope)
           // console.log(this.biaozhunObj,'8888')
@@ -329,8 +347,10 @@
       },
       /* 通过拼接的sql进行查询全部数据*/
       getData(beg, end, of, scope) {
+        let sql = this.endDate*1>this.midNianFen?DBData1(beg, end, scope):DBData(beg, end, scope)
+
         // console.log(2222,DBData(beg, end, scope))
-        repostCurd('sql', DBData(beg, end, scope)).then(response => {
+        repostCurd('sql', sql).then(response => {
           if(typeof response.variables.data[0] === "undefined"){
             this.relData = [0] //结果一定存在第0个,因为只有一条数据
 
@@ -428,10 +448,10 @@
     created() {
       //时间
       // this.currentTime()
-      if(screenfull.isEnabled && !screenfull.isFullscreen){
-      this.allView()
+      // if(screenfull.isEnabled && !screenfull.isFullscreen){
+      // this.allView()
         
-      }
+      // }
     },
     beforeDestroy() {
       if(screenfull.isFullscreen){

+ 1 - 1
src/views/statistics/item/s11biaoZhunWu.vue

@@ -86,7 +86,7 @@
         //  let max2=GetMax(data2)+1;
         //  let maxVal=max1>max2?max1:max2;
         //  console.log("max1:",max1,"max2:",max2);
-        let e = 100 -this.data.Num.valna
+        let e = (100 -this.data.Num.valna).toFixed(2)
        let option = {
            //v3
           title: {

+ 1 - 0
src/views/statistics/item/s11biaoZhunWuCol.vue

@@ -115,6 +115,7 @@
                 name: '数量',
                 max: this.data.Num.valnum>this.data.Num.valAll?this.data.Num.valnum+1:this.data.Num.valAll+1,
                 min: 0,
+                minInterval: 1
               },
             ],
             series: [

+ 1 - 1
src/views/statistics/item/s12fengXian.vue

@@ -77,7 +77,7 @@
 
         //v3
         // let e=[this.data.t_mjsyshdfxsbykzjhxbNum.number[0],this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0],this.data.t_mjsyshdfxsbykzjhxbNum.res[0]]
-        let e = 100 -this.data.t_mjsyshdfxsbykzjhxbNum.res[0]
+        let e = (100 -this.data.t_mjsyshdfxsbykzjhxbNum.res[0]).toFixed(2)
 
 
         option = {

+ 1 - 0
src/views/statistics/item/s12fengXianCol.vue

@@ -105,6 +105,7 @@
                 name: '数量',
                 max: this.data.t_mjsyshdfxsbykzjhxbNum.number[0]>this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0]?this.data.t_mjsyshdfxsbykzjhxbNum.number[0]+1:this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 1 - 1
src/views/statistics/item/s13shengWu.vue

@@ -82,7 +82,7 @@
 
         //v3
         // let e=[this.data.t_mjsyshdfxsbykzjhxbNum.number[0],this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0],this.data.t_mjsyshdfxsbykzjhxbNum.res[0]]
-        let e = 100 -this.data.t_complaintNum.res1[0]
+        let e = (100 -this.data.t_complaintNum.res1[0]).toFixed(2)
 
 
         option = {

+ 1 - 0
src/views/statistics/item/s13shengWuCol.vue

@@ -112,6 +112,7 @@
                 name: '数量',
                 max: this.data.t_complaintNum.number[0]>this.data.t_complaintNum.num48[0]?this.data.t_complaintNum.number[0]+1:this.data.t_complaintNum.num48[0]+1,
                 min: 0,
+                minInterval: 1,
                 boundaryGap: [0.2, 0.2]
               },
               // {

+ 1 - 0
src/views/statistics/item/s14bufuhexiangCol.vue

@@ -105,6 +105,7 @@
                 name: '数量',
                 max: this.data.t_bfhxbgyjzcsjlbxNum.number[0]>this.data.t_bfhxbgyjzcsjlbxNum.numberAll[0]?this.data.t_bfhxbgyjzcsjlbxNum.number[0]+1:this.data.t_bfhxbgyjzcsjlbxNum.numberAll[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 1 - 1
src/views/statistics/item/s15tousu.vue

@@ -88,7 +88,7 @@
         // }
         //v3
         //  let e=[this.data.t_complaintNum.number[0],this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.res[0]]
-        let e = 100-this.data.t_complaintNum.res2[0]
+        let e = (100-this.data.t_complaintNum.res2[0]).toFixed(2)
         option = {
           title: {
             text: this.title,

+ 1 - 0
src/views/statistics/item/s15tousuCol.vue

@@ -118,6 +118,7 @@
                 name: '次数',
                 max: this.data.t_complaintNum.number[0]>this.data.t_complaintNum.numtong[0]?this.data.t_complaintNum.number[0]+1:this.data.t_complaintNum.numtong[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 1 - 1
src/views/statistics/item/s16bzJunZhu.vue

@@ -86,7 +86,7 @@
         //  let max2=GetMax(data2)+1;
         //  let maxVal=max1>max2?max1:max2;
         //  console.log("max1:",max1,"max2:",max2);
-        let e = 100 -this.data.Num.valna
+        let e = (100 -this.data.Num.valna).toFixed(2)
        let option = {
            //v3
           title: {

+ 1 - 0
src/views/statistics/item/s16bzJunZhuCol.vue

@@ -115,6 +115,7 @@
                 name: '数量',
                 max: this.data.Num.valnum>this.data.Num.valAll?this.data.Num.valnum+1:this.data.Num.valAll+1,
                 min: 0,
+                minInterval: 1
               },
             ],
             series: [

+ 1 - 1
src/views/statistics/item/s17bzXiBao.vue

@@ -86,7 +86,7 @@
         //  let max2=GetMax(data2)+1;
         //  let maxVal=max1>max2?max1:max2;
         //  console.log("max1:",max1,"max2:",max2);
-        let e = 100 -this.data.Num.valna
+        let e = (100 -this.data.Num.valna).toFixed(2)
        let option = {
            //v3
           title: {

+ 1 - 0
src/views/statistics/item/s17bzXiBaoCol.vue

@@ -115,6 +115,7 @@
                 name: '数量',
                 max: this.data.Num.valnum>this.data.Num.valAll?this.data.Num.valnum+1:this.data.Num.valAll+1,
                 min: 0,
+                minInterval: 1
               },
             ],
             series: [

+ 127 - 0
src/views/statistics/item/s18renYuanPeiXun.vue

@@ -0,0 +1,127 @@
+<template>
+  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+    <div :id="id" :style="{height:height}"/>
+    <!-- 打开详情弹窗-->
+    <div v-if="dialogOff">
+      <dialogView
+        :dialogOff = "dialogOff"
+        @close = "close"
+        :title="title"
+        :data="data"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import echarts from 'echarts'
+  import {GetPercent,GetMax} from  '../js/config.js'
+  import dialogView from '../properties/s18renYuanPeiXunPro.vue'
+
+  export default {
+    components:{
+      dialogView
+    },
+    props: {
+      data: {
+        type: Object,
+      },
+      width:{
+        type:String,
+        default:"20%"
+      },
+      height:{
+        type:String,
+        default: window.screen.height/5+"px"
+      },
+      id:{
+        type:String,
+        default:"s18renyuanPeiXun"
+      },
+      click:{
+        type:String,
+        default:'true'
+      },
+      colorw:{
+        type:String,
+        default:'true'
+      }
+    },
+    data () {
+      return {
+        title:'岗前培训完成率',
+        dialogOff:false,
+      }
+    },
+    mounted(){
+      this.drawLine();
+    },
+    methods: {
+      close(){
+        this.dialogOff = false
+      },
+      /* 跳转统计页面*/
+      toDetailed(){
+        if(this.click == "true"){
+        this.dialogOff = true
+       }
+      },
+      drawLine(){
+        let s18renYuanPeiXun = echarts.init(document.getElementById(this.id))
+
+        // let e=[this.data.t_ryywpxjlNum.number[0],this.data.t_ryywpxjlNum.numberAll[0],this.data.t_ryywpxjlNum.res[0]]
+
+        let e = (100 -this.data.t_lhgqpxjhzbNum.res[0]).toFixed(2)*1
+        var option;
+        option = {
+          //v3
+          title: {
+            text: this.title,
+            // subtext: 'Fake Data',
+            left: 'left',
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          color:['#CC9999','#0099ff'],
+          series: [
+            {
+              type: 'pie',
+              radius: '50%',
+              label: {
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
+              },
+              data: [
+                { value: this.data.t_lhgqpxjhzbNum.res[0], name: '完成率' ,v2:this.data.t_lhgqpxjhzbNum.number},
+                { value: e, name: '未完成率' ,v2:this.data.t_lhgqpxjhzbNum.numberAll-this.data.t_lhgqpxjhzbNum.number}
+              ],
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        };
+
+
+       option && s18renYuanPeiXun.setOption(option);
+      }
+    }
+  }
+</script>
+<style scoped>
+  #s18renyuanPeiXun:hover{
+    transition: all 0.5s;
+    transform:scale(1.03);
+  }
+  .statisticsPage{
+     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+     float: left;
+  }
+</style>

+ 295 - 0
src/views/statistics/item/s18renYuanPeiXunCol.vue

@@ -0,0 +1,295 @@
+<template>
+  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+    <div :id="id" :style="{height:height}"/>
+    <!-- 打开详情弹窗-->
+    <div v-if="dialogOff">
+      <dialogView
+        :dialogOff = "dialogOff"
+        @close = "close"
+        :title="title"
+        :data="data"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import echarts from 'echarts'
+  import {GetPercent,GetMax} from  '../js/config.js'
+  import dialogView from '../properties/s18renYuanPeiXunPro.vue'
+
+  export default {
+    components:{
+      dialogView
+    },
+    props: {
+      data: {
+        type: Object,
+      },
+      width:{
+        type:String,
+        default:"20%"
+      },
+      height:{
+        type:String,
+        default: window.screen.height/5+"px"
+      },
+      id:{
+        type:String,
+        default:"s18renyuanPeiXun"
+      },
+      click:{
+        type:String,
+        default:'true'
+      },
+      colorw:{
+        type:String,
+        default:'true'
+      }
+    },
+    data () {
+      return {
+        title:'人员培训数量',
+        dialogOff:false,
+      }
+    },
+    mounted(){
+      this.drawLine();
+    },
+    methods: {
+      close(){
+        this.dialogOff = false
+      },
+      /* 跳转统计页面*/
+      toDetailed(){
+        if(this.click == "true"){
+        this.dialogOff = true
+       }
+      },
+      drawLine(){
+        let s18renYuanPeiXun = echarts.init(document.getElementById(this.id))
+
+        // let beginInof = GetPercent(Number(this.data.t_rypxjlnkBegin.number),Number(this.data.t_ryndpxjhBegin.number))
+        // let endInof = GetPercent(Number(this.data.t_rypxjlnkEnd.number),Number(this.data.t_ryndpxjhEnd.number))
+
+        //  let data1 = [];
+        //  data1.push(this.data.t_ryndpxjhBegin.number);
+        //  data1.push(this.data.t_ryndpxjhEnd.number);
+        //  let data2 = [];
+        //  data2.push(this.data.t_rypxjlnkBegin.number);
+        //  data2.push(this.data.t_rypxjlnkEnd.number);
+        //  let data3 = [];
+        //  data3.push(this.data.t_rypxjlnkBegin.date);
+        //  data3.push(this.data.t_rypxjlnkEnd.date);
+
+
+        // let barData = []
+        // for (let i = 0; i < this.data.t_ryywpxjlNum.date.length; i++) {
+        //   let e=[this.data.t_ryywpxjlNum.date[i],this.data.t_ryywpxjlNum.number[i],this.data.t_ryywpxjlNum.numberAll[i]]
+        //   barData.push(e)
+        // }
+        //  let e=[this.data.t_ryywpxjlNum.number[0],this.data.t_ryywpxjlNum.numberAll[0],this.data.t_ryywpxjlNum.res[0]]
+         let e=[this.data.t_lhgqpxjhzbNum.numberAll[0],this.data.t_lhgqpxjhzbNum.number[0]]
+
+
+        var option;
+        option = {
+          //v3
+            legend: {},
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'shadow'
+              },
+              // formatter: function (params) {
+              //   return params[0].data[0] + '<br/>满意份数:' + params[0].data[1] + '<br/>调查总份数: ' + params[0].data[2];
+              // }
+            },
+            // dataset: {
+            //   source: barData
+            // },
+            xAxis: { 
+              type: 'category',
+              // data:['已完成数量', '所有数量', '培训完成率']
+              data:['所有培训数量','已完成培训数量']
+
+            },
+            yAxis: [
+              {
+                type: 'value',
+                scale: true,
+                name: '次数',
+                max: this.data.t_lhgqpxjhzbNum.number[0]>this.data.t_lhgqpxjhzbNum.numberAll[0]?this.data.t_lhgqpxjhzbNum.number[0]+1:this.data.t_lhgqpxjhzbNum.numberAll[0]+1,
+                min: 0,
+                minInterval: 1
+                // boundaryGap: [0.2, 0.2]
+              },
+              // {
+              //   type: 'value',
+              //   scale: true,
+              //   name: '培训完成率',
+              //   max: this.data.t_ryywpxjlNum.res[0],
+              //   min: 0,
+              //   axisLabel: {
+              //     formatter: '{value} %'
+              //   }
+              // }
+            ],
+            // Declare several bar series, each will be mapped
+            // to a column of dataset.source by default.
+            // series: [{ type: 'bar' }],
+            series: [
+              {
+                data: e,
+                type: 'bar',
+                barWidth: '20%',
+                itemStyle: {
+                  color: '#cc3366'
+                },
+                label: {
+                  show: true,
+                  position: 'top'
+                },
+              }
+            ],
+            grid: {
+              top: '20%',
+              left: '3%',
+              right: '4%',
+              bottom: '10%',
+              containLabel: true
+            },
+            title: {
+              text: this.title,
+              textStyle:{ fontSize:14,color: this.colorw }
+
+              // subtext: "        "+beingDate+"-"+endDate
+            },
+          //v2
+        //     legend: {},
+        //     tooltip: {
+        //       trigger: 'axis',
+        //       axisPointer: {
+        //         type: 'shadow'
+        //       },
+        //       formatter: function (params) {
+        //         return params[0].data[0] + '<br/>已完成培训数量:' + params[0].data[1]+ '<br/>所有培训数量:' + params[0].data[2];
+        //       }
+        //     },
+        //     dataset: {
+        //       source: barData
+        //     },
+        //     xAxis: { type: 'category' },
+        //     yAxis: {
+        //       type: 'value',
+        //       axisLabel: {
+        //         show: true,
+        //         textStyle:{color:'#000'},
+        //         interval: 'auto',
+        //         // formatter: '{value} %'
+        //       },
+            
+        //     },
+        //     // Declare several bar series, each will be mapped
+        //     // to a column of dataset.source by default.
+        //     series: [{ type: 'bar'},{ type: 'bar'}],
+        //     grid: {
+        //       top: '20%',
+        //       left: '3%',
+        //       right: '4%',
+        //       bottom: '10%',
+        //       containLabel: true
+        //     },
+        //     title: {
+        //       text: this.title,
+        //       subtext: "        "+this.data.t_ryywpxjlNum.date[0]+"-"+this.data.t_ryywpxjlNum.date[this.data.t_ryywpxjlNum.date.length-1]
+        //     },
+        //v1
+          // title: {
+          //   text: this.title,
+          //   subtext: this.data.t_rypxjlnkBegin.date+"-"+this.data.t_rypxjlnkEnd.date+"年培训次数"
+          // },
+          // tooltip: {
+          //        trigger: 'axis',
+          //        axisPointer: {
+          //          type: 'shadow'
+          //        },
+          //        formatter: function (datas) {
+          //            var res='计划:'+datas[0].value+"<BR>"
+          //            res+='记录:'+datas[1].value+"<BR>"
+          //            res+='百分比:'+(datas[0].value==null||datas[0].value==0?"0.00":(datas[1].value/datas[0].value*100).toFixed(2))+"%"
+          //            return res
+          //        }
+          // },
+          // legend: {show:false},
+          //  grid: {
+          //       top: '20%',
+          //       left: '3%',
+          //       right: '4%',
+          //       bottom: '10%',
+          //       containLabel: true
+          //   },
+          // xAxis: {
+          //   type: 'category',
+          //   data: data3
+            
+          // },
+          // yAxis: {
+          //   type: 'value',
+          //   boundaryGap: [0, 0.01]
+          // },
+          // series: [
+
+          //   {
+          //     name: ['计划'],
+          //     type: 'bar',
+          //     data: data1,
+          //     itemStyle: {
+          //           normal: {
+          //               color: function(params) {
+          //                   var colorList = [
+          //                     '#FE8463','#9BCA63','#FCCE10','#E87C25','#27727B',
+          //                      '#FE8463','#9BCA63','#FAD860','#F3A43B','#60C0DD',
+          //                      '#D7504B','#C6E579','#F4E001','#F0805A','#26C0C0'
+          //                   ];
+          //                   return colorList[params.dataIndex]
+          //               },
+          //           }
+          //       },
+          //   },
+          //   {
+          //     name: ['记录'],
+          //     type: 'bar',
+          //     data: data2,
+          //     itemStyle: {
+          //           normal: {
+          //               color: function(params) {
+          //                   var colorList = [
+          //                     '#E87C25','#FAD860','#FCCE10','#E87C25','#27727B',
+          //                      '#FE8463','#9BCA63','#FAD860','#F3A43B','#60C0DD',
+          //                      '#D7504B','#C6E579','#F4E001','#F0805A','#26C0C0'
+          //                   ];
+          //                   return colorList[params.dataIndex]
+          //               },
+          //           }
+          //       },
+          //   }
+          // ]
+        };
+
+
+       option && s18renYuanPeiXun.setOption(option);
+      }
+    }
+  }
+</script>
+<style scoped>
+  #s18renyuanPeiXun:hover{
+    transition: all 0.5s;
+    transform:scale(1.03);
+  }
+  .statisticsPage{
+     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+     float: left;
+  }
+</style>

+ 1 - 1
src/views/statistics/item/s1jianCe.vue

@@ -91,7 +91,7 @@
         //  let endDate=this.data.t_gdyrqcwt5End.date
         // let e=[this.data.t_mjjcbgNum.number[0],this.data.t_mjjcbgNum.numberAll[0],this.data.t_mjjcbgNum.res[0]]
         
-        let e = 100 -this.data.t_mjjcbgNum.res[0]
+        let e = (100 -this.data.t_mjjcbgNum.res[0]).toFixed(2)
         let option = {
         //v3
           title: {

+ 1 - 0
src/views/statistics/item/s1jianCeColumnar.vue

@@ -116,6 +116,7 @@
                 name: '数量',
                 max: this.data.t_mjjcbgNum.number[0]>this.data.t_mjjcbgNum.numberAll[0]?this.data.t_mjjcbgNum.number[0]+1:this.data.t_mjjcbgNum.numberAll[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 3 - 3
src/views/statistics/item/s1zhiLiangMuBiao.vue

@@ -86,9 +86,9 @@
           // }
           // barData.push(e)
         // }
-        let e = 100 -this.data.t_jchzbNum.res[0]
-        let n = 100 -this.data.t_jchzbNum.res[1]
-        let d = 100 -this.data.t_jchzbNum.res[2]
+        let e = (100 -this.data.t_jchzbNum.res[0]).toFixed(2)
+        let n = (100 -this.data.t_jchzbNum.res[1]).toFixed(2)
+        let d = (100 -this.data.t_jchzbNum.res[2]).toFixed(2)
         let j = this.data.t_jchzbNum.number
         let j1 = this.data.t_jchzbNum.number1
         let j2 = this.data.t_jchzbNum.number2

+ 1 - 0
src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -117,6 +117,7 @@
                 scale: true,
                 name: '数量',
                 min: 0,
+                minInterval: 1
               },
             ],
             series: [

+ 1 - 0
src/views/statistics/item/s2manYiDuPro.vue

@@ -155,6 +155,7 @@
                 name: '份数',
                 max: this.data.t_khmydtjbNum.number[0]>this.data.t_khmydtjbNum.numberAll[0]?this.data.t_khmydtjbNum.number[0]+1:this.data.t_khmydtjbNum.numberAll[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 3 - 3
src/views/statistics/item/s3tousu.vue

@@ -93,7 +93,7 @@
         // }
         //v3
         //  let e=[this.data.t_complaintNum.number[0],this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.res[0]]
-        let e = 100-this.data.t_complaintNum.res[0]
+        let e = (100-this.data.t_complaintNum.res[0]).toFixed(2)
         option = {
           title: {
             text: this.title,
@@ -115,8 +115,8 @@
                 }
               },
               data: [
-                { value: this.data.t_complaintNum.res[0], name: '投诉率',v2: this.data.t_complaintNum.number},
-                { value: e, name: '未投诉率' ,v2: this.data.t_complaintNum.numberAll-this.data.t_complaintNum.number}
+                { value: this.data.t_complaintNum.res[0], name: '投诉率',v2: this.data.t_complaintNum.comwNum},
+                { value: e, name: '未投诉率' ,v2: this.data.t_complaintNum.numberAll-this.data.t_complaintNum.comwNum}
               ],
               emphasis: {
                 itemStyle: {

+ 4 - 3
src/views/statistics/item/s3tousuCol.vue

@@ -88,12 +88,12 @@
         // }
         //v3
         //  let e=[this.data.t_complaintNum.number[0],this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.res[0]]
-         let e=[this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.number[0]]
+         let e=[this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.comwNum[0]]
         
 
         option = {
           //v3
-              legend: {},
+            legend: {},
             tooltip: {
               trigger: 'axis',
               axisPointer: {
@@ -116,8 +116,9 @@
                 type: 'value',
                 scale: true,
                 name: '次数',
-                max: this.data.t_complaintNum.number[0]>this.data.t_complaintNum.numberAll[0]?this.data.t_complaintNum.number[0]+1:this.data.t_complaintNum.numberAll[0]+1,
+                max: this.data.t_complaintNum.comwNum[0]>this.data.t_complaintNum.numberAll[0]?this.data.t_complaintNum.comwNum[0]+1:this.data.t_complaintNum.numberAll[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 1 - 0
src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -121,6 +121,7 @@
                 name: '次数',
                 max: this.data.t_ryywpxjlNum.number[0]>this.data.t_ryywpxjlNum.numberAll[0]?this.data.t_ryywpxjlNum.number[0]+1:this.data.t_ryywpxjlNum.numberAll[0]+1,
                 min: 0,
+                minInterval: 1
                 // boundaryGap: [0.2, 0.2]
               },
               // {

+ 1 - 1
src/views/statistics/item/s7sheBeiJiaoZhun.vue

@@ -89,7 +89,7 @@
         //   barData.push(e)
         // }
         //  let e=[this.data.t_ryywpxjlNum.number[0],this.data.t_ryywpxjlNum.numberAll[0],this.data.t_ryywpxjlNum.res[0]]
-        let e=100-this.data.t_mjsbjdxzjhzbNum.valna
+        let e=(100-this.data.t_mjsbjdxzjhzbNum.valna).toFixed(2)
 
 
 

+ 1 - 0
src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -119,6 +119,7 @@
                 name: '数量',
                 max: this.data.t_mjsbjdxzjhzbNum.valnum>this.data.t_mjsbjdxzjhzbNum.valAll?this.data.t_mjsbjdxzjhzbNum.valnum+1:this.data.t_mjsbjdxzjhzbNum.valAll+1,
                 min: 0,
+                minInterval: 1
               },
             ],
             series: [

+ 3 - 1
src/views/statistics/item/s7sheBeiJiaoZhunCol2.vue

@@ -122,7 +122,9 @@
                     },
           xAxis: {
             type: 'value',
-            boundaryGap: [0, 0.01]
+            boundaryGap: [0, 0.01],
+            min: 0,
+            minInterval: 1
           },
           yAxis: {
             type: 'category',

+ 1 - 1
src/views/statistics/item/s8sheBeiHeCha.vue

@@ -86,7 +86,7 @@
         //  let max2=GetMax(data2)+1;
         //  let maxVal=max1>max2?max1:max2;
         //  console.log("max1:",max1,"max2:",max2);
-       let e = 100 -this.data.t_sbhcjlbNum.valna
+       let e = (100 -this.data.t_sbhcjlbNum.valna).toFixed(2)
 
        let option = {
            title: {

+ 1 - 0
src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -114,6 +114,7 @@
                 name: '数量',
                 max: this.data.t_sbhcjlbNum.valnum>this.data.t_sbhcjlbNum.valAll?this.data.t_sbhcjlbNum.valnum+1:this.data.t_sbhcjlbNum.valAll+1,
                 min: 0,
+                minInterval: 1
               },
             ],
             series: [

+ 3 - 1
src/views/statistics/item/s8sheBeiHeChaCol2.vue

@@ -118,7 +118,9 @@
                     },
           xAxis: {
             type: 'value',
-            boundaryGap: [0, 0.01]
+            boundaryGap: [0, 0.01],
+            min: 0,
+            minInterval: 1
           },
           yAxis: {
             type: 'category',

+ 3 - 3
src/views/statistics/item/s9neiBuZhiLiang.vue

@@ -77,7 +77,7 @@
 
         //v3
         // let e=[this.data.t_complaintNum.number[0],this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.res[0]]
-        let e = 100 -this.data.t_mjzlkzxbNum.valna
+        let e = (100 -this.data.t_mjzlkzxbNum.valna).toFixed(2)
 
         option = {
           title: {
@@ -100,8 +100,8 @@
                 }
               },
               data: [
-                { value: this.data.t_mjzlkzxbNum.valna, name: '完成率' ,v2:this.data.t_mjzlkzxbNum.number[1]},
-                { value: e, name: '未完成率' ,v2:this.data.t_mjzlkzxbNum.number[2]-this.data.t_mjzlkzxbNum.number[1]}
+                { value: this.data.t_mjzlkzxbNum.valna, name: '完成率' ,v2:this.data.t_mjzlkzxbNum.number[2]},
+                { value: e, name: '未完成率' ,v2:this.data.t_mjzlkzxbNum.number[1]-this.data.t_mjzlkzxbNum.number[2]}
               ],
               emphasis: {
                 itemStyle: {

+ 4 - 1
src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -111,7 +111,10 @@
                 source: e
             },
             xAxis: { type: 'category' },
-            yAxis: {},
+            yAxis: {
+              min: 0,
+              minInterval: 1
+            },
             // Declare several bar series, each will be mapped
             // to a column of dataset.source by default.
             series: [{ 

+ 18 - 12
src/views/statistics/js/selectDB.js

@@ -7,11 +7,11 @@ export const getConfig = (begin,end)=>{
 }
 export const getJiaoYanObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.she_bei_bian_hao_,a.t_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select t_sbdj.she_bei_shi_bie_h as t_mjsbjdxzjhzbZhName, t_mjsbjdxzjhzb.she_bei_ming_chen as t_mjsbjdxzjhzbName,t_mjsbjdxzjhzb.she_bei_bian_hao_, COUNT(t_mjsbjdxzjhzb.she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb LEFT JOIN t_sbdj on t_mjsbjdxzjhzb.she_bei_bian_hao_ = t_sbdj.id_ where YEAR(t_mjsbjdxzjhzb.create_time_)="+end+" GROUP BY t_mjsbjdxzjhzb.she_bei_ming_chen HAVING COUNT(t_mjsbjdxzjhzb.she_bei_ming_chen)>=1) as a left join  (select yi_qi_bian_hao_, COUNT(yi_qi_bian_hao_) as t_mjsbjdxzjhzbS from t_sbjdxzzx where YEAR(create_time_)= "+end+" AND DATE(you_xiao_qi_zhi_) >= DATE(xiao_zhun_ri_qi_) GROUP BY yi_qi_bian_hao_ HAVING COUNT(yi_qi_bian_hao_)>=1 )as b on a.she_bei_bian_hao_=b.yi_qi_bian_hao_"
+  return "select a.she_bei_bian_hao_,a.t_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select t_sbdj.she_bei_shi_bie_h as t_mjsbjdxzjhzbZhName, zb.she_bei_ming_chen as t_mjsbjdxzjhzbName,zb.she_bei_bian_hao_, COUNT(zb.she_bei_ming_chen) as t_mjsbjdxzjhzb from (select t_mjsbjdxzjhzb.* from t_mjsbjdxzjhzb join t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_=t_mjsbjdxzjh.id_ where t_mjsbjdxzjh.ji_hua_nian_du_='"+end+"' and t_mjsbjdxzjh.shi_fou_guo_shen_='1') zb LEFT JOIN t_sbdj on zb.she_bei_bian_hao_ = t_sbdj.id_ GROUP BY zb.she_bei_bian_hao_ HAVING COUNT(zb.she_bei_bian_hao_)>=1) as a left join  (select yi_qi_bian_hao_, COUNT(yi_qi_bian_hao_) as t_mjsbjdxzjhzbS from t_sbjdxzzx where YEAR(create_time_)= "+end+" AND DATE(you_xiao_qi_zhi_) >= DATE(xiao_zhun_ri_qi_) GROUP BY yi_qi_bian_hao_ HAVING COUNT(yi_qi_bian_hao_)>=1 )as b on a.she_bei_bian_hao_=b.yi_qi_bian_hao_"
 }
 export const gethechaObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select	a.t_sbhcjlbZhname,	a.t_sbhcjlbName,	a.t_sbhcjlb,	ifnull( b.t_sbhcjlbS, 0 ) AS t_sbhcjlbS FROM	(	SELECT	t_sbdj.she_bei_ming_cheng_ AS t_sbhcjlbZhname,	t_sbdj.she_bei_shi_bie_h AS t_sbhcjlbName,	COUNT( t_yqsbhcjh.yi_qi_she_bei_min ) AS t_sbhcjlb 	FROM	t_yqsbhcjh	LEFT JOIN t_sbdj ON t_yqsbhcjh.yi_qi_she_bei_min = t_sbdj.id_ 	WHERE	YEAR ( t_yqsbhcjh.he_cha_pin_lv_ )= "+end+"	GROUP BY	t_yqsbhcjh.yi_qi_she_bei_min 	HAVING	COUNT( t_yqsbhcjh.yi_qi_she_bei_min )>= 1 	) AS a	LEFT JOIN ( SELECT sheng_xiao_ri_qi_, COUNT( sheng_xiao_ri_qi_ ) AS t_sbhcjlbS FROM t_sbqjhcjlb WHERE YEAR ( he_cha_ri_qi_ )= "+end+" and (shi_fou_guo_shen_ = '1' or  shi_fou_guo_shen_ = '已审核') GROUP BY sheng_xiao_ri_qi_ HAVING COUNT( sheng_xiao_ri_qi_ )>= 1 ) AS b ON a.t_sbhcjlbName = b.sheng_xiao_ri_qi_ "
+  return "select	a.t_sbhcjlbZhname,	a.t_sbhcjlbName,	a.t_sbhcjlb,	ifnull( b.t_sbhcjlbS, 0 ) AS t_sbhcjlbS FROM (	SELECT	t_sbdj.id_ AS sbid,t_sbdj.she_bei_ming_cheng_ AS t_sbhcjlbZhname,	t_sbdj.she_bei_shi_bie_h AS t_sbhcjlbName,	COUNT( zb.yi_qi_she_bei_min ) AS t_sbhcjlb 	FROM	(select t_yqsbhcjh.* from t_yqsbhcjh join t_sbhcjh on t_sbhcjh.id_=t_yqsbhcjh.parent_id_ where t_sbhcjh.shi_fou_guo_shen_='1' and t_sbhcjh.nian_fen_='"+end+"') zb	LEFT JOIN t_sbdj ON zb.yi_qi_she_bei_min = t_sbdj.id_	GROUP BY	zb.yi_qi_she_bei_min 	HAVING	COUNT( zb.yi_qi_she_bei_min )>= 1 	) AS a	LEFT JOIN ( SELECT sheng_xiao_ri_qi_, COUNT( sheng_xiao_ri_qi_ ) AS t_sbhcjlbS FROM t_sbqjhcjlb WHERE YEAR ( he_cha_ri_qi_ )= '"+end+"' and shi_fou_guo_shen_ = '1' GROUP BY sheng_xiao_ri_qi_ HAVING COUNT( sheng_xiao_ri_qi_ )>= 1 ) AS b ON a.t_sbhcjlbName = b.sheng_xiao_ri_qi_ "
 }
 // export const getnengliObj = (end)=>{
 //   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
@@ -23,7 +23,7 @@ export const getnengliObj = (end)=>{
 }
 export const getbiaozhunObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from(select zhuan_huan_ as name, COUNT(zhuan_huan_) as num from t_bzwzqjhcjhzb where YEAR(create_time_)="+end+" GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as a LEFT JOIN (select zhuan_huan_ as name, COUNT(zhuan_huan_) as numS from t_bzwzqjhcjhzb as c LEFT JOIN t_bzwzqjhcjhb as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as b on a.name = b.name"
+  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from (select t_bzwzqjhcjhzb.wu_zhi_ming_cheng as wlid,t_bzwzqjhcjhzb.zhuan_huan_ as name, COUNT(t_bzwzqjhcjhzb.wu_zhi_ming_cheng) as num from t_bzwzqjhcjhzb join t_bzwzqjhcjhb on t_bzwzqjhcjhb.id_=t_bzwzqjhcjhzb.parent_id_ where t_bzwzqjhcjhb.nian_du_='"+end+"' and (t_bzwzqjhcjhb.shi_fou_guo_shen_='1' or t_bzwzqjhcjhb.shi_fou_guo_shen_='已完成') GROUP BY t_bzwzqjhcjhzb.wu_zhi_ming_cheng HAVING COUNT(t_bzwzqjhcjhzb.wu_zhi_ming_cheng)>=1) as a LEFT JOIN (select zhuan_huan_ as name, COUNT(zhuan_huan_) as numS from t_bzwzqjhcjhzb as c LEFT JOIN t_bzwzqjhcjhb as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as b on a.name = b.name"
 }
 export const getbiaozhunTObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
@@ -31,7 +31,7 @@ export const getbiaozhunTObj = (end)=>{
 }
 export const getbzJunZhuObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from(select wu_liao_bian_ma_, zhuan_huan_ as name, COUNT(wu_liao_bian_ma_) as num from t_bzjzhcjhzb where YEAR(create_time_)="+end+" GROUP BY wu_liao_bian_ma_ HAVING COUNT(wu_liao_bian_ma_)>=1) as a LEFT JOIN (select wu_liao_bian_ma_, zhuan_huan_ as name, COUNT(wu_liao_bian_ma_) as numS from t_bzjzqjhcjl as d where YEAR(create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY wu_liao_bian_ma_ HAVING COUNT(wu_liao_bian_ma_)>=1) as b on a.wu_liao_bian_ma_ = b.wu_liao_bian_ma_"
+  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from (select t_bzjzhcjhzb.wu_liao_bian_ma_,t_bzjzhcjhzb.wu_zhi_ming_cheng as wlid,t_bzjzhcjhzb.zhuan_huan_ as name, COUNT(t_bzjzhcjhzb.wu_zhi_ming_cheng) as num from t_bzjzhcjhzb join t_bzjzhcjhb on t_bzjzhcjhb.id_=t_bzjzhcjhzb.parent_id_ where t_bzjzhcjhb.nian_du_='"+end+"' and t_bzjzhcjhb.shi_fou_guo_shen_='1' GROUP BY t_bzjzhcjhzb.wu_zhi_ming_cheng HAVING COUNT(t_bzjzhcjhzb.wu_zhi_ming_cheng)>=1) as a LEFT JOIN (select wu_liao_bian_ma_, zhuan_huan_ as name, COUNT(wu_liao_bian_ma_) as numS from t_bzjzqjhcjl as d where YEAR(create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY wu_liao_bian_ma_ HAVING COUNT(wu_liao_bian_ma_)>=1) as b on a.wu_liao_bian_ma_ = b.wu_liao_bian_ma_"
 }
 export const getbzJunZhuTObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
@@ -39,7 +39,7 @@ export const getbzJunZhuTObj = (end)=>{
 }
 export const getbzXiBaoObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from(select zhuan_huan_ as name, COUNT(zhuan_huan_) as num from t_bzxbqjhcjhzbn where YEAR(create_time_)="+end+" GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as a LEFT JOIN (select c.zhuan_huan_ as name, COUNT(c.zhuan_huan_) as numS from t_bzxbqjhcjhzbn as c LEFT JOIN t_bzxbqjhcjh as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY c.zhuan_huan_ HAVING COUNT(c.zhuan_huan_)>=1) as b on a.name = b.name"
+  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from (select t_bzxbqjhcjhzbn.wu_zhi_ming_cheng as wlid,t_bzxbqjhcjhzbn.zhuan_huan_ as name, COUNT(t_bzxbqjhcjhzbn.wu_zhi_ming_cheng) as num from t_bzxbqjhcjhzbn join t_bzxbqjhcjh on t_bzxbqjhcjh.id_=t_bzxbqjhcjhzbn.parent_id_ where t_bzxbqjhcjh.nian_du_='"+end+"' and t_bzxbqjhcjh.shi_fou_guo_shen_='1' GROUP BY t_bzxbqjhcjhzbn.wu_zhi_ming_cheng HAVING COUNT(t_bzxbqjhcjhzbn.wu_zhi_ming_cheng)>=1) as a LEFT JOIN (select c.zhuan_huan_ as name, COUNT(c.zhuan_huan_) as numS from t_bzxbqjhcjhzbn as c LEFT JOIN t_bzxbqjhcjh as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY c.zhuan_huan_ HAVING COUNT(c.zhuan_huan_)>=1) as b on a.name = b.name"
 }
 export const getbzXiBaoTObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
@@ -76,6 +76,7 @@ export const DBData = (begin,end,scope)=>{
   " join "+s9neiBu(begin,end,scope)+
   " join "+s12fengXian(begin,end,scope)+
   " join "+s14bufuhexiang(begin,end,scope)+
+  " join "+s18gangqian(begin,end,scope)+
   // " join "+s6sheBeiWeiHu(begin,end)+
   // " join "+s7sheBeiJiaoZhun(begin,end)+
   // " join "+s8sheBeiHeCha(begin,end)+
@@ -166,15 +167,16 @@ function s2jianCe(begin,end){
   }
  /* 满意度 */
  function s2manYiDu(begin,end,scope){
-  return "( SELECT COUNT(id_) as t_khmydtjbnum"+end+",sum(ping_fen_1_)+sum(ping_fen_2_)+sum(ping_fen_3_)+sum(ping_fen_4_)+sum(ping_fen_5_)  AS t_khmydtjb"+end+" FROM t_khmyddcb WHERE YEAR( create_time_ ) = "+end+" ) s2manYiDu1  JOIN"+
+  return "( SELECT COUNT(id_) as t_khmydtjbnum"+end+",sum(ping_fen_1_)+sum(ping_fen_2_)+sum(ping_fen_3_)+sum(ping_fen_4_)+sum(ping_fen_5_)  AS t_khmydtjb"+end+" FROM t_khmyddcb WHERE wen_juan_='是' and YEAR( create_time_ ) = "+end+" ) s2manYiDu1  JOIN"+
   "( SELECT COUNT( id_ ) AS t_khmydtjbS"+end+" FROM t_khmydtjb WHERE  YEAR ( create_time_ ) = "+end+" ) s2manYiDu2 "
 }
 /* 投诉 */
 function s3tousu(begin,end,scope){
-  return "( SELECT COUNT( id_ ) AS t_complaint"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3tousu1  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_complaintS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_shi_jian_='<48h' and YEAR ( create_time_ ) = "+end+" ) s3tousu2  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_complainS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_jie_guo_sh='已通知' and YEAR ( create_time_ ) = "+end+" ) s3tousu3  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_mjwtsqb"+end+" FROM t_lhjczb WHERE  YEAR ( create_time_ ) = "+end+" ) s3weituo1"
+  return "( SELECT COUNT( id_ ) AS t_complaint"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3tousu1  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_complaintS"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and chu_li_shi_jian_='<48h' and YEAR ( create_time_ ) = "+end+" ) s3tousu2  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_complainS"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and chu_li_jie_guo_sh='已通知' and YEAR ( create_time_ ) = "+end+" ) s3tousu3  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_mjwtsqb"+end+" FROM t_lhjczb WHERE  YEAR ( create_time_ ) = "+end+" ) s3weituo1 JOIN"+
+  "( SELECT COUNT( id_ ) AS t_comwt"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3weituo2"
  }
  /* 人员培训 */
 function s4renYuanPeiXun(begin,end,scope){
@@ -221,14 +223,14 @@ function s8sheBeiHeCha(begin,end){
  /* 内部质量控制 */
 function s9neiBu(begin,end,scope){
   return "( SELECT COUNT( id_ ) AS t_mjzlkzxb"+end+" FROM t_mjzlkzxb WHERE YEAR ( create_time_ ) = "+end+" ) s9neibu1  JOIN "+
-  "(SELECT COUNT( t_mjzlkzxb.id_ ) AS t_mjzlkzxbS"+end+" FROM t_mjzlkzxb , t_zlkzjlb WHERE t_mjzlkzxb.xiang_mu_=t_zlkzjlb.zhi_kong_xiang_mu AND t_mjzlkzxb.shi_shi_shi_jian_ = t_zlkzjlb.ji_hua_ri_qi_  and t_zlkzjlb.shi_fou_guo_shen_='1' AND YEAR ( t_mjzlkzxb.create_time_ ) = "+end+" ) s9neibu2"
+  "(SELECT COUNT( t_mjzlkzxb.id_ ) AS t_mjzlkzxbS"+end+" FROM t_mjzlkzxb join t_mjzlkzjhb on t_mjzlkzxb.parent_id_ = t_mjzlkzjhb.id_ WHERE t_mjzlkzjhb.shi_fou_guo_shen_='1' and t_mjzlkzjhb.nian_du_= '"+end+"') s9neibu2"
   // "( SELECT COUNT( id_ ) AS t_mjzlkzjlb"+end+" FROM t_mjzlkzjlb WHERE length(shi_fou_guo_shen_) >0 AND YEAR ( create_time_ ) = "+end+" ) s9neibu3 join" +
   // "( SELECT COUNT( id_ ) AS t_mjzlkzjlbS"+end+" FROM t_mjzlkzjlb WHERE shi_fou_guo_shen_=1 AND YEAR ( create_time_ ) = "+end+" ) s9neibu4"
 
  }
  function s12fengXian(begin,end,scope){
   return "(select COUNT(t_mjsyshdfxsbykzjhxb.id_) as t_mjsyshdfxsbykzjhxb"+end+" from t_mjsyshdfxsbykzjhxb INNER JOIN t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhxb.parent_id_ = t_mjsyshdfxsbykzjhb.id_  where YEAR(t_mjsyshdfxsbykzjhxb.shi_shi_ri_qi_)="+end+") s12fengxian1  JOIN " +
-  "(select COUNT(id_) as t_mjsyshdfxsbykzjhxbS"+end+" from t_mjsyshdfxkzypjjlb where shi_fou_guo_shen_ = '1' and YEAR ( create_time_ ) = "+end+") s12fengxian2 "
+  "(SELECT COUNT( t_mjsyshdfxsbykzjhxb.id_ ) AS t_mjsyshdfxsbykzjhxbS"+end+" FROM t_mjsyshdfxsbykzjhxb join t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhxb.parent_id_ = t_mjsyshdfxsbykzjhb.id_ WHERE t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_='1' and t_mjsyshdfxsbykzjhb.nian_du_= '"+end+"') s12fengxian2 "
 
  }
  function s14bufuhexiang(begin,end,scope){
@@ -236,4 +238,8 @@ function s9neiBu(begin,end,scope){
   "(select COUNT(t_bfhxbgyjzcsjlbx.id_) as t_bfhxbgyjzcsjlbxS"+end+" from t_bfhxbgyjzcsjlbx where t_bfhxbgyjzcsjlbx.shi_fou_guo_shen_ = '1' and YEAR(t_bfhxbgyjzcsjlbx.create_time_)="+end+") s14buhexiang2 "
 
  }
+ function s18gangqian(begin,end,scope){
+  return "(SELECT COUNT( t_lhrypxjlb.id_ ) AS t_lhgqpxjhzb"+end+" FROM t_lhrypxjlb WHERE t_lhrypxjlb.shi_fou_guo_shen_='1' and YEAR(t_lhrypxjlb.create_time_)="+end+") s18gangqian1  JOIN " +
+  "(SELECT COUNT( t_lhgqpxjhzb.id_ ) AS t_lhgqpxjhzbS"+end+" FROM t_lhgqpxjhzb join t_lhgqpxjh on t_lhgqpxjhzb.parent_id_ = t_lhgqpxjh.id_ WHERE (t_lhgqpxjh.shi_fou_guo_shen_='1' or t_lhgqpxjh.shi_fou_guo_shen_='已审批' or t_lhgqpxjh.shi_fou_guo_shen_='已评价' or t_lhgqpxjh.shi_fou_guo_shen_='已确认') and t_lhgqpxjh.nian_du_= '"+end+"') s18gangqian2 "
 
+ }

+ 37 - 28
src/views/statistics/js/selectDBDSRW.js

@@ -1,51 +1,51 @@
 import en from "@/locales/bpmn-js/en"
 
 /* 统计的合格率配置信息,  如公正性,  一年需要完成4次, 当前完成2次的话,则为50%完成率。 */
-export const getConfig = (begin,end)=>{
+export const getConfig1 = (begin,end)=>{
   return "select * FROM t_tjpzb"
 
 }
-export const getJiaoYanObj = (end)=>{
-  // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.she_bei_bian_hao_,a.t_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select t_sbdj.she_bei_shi_bie_h as t_mjsbjdxzjhzbZhName, t_mjsbjdxzjhzb.she_bei_ming_chen as t_mjsbjdxzjhzbName,t_mjsbjdxzjhzb.she_bei_bian_hao_, COUNT(t_mjsbjdxzjhzb.she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb LEFT JOIN t_sbdj on t_mjsbjdxzjhzb.she_bei_bian_hao_ = t_sbdj.id_ where YEAR(t_mjsbjdxzjhzb.create_time_)="+end+" GROUP BY t_mjsbjdxzjhzb.she_bei_ming_chen HAVING COUNT(t_mjsbjdxzjhzb.she_bei_ming_chen)>=1) as a left join  (select yi_qi_bian_hao_, COUNT(yi_qi_bian_hao_) as t_mjsbjdxzjhzbS from t_sbjdxzzx where YEAR(create_time_)= "+end+" AND DATE(you_xiao_qi_zhi_) >= DATE(xiao_zhun_ri_qi_) GROUP BY yi_qi_bian_hao_ HAVING COUNT(yi_qi_bian_hao_)>=1 )as b on a.she_bei_bian_hao_=b.yi_qi_bian_hao_"
+export const getJiaoYanObj1 = (end)=>{
+  // // return "select a.she_bei_bian_hao_,a.t_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select t_sbdj.she_bei_shi_bie_h as t_mjsbjdxzjhzbZhName, zb.she_bei_ming_chen as t_mjsbjdxzjhzbName,zb.she_bei_bian_hao_, COUNT(zb.she_bei_ming_chen) as t_mjsbjdxzjhzb from (select t_mjsbjdxzjhzb.* from t_mjsbjdxzjhzb join t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_=t_mjsbjdxzjh.id_ where t_mjsbjdxzjh.ji_hua_nian_du_='"+end+"' and t_mjsbjdxzjh.shi_fou_guo_shen_='1' ) zb LEFT JOIN t_sbdj on zb.she_bei_bian_hao_ = t_sbdj.id_ GROUP BY zb.she_bei_bian_hao_ HAVING COUNT(zb.she_bei_bian_hao_)>=1) as a left join (select t_sbjdxzzx.yi_qi_bian_hao_, COUNT(t_sbjdxzzx.yi_qi_bian_hao_) as t_mjsbjdxzjhzbS from t_sbjdxzzx join (select t_sbjdxzqr.* from t_sbjdxzqr join t_mjsbjdxzjh on t_sbjdxzqr.ji_hua_zong_wai_j=t_mjsbjdxzjh.id_ where t_mjsbjdxzjh.ji_hua_nian_du_='"+end+"' and t_mjsbjdxzjh.shi_fou_guo_shen_='1'  and t_sbjdxzqr.shi_fou_guo_shen_='1') jh on jh.id_ =t_sbjdxzzx.parent_id_ where  DATE(t_sbjdxzzx.you_xiao_qi_zhi_) >= DATE(t_sbjdxzzx.xiao_zhun_ri_qi_) GROUP BY t_sbjdxzzx.yi_qi_bian_hao_ HAVING COUNT(t_sbjdxzzx.yi_qi_bian_hao_)>=1 )as b on a.she_bei_bian_hao_=b.yi_qi_bian_hao_"
+  return "select a.she_bei_bian_hao_,a.t_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select t_sbdj.she_bei_shi_bie_h as t_mjsbjdxzjhzbZhName, zb.she_bei_ming_chen as t_mjsbjdxzjhzbName,zb.she_bei_bian_hao_, COUNT(zb.she_bei_ming_chen) as t_mjsbjdxzjhzb from (select t_mjsbjdxzjhzb.* from t_mjsbjdxzjhzb join t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_=t_mjsbjdxzjh.id_ where t_mjsbjdxzjh.ji_hua_nian_du_='"+end+"' and t_mjsbjdxzjh.shi_fou_guo_shen_='1' ) zb LEFT JOIN t_sbdj on zb.she_bei_bian_hao_ = t_sbdj.id_ GROUP BY zb.she_bei_bian_hao_ HAVING COUNT(zb.she_bei_bian_hao_)>=1) as a left join (select t_sbjdxzzx.yi_qi_bian_hao_, COUNT(t_sbjdxzzx.yi_qi_bian_hao_) as t_mjsbjdxzjhzbS from t_sbjdxzzx join (select t_sbjdxzqr.* from t_sbjdxzqr join t_mjsbjdxzjh on t_sbjdxzqr.ji_hua_zong_wai_j=t_mjsbjdxzjh.id_ where t_mjsbjdxzjh.ji_hua_nian_du_='"+end+"' and t_mjsbjdxzjh.shi_fou_guo_shen_='1'  and t_sbjdxzqr.shi_fou_guo_shen_='1') jh on jh.id_ =t_sbjdxzzx.parent_id_  GROUP BY t_sbjdxzzx.yi_qi_bian_hao_ HAVING COUNT(t_sbjdxzzx.yi_qi_bian_hao_)>=1 )as b on a.she_bei_bian_hao_=b.yi_qi_bian_hao_"
 }
-export const gethechaObj = (end)=>{
+export const gethechaObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select	a.t_sbhcjlbZhname,	a.t_sbhcjlbName,	a.t_sbhcjlb,	ifnull( b.t_sbhcjlbS, 0 ) AS t_sbhcjlbS FROM	(	SELECT	t_sbdj.she_bei_ming_cheng_ AS t_sbhcjlbZhname,	t_sbdj.she_bei_shi_bie_h AS t_sbhcjlbName,	COUNT( t_yqsbhcjh.yi_qi_she_bei_min ) AS t_sbhcjlb 	FROM	t_yqsbhcjh	LEFT JOIN t_sbdj ON t_yqsbhcjh.yi_qi_she_bei_min = t_sbdj.id_ 	WHERE	YEAR ( t_yqsbhcjh.he_cha_pin_lv_ )= "+end+"	GROUP BY	t_yqsbhcjh.yi_qi_she_bei_min 	HAVING	COUNT( t_yqsbhcjh.yi_qi_she_bei_min )>= 1 	) AS a	LEFT JOIN ( SELECT sheng_xiao_ri_qi_, COUNT( sheng_xiao_ri_qi_ ) AS t_sbhcjlbS FROM t_sbqjhcjlb WHERE YEAR ( he_cha_ri_qi_ )= "+end+" and (shi_fou_guo_shen_ = '1' or  shi_fou_guo_shen_ = '已审核') GROUP BY sheng_xiao_ri_qi_ HAVING COUNT( sheng_xiao_ri_qi_ )>= 1 ) AS b ON a.t_sbhcjlbName = b.sheng_xiao_ri_qi_ "
+  return "select	a.t_sbhcjlbZhname,	a.t_sbhcjlbName,	a.t_sbhcjlb,	ifnull( b.t_sbhcjlbS, 0 ) AS t_sbhcjlbS FROM	(	SELECT	t_sbdj.id_ AS sbid,t_sbdj.she_bei_ming_cheng_ AS t_sbhcjlbZhname,	t_sbdj.she_bei_shi_bie_h AS t_sbhcjlbName,	COUNT( zb.yi_qi_she_bei_min ) AS t_sbhcjlb 	FROM	(select t_yqsbhcjh.* from t_yqsbhcjh join t_sbhcjh on t_sbhcjh.id_=t_yqsbhcjh.parent_id_ where t_sbhcjh.shi_fou_guo_shen_='1' and t_sbhcjh.nian_fen_='"+end+"') zb	LEFT JOIN t_sbdj ON zb.yi_qi_she_bei_min = t_sbdj.id_	GROUP BY	zb.yi_qi_she_bei_min 	HAVING	COUNT( zb.yi_qi_she_bei_min )>= 1 	) AS a	LEFT JOIN ( SELECT t_sbqjhcjlb.she_bei_bian_hao_ as sbbh, t_sbqjhcjlb.sheng_xiao_ri_qi_, COUNT( t_sbqjhcjlb.she_bei_bian_hao_ ) AS t_sbhcjlbS FROM t_sbqjhcjlb join t_sbhcjh on t_sbqjhcjlb.ji_hua_zong_wai_j=t_sbhcjh.id_ WHERE t_sbhcjh.shi_fou_guo_shen_='1' and t_sbhcjh.nian_fen_='"+end+"' and t_sbqjhcjlb.shi_fou_guo_shen_ = '1' GROUP BY t_sbqjhcjlb.she_bei_bian_hao_ HAVING COUNT( t_sbqjhcjlb.she_bei_bian_hao_ )>= 1 ) AS b ON a.sbid = b.sbbh "
 }
 // export const getnengliObj = (end)=>{
 //   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
 //   return "select a.enname,ifnull(a.num,0) as num,  ifnull(b.num,0) as numS from(select xiang_mu_ as enname, COUNT(jian_ce_biao_zhun) as num from t_ndnlyzsysjbdjhzb where YEAR(yu_ji_shi_jian_)="+end+" GROUP BY jian_ce_biao_zhun HAVING COUNT(jian_ce_biao_zhun)>=1) as a LEFT JOIN (select jian_ce_biao_zhun as enname, COUNT(jian_ce_biao_zhun) as num from t_ndnlyzsysjbdjhzb as c LEFT JOIN t_ndnlyzsysjbdjhb as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY jian_ce_biao_zhun HAVING COUNT(jian_ce_biao_zhun)>=1) as b on a.enname = b.enname"
 // }
-export const getnengliObj = (end)=>{
+export const getnengliObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
   return "select COUNT(t_ndnlyzsysjbdjhzb.id_) as num from t_ndnlyzsysjbdjhzb LEFT JOIN t_nlyzsysjbdhdsyxhcb on t_ndnlyzsysjbdjhzb.id_=t_nlyzsysjbdhdsyxhcb.xiang_mu_ming_che WHERE t_nlyzsysjbdhdsyxhcb.shi_fou_guo_shen_ = '1' and  YEAR(t_ndnlyzsysjbdjhzb.create_time_)= "+end+" UNION all select COUNT(id_) as snum from t_ndnlyzsysjbdjhzb where  YEAR(create_time_)="+end
 }
-export const getbiaozhunObj = (end)=>{
+export const getbiaozhunObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from(select zhuan_huan_ as name, COUNT(zhuan_huan_) as num from t_bzwzqjhcjhzb where YEAR(create_time_)="+end+" GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as a LEFT JOIN (select zhuan_huan_ as name, COUNT(zhuan_huan_) as numS from t_bzwzqjhcjhzb as c LEFT JOIN t_bzwzqjhcjhb as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as b on a.name = b.name"
+  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from	(select t_bzwzqjhcjhzb.wu_zhi_ming_cheng as wlid,t_bzwzqjhcjhzb.zhuan_huan_ as name, COUNT(t_bzwzqjhcjhzb.wu_zhi_ming_cheng) as num from t_bzwzqjhcjhzb join t_bzwzqjhcjhb on t_bzwzqjhcjhb.id_=t_bzwzqjhcjhzb.parent_id_ where t_bzwzqjhcjhb.nian_du_='"+end+"' and t_bzwzqjhcjhb.shi_fou_guo_shen_='1' GROUP BY t_bzwzqjhcjhzb.wu_zhi_ming_cheng HAVING COUNT(t_bzwzqjhcjhzb.wu_zhi_ming_cheng)>=1) as a LEFT JOIN (select x.wai_guan_biao_wu_ as wlid,x.name as name,COUNT(x.wai_guan_biao_wu_) as numS from (select c.shi_fou_guo_shen_,d.id_,d.parent_id_,c.zhuan_huan_ as name, c.wai_guan_biao_wu_ from t_bzwzqjhcjlb as c JOIN t_bzwzqjhcjhzb as d on c.guan_jian_zi_duan = d.id_) x join t_bzwzqjhcjhb on t_bzwzqjhcjhb.id_ = x.parent_id_ where t_bzwzqjhcjhb.nian_du_='"+end+"' and t_bzwzqjhcjhb.shi_fou_guo_shen_='1' and x.shi_fou_guo_shen_='1' GROUP BY x.wai_guan_biao_wu_ HAVING COUNT(x.wai_guan_biao_wu_)>=1) as b on a.wlid = b.wlid"
 }
-export const getbiaozhunTObj = (end)=>{
+export const getbiaozhunTObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
   return "select MONTH(shi_shi_shi_jian_) as time from t_bzwzqjhcjhzb where YEAR(shi_shi_shi_jian_) ="+end+" ORDER BY shi_shi_shi_jian_ ASC LIMIT 1"
 }
-export const getbzJunZhuObj = (end)=>{
+export const getbzJunZhuObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from(select wu_liao_bian_ma_, zhuan_huan_ as name, COUNT(wu_liao_bian_ma_) as num from t_bzjzhcjhzb where YEAR(create_time_)="+end+" GROUP BY wu_liao_bian_ma_ HAVING COUNT(wu_liao_bian_ma_)>=1) as a LEFT JOIN (select wu_liao_bian_ma_, zhuan_huan_ as name, COUNT(wu_liao_bian_ma_) as numS from t_bzjzqjhcjl as d where YEAR(create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY wu_liao_bian_ma_ HAVING COUNT(wu_liao_bian_ma_)>=1) as b on a.wu_liao_bian_ma_ = b.wu_liao_bian_ma_"
+  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from	(select t_bzjzhcjhzb.wu_zhi_ming_cheng as wlid,t_bzjzhcjhzb.zhuan_huan_ as name, COUNT(t_bzjzhcjhzb.wu_zhi_ming_cheng) as num from t_bzjzhcjhzb join t_bzjzhcjhb on t_bzjzhcjhb.id_=t_bzjzhcjhzb.parent_id_ where t_bzjzhcjhb.nian_du_='"+end+"' and t_bzjzhcjhb.shi_fou_guo_shen_='1' GROUP BY t_bzjzhcjhzb.wu_zhi_ming_cheng HAVING COUNT(t_bzjzhcjhzb.wu_zhi_ming_cheng)>=1) as a LEFT JOIN (select x.wai_guan_biao_wu_ as wlid,x.name as name,COUNT(x.wai_guan_biao_wu_) as numS from (select c.shi_fou_guo_shen_,d.id_,d.parent_id_,c.zhuan_huan_ as name, c.wai_guan_biao_wu_ from t_bzjzqjhcjl as c JOIN t_bzjzhcjhzb as d on c.guan_jian_zi_duan = d.id_) x join t_bzjzhcjhb on t_bzjzhcjhb.id_ = x.parent_id_ where t_bzjzhcjhb.nian_du_='"+end+"' and t_bzjzhcjhb.shi_fou_guo_shen_='1' and x.shi_fou_guo_shen_='1' GROUP BY x.wai_guan_biao_wu_ HAVING COUNT(x.wai_guan_biao_wu_)>=1) as b on a.wlid = b.wlid"
 }
-export const getbzJunZhuTObj = (end)=>{
+export const getbzJunZhuTObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
   return "select MONTH(shi_shi_shi_jian_) as time from t_bzjzhcjhzb where YEAR(shi_shi_shi_jian_) ="+end+" ORDER BY shi_shi_shi_jian_ ASC LIMIT 1"
 }
-export const getbzXiBaoObj = (end)=>{
+export const getbzXiBaoObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from(select zhuan_huan_ as name, COUNT(zhuan_huan_) as num from t_bzxbqjhcjhzbn where YEAR(create_time_)="+end+" GROUP BY zhuan_huan_ HAVING COUNT(zhuan_huan_)>=1) as a LEFT JOIN (select c.zhuan_huan_ as name, COUNT(c.zhuan_huan_) as numS from t_bzxbqjhcjhzbn as c LEFT JOIN t_bzxbqjhcjh as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY c.zhuan_huan_ HAVING COUNT(c.zhuan_huan_)>=1) as b on a.name = b.name"
+  return "select a.name as name, a.num ,IFNULL(b.numS,0) as numS from	 (select t_bzxbqjhcjhzbn.wu_zhi_ming_cheng as wlid,t_bzxbqjhcjhzbn.zhuan_huan_ as name, COUNT(t_bzxbqjhcjhzbn.wu_zhi_ming_cheng) as num from t_bzxbqjhcjhzbn join t_bzxbqjhcjh on t_bzxbqjhcjh.id_=t_bzxbqjhcjhzbn.parent_id_ where t_bzxbqjhcjh.nian_du_='"+end+"' and t_bzxbqjhcjh.shi_fou_guo_shen_='1' GROUP BY t_bzxbqjhcjhzbn.wu_zhi_ming_cheng HAVING COUNT(t_bzxbqjhcjhzbn.wu_zhi_ming_cheng)>=1) as a LEFT JOIN (select x.wai_guan_biao_wu_ as wlid,x.name as name,COUNT(x.wai_guan_biao_wu_) as numS from (select c.shi_fou_guo_shen_,d.id_,d.parent_id_,c.zhuan_huan_ as name, c.wai_guan_biao_wu_ from t_bzxbhcjlb as c JOIN t_bzxbqjhcjhzbn as d on c.guan_jian_zi_duan = d.id_) x join t_bzxbqjhcjh on t_bzxbqjhcjh.id_ = x.parent_id_ where t_bzxbqjhcjh.nian_du_='"+end+"' and t_bzxbqjhcjh.shi_fou_guo_shen_='1' and x.shi_fou_guo_shen_='1' GROUP BY x.wai_guan_biao_wu_ HAVING COUNT(x.wai_guan_biao_wu_)>=1) as b on a.wlid = b.wlid"
 }
-export const getbzXiBaoTObj = (end)=>{
+export const getbzXiBaoTObj1 = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
   return "select MONTH(shi_shi_shi_jian_) as time from t_bzxbqjhcjhzbn where YEAR(shi_shi_shi_jian_) ="+end+" ORDER BY shi_shi_shi_jian_ ASC LIMIT 1"
 }
-export const DBData = (begin,end,scope)=>{
+export const DBData1 = (begin,end,scope)=>{
   // return "select tt.*,cast(1-(t_gdyrqcwt4"+begin+"/t_gdyrqcwt"+begin+")  AS decimal(32,2)) as t_gdyrqcwt6"+begin+
   // return "select tt.* "+
 
@@ -76,6 +76,7 @@ export const DBData = (begin,end,scope)=>{
   " join "+s9neiBu(begin,end,scope)+
   " join "+s12fengXian(begin,end,scope)+
   " join "+s14bufuhexiang(begin,end,scope)+
+  " join "+s18gangqian(begin,end,scope)+
   // " join "+s6sheBeiWeiHu(begin,end)+
   // " join "+s7sheBeiJiaoZhun(begin,end)+
   // " join "+s8sheBeiHeCha(begin,end)+
@@ -166,20 +167,22 @@ function s2jianCe(begin,end){
   }
  /* 满意度 */
  function s2manYiDu(begin,end,scope){
-  return "( SELECT COUNT(id_) as t_khmydtjbnum"+end+",sum(ping_fen_1_)+sum(ping_fen_2_)+sum(ping_fen_3_)+sum(ping_fen_4_)+sum(ping_fen_5_)  AS t_khmydtjb"+end+" FROM t_khmyddcb WHERE YEAR( create_time_ ) = "+end+" ) s2manYiDu1  JOIN"+
+  return "( SELECT COUNT(id_) as t_khmydtjbnum"+end+",sum(ping_fen_1_)+sum(ping_fen_2_)+sum(ping_fen_3_)+sum(ping_fen_4_)+sum(ping_fen_5_)  AS t_khmydtjb"+end+" FROM t_khmyddcb WHERE wen_juan_='是' and YEAR( create_time_ ) = "+end+" ) s2manYiDu1  JOIN"+
   "( SELECT COUNT( id_ ) AS t_khmydtjbS"+end+" FROM t_khmydtjb WHERE  YEAR ( create_time_ ) = "+end+" ) s2manYiDu2 "
 }
 /* 投诉 */
 function s3tousu(begin,end,scope){
-  return "( SELECT COUNT( id_ ) AS t_complaint"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3tousu1  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_complaintS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_shi_jian_='<48h' and YEAR ( create_time_ ) = "+end+" ) s3tousu2  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_complainS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_jie_guo_sh='已通知' and YEAR ( create_time_ ) = "+end+" ) s3tousu3  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_mjwtsqb"+end+" FROM t_lhjczb WHERE  YEAR ( create_time_ ) = "+end+" ) s3weituo1"
+  return "( SELECT COUNT( id_ ) AS t_complaint"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3tousu1  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_complaintS"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and chu_li_shi_jian_='<48h' and YEAR ( create_time_ ) = "+end+" ) s3tousu2  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_complainS"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and chu_li_jie_guo_sh='已通知' and YEAR ( create_time_ ) = "+end+" ) s3tousu3  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_mjwtsqb"+end+" FROM t_lhjczb WHERE  YEAR ( create_time_ ) = "+end+" ) s3weituo1 JOIN"+
+  "( SELECT COUNT( id_ ) AS t_comwt"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3weituo2"
+  // "( SELECT COUNT( id_ ) AS t_comwt"+end+" FROM t_complaint WHERE zhuang_tai_='已完成' and (guan_lian_yang_pi !='' or guan_lian_yang_pi is not null) and you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3weituo2"
  }
  /* 人员培训 */
 function s4renYuanPeiXun(begin,end,scope){
-  return "( SELECT COUNT( id_ ) AS t_ryywpxjl"+end+" FROM t_lhrypxjlb WHERE pei_xun_lei_xing_!='' and shi_fou_guo_shen_ = '1' AND YEAR ( bian_zhi_shi_jian ) = "+end+" ) s4renYuanPeiXun1  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_ryywpxjlS"+end+" FROM t_lhrypxjlb WHERE pei_xun_lei_xing_!='' and YEAR ( bian_zhi_shi_jian ) = "+end+" ) s4renYuanPeiXun2"
+  return "(SELECT COUNT( t_lhrypxjlb.id_ ) AS t_ryywpxjl"+end+" FROM t_lhrypxjlb join t_lhndrypxjh on t_lhndrypxjh.id_= t_lhrypxjlb.ji_hua_zong_wai_j WHERE t_lhrypxjlb.shi_fou_guo_shen_='1' and t_lhndrypxjh.shi_fou_guo_shen_='1' and t_lhndrypxjh.nian_du_= '"+end+"') s4renYuanPeiXun1  JOIN "+
+  "( SELECT COUNT( t_ndrypxjhzb.id_ ) AS t_ryywpxjlS"+end+" FROM t_ndrypxjhzb join t_lhndrypxjh on t_ndrypxjhzb.parent_id_ = t_lhndrypxjh.id_ WHERE t_lhndrypxjh.shi_fou_guo_shen_='1' and t_lhndrypxjh.nian_du_= '"+end+"' ) s4renYuanPeiXun2"
  }
  /* 人员监督 */
 function s5renYuanJianDu(begin,end, scope){
@@ -220,15 +223,15 @@ function s8sheBeiHeCha(begin,end){
  }
  /* 内部质量控制 */
 function s9neiBu(begin,end,scope){
-  return "( SELECT COUNT( id_ ) AS t_mjzlkzxb"+end+" FROM t_mjzlkzxb WHERE YEAR ( create_time_ ) = "+end+" ) s9neibu1  JOIN "+
-  "(SELECT COUNT( t_mjzlkzxb.id_ ) AS t_mjzlkzxbS"+end+" FROM t_mjzlkzxb , t_zlkzjlb WHERE t_mjzlkzxb.xiang_mu_=t_zlkzjlb.zhi_kong_xiang_mu AND t_mjzlkzxb.shi_shi_shi_jian_ = t_zlkzjlb.ji_hua_ri_qi_  and t_zlkzjlb.shi_fou_guo_shen_='1' AND YEAR ( t_mjzlkzxb.create_time_ ) = "+end+" ) s9neibu2"
+  return "( SELECT COUNT( t_zlkzjlb.id_ ) AS t_mjzlkzxb"+end+" FROM t_zlkzjlb join t_mjzlkzjhb on t_mjzlkzjhb.id_= t_zlkzjlb.ji_hua_zong_wai_j WHERE t_zlkzjlb.shi_fou_guo_shen_='1' and t_mjzlkzjhb.shi_fou_guo_shen_='1' and t_mjzlkzjhb.nian_du_= '"+end+"' ) s9neibu1  JOIN "+
+  "(SELECT COUNT( t_mjzlkzxb.id_ ) AS t_mjzlkzxbS"+end+" FROM t_mjzlkzxb join t_mjzlkzjhb on t_mjzlkzxb.parent_id_ = t_mjzlkzjhb.id_ WHERE t_mjzlkzjhb.shi_fou_guo_shen_='1' and t_mjzlkzjhb.nian_du_= '"+end+"') s9neibu2"
   // "( SELECT COUNT( id_ ) AS t_mjzlkzjlb"+end+" FROM t_mjzlkzjlb WHERE length(shi_fou_guo_shen_) >0 AND YEAR ( create_time_ ) = "+end+" ) s9neibu3 join" +
   // "( SELECT COUNT( id_ ) AS t_mjzlkzjlbS"+end+" FROM t_mjzlkzjlb WHERE shi_fou_guo_shen_=1 AND YEAR ( create_time_ ) = "+end+" ) s9neibu4"
 
  }
  function s12fengXian(begin,end,scope){
-  return "(select COUNT(t_mjsyshdfxsbykzjhxb.id_) as t_mjsyshdfxsbykzjhxb"+end+" from t_mjsyshdfxsbykzjhxb INNER JOIN t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhxb.parent_id_ = t_mjsyshdfxsbykzjhb.id_  where YEAR(t_mjsyshdfxsbykzjhxb.shi_shi_ri_qi_)="+end+") s12fengxian1  JOIN " +
-  "(select COUNT(id_) as t_mjsyshdfxsbykzjhxbS"+end+" from t_mjsyshdfxkzypjjlb where shi_fou_guo_shen_ = '1' and YEAR ( create_time_ ) = "+end+") s12fengxian2 "
+  return "(SELECT COUNT( t_mjsyshdfxkzypjjlb.id_ ) AS t_mjsyshdfxsbykzjhxb"+end+" FROM t_mjsyshdfxkzypjjlb join t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhb.id_= t_mjsyshdfxkzypjjlb.ji_hua_zong_wai_j WHERE t_mjsyshdfxkzypjjlb.shi_fou_guo_shen_='1' and t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_='1' and t_mjsyshdfxsbykzjhb.nian_du_= '"+end+"') s12fengxian1  JOIN " +
+  "(SELECT COUNT( t_mjsyshdfxsbykzjhxb.id_ ) AS t_mjsyshdfxsbykzjhxbS"+end+" FROM t_mjsyshdfxsbykzjhxb join t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhxb.parent_id_ = t_mjsyshdfxsbykzjhb.id_ WHERE t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_='1' and t_mjsyshdfxsbykzjhb.nian_du_= '"+end+"') s12fengxian2 "
 
  }
  function s14bufuhexiang(begin,end,scope){
@@ -236,4 +239,10 @@ function s9neiBu(begin,end,scope){
   "(select COUNT(t_bfhxbgyjzcsjlbx.id_) as t_bfhxbgyjzcsjlbxS"+end+" from t_bfhxbgyjzcsjlbx where t_bfhxbgyjzcsjlbx.shi_fou_guo_shen_ = '1' and YEAR(t_bfhxbgyjzcsjlbx.create_time_)="+end+") s14buhexiang2 "
 
  }
+ function s18gangqian(begin,end,scope){
+  return "(SELECT COUNT( t_lhrypxjlb.id_ ) AS t_lhgqpxjhzb"+end+" FROM t_lhrypxjlb join t_lhgqpxjh on t_lhgqpxjh.id_= t_lhrypxjlb.ji_hua_zong_wai_j WHERE t_lhrypxjlb.shi_fou_guo_shen_='1' and t_lhgqpxjh.shi_fou_guo_shen_='1' and t_lhgqpxjh.nian_du_= '"+end+"') s18gangqian1  JOIN " +
+  "(SELECT COUNT( t_lhgqpxjhzb.id_ ) AS t_lhgqpxjhzbS"+end+" FROM t_lhgqpxjhzb join t_lhgqpxjh on t_lhgqpxjhzb.parent_id_ = t_lhgqpxjh.id_ WHERE (t_lhgqpxjh.shi_fou_guo_shen_='1' or t_lhgqpxjh.shi_fou_guo_shen_='已审批' or t_lhgqpxjh.shi_fou_guo_shen_='已评价' or t_lhgqpxjh.shi_fou_guo_shen_='已确认') and t_lhgqpxjh.nian_du_= '"+end+"') s18gangqian2 "
+
+ }
+
 

+ 6 - 1
src/views/statistics/properties/s11biaoZhunWuPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -90,6 +90,7 @@
           default:window.screen.height * 0.4 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s11biaoZhunWuItem = () => import('../item/s11biaoZhunWu.vue')
@@ -120,6 +121,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s12fengXianPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -89,6 +89,7 @@
           default:window.screen.height * 0.5 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s12fengXianItem = () => import('../item/s12fengXian.vue')
@@ -115,6 +116,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s13shengWuPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -85,6 +85,7 @@
           default:''
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s13shengWuItem = () => import('../item/s13shengWu.vue')
@@ -111,6 +112,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s14bufehexiangPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -89,6 +89,7 @@
           default:window.screen.height * 0.5 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s14bufuhexiangItem = () => import('../item/s14bufuhexiang.vue')
@@ -115,6 +116,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s15tousuPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -78,6 +78,7 @@
           default:window.screen.height * 0.5 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s15tousuItem = () => import('../item/s15tousu.vue')
@@ -104,6 +105,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s16bzJunZhuPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -90,6 +90,7 @@
           default:window.screen.height * 0.4 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s16bzJunZhuItem = () => import('../item/s16bzJunZhu.vue')
@@ -117,6 +118,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s17bzXiBaoPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -90,6 +90,7 @@
           default:window.screen.height * 0.4 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s17bzXiBaoItem = () => import('../item/s17bzXiBao.vue')
@@ -117,6 +118,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 138 - 0
src/views/statistics/properties/s18renYuanPeiXunPro.vue

@@ -0,0 +1,138 @@
+<template>
+    <el-dialog v-on:mouseenter.native="rollstopz()"
+      :visible.sync="visible"
+      ref="dialog"
+      :title="title+''"
+      width="100%"
+      lock-scroll
+      append-to-body
+      fullscreen
+      close-on-press-escape
+      destroy-on-close
+      v-if="visible"
+      @close="handleClose">
+
+      <div>
+
+    <el-container>
+      <!-- <el-aside style="border:0px;width: 13%;"></el-aside> -->
+      <!-- 放统计内容-->
+      <el-aside style="border:0px;width: 70%;margin-top: 2%;">
+          <s18renYuanPeiXunItem
+            :data="data"
+            width="50%"
+            :height="height"
+            id="s18renYuanPeiXunPro"
+            click="false"
+          />
+          <s18renYuanPeiXunCItem
+            :data="data"
+            width="50%"
+            :height="height"
+            id="s18renYuanPeiXunCPro"
+            click="false"
+          />
+      </el-aside>
+        <!-- 参数页面列 -->
+        <el-aside style="border:0px;width: 30%;">
+          <div class="dataCont" style="font-size: 14px;">
+
+            <el-divider content-position="left">{{data.t_lhgqpxjhzbNum.date}} 年度</el-divider>
+              已完成培训数量 :<el-tag>{{data.t_lhgqpxjhzbNum.number[0]}} 次</el-tag>
+              <br>
+              所有培训数量 :<el-tag>{{data.t_lhgqpxjhzbNum.numberAll[0]}} 次</el-tag>
+              <br>
+              培训完成率 :<el-tag>{{data.t_lhgqpxjhzbNum.res[0]}} %</el-tag>
+              <br>
+          </div>
+          <!-- <div v-for="(item,i) in data.t_ryywpxjlNum.date" :key="i">
+            <el-divider content-position="left">{{data.t_ryywpxjlNum.date[i]}} 年度</el-divider>
+            已完成培训数量 :<el-tag>{{data.t_ryywpxjlNum.number[i]}} 次</el-tag>
+            <br>
+            所有培训数量 :<el-tag>{{data.t_ryywpxjlNum.numberAll[i]}} 次</el-tag>
+            <br>
+            培训完成率 :<el-tag>{{data.t_ryywpxjlNum.res[i]}} %</el-tag>
+            <br>
+          </div> -->
+           <!-- <div class="dataCont" style="font-size: 14px;">
+          <el-divider content-position="left">{{data.t_ryndpxjhBegin.date}} 年度</el-divider>
+            人员培训计划次数 :<el-tag>{{data.t_ryndpxjhBegin.number}} 次</el-tag>
+            <br>
+             <el-divider content-position="left">{{data.t_rypxjlnkBegin.date}} 年度</el-divider>
+            人员培训完成次数 :<el-tag>{{data.t_rypxjlnkBegin.number}} 次</el-tag>
+            <br>
+            <el-divider content-position="left">{{data.t_ryndpxjhEnd.date}} 年度</el-divider>
+            人员培训计划次数 :<el-tag type="danger">{{data.t_ryndpxjhEnd.number}} 次</el-tag>
+          <el-divider content-position="left">{{data.t_rypxjlnkEnd.date}} 年度</el-divider>
+            人员培训完成次数 :<el-tag type="danger">{{data.t_rypxjlnkEnd.number}} 次</el-tag>
+           </div> -->
+
+        </el-aside>
+
+      </el-container>
+
+
+      </div>
+    </el-dialog>
+</template>
+
+<script>
+  export default {
+    props:{
+        dialogOff:{ //当前表单示例
+            type: Boolean,
+            default:false,
+          },
+        title:{ type:String},
+        data:{
+          type:Object
+        },
+        height:{
+          type:String,
+          default:window.screen.height * 0.5 +'px'
+        }
+      },
+      inject:['rollstop'],
+      beforeCreate: function () {
+          // 官方文档给出的是require
+           this.$options.components.s18renYuanPeiXunItem = () => import('../item/s18renYuanPeiXun.vue')
+           this.$options.components.s18renYuanPeiXunCItem = () => import('../item/s18renYuanPeiXunCol.vue')
+          },
+
+    watch:{
+     dialogOff: {
+       handler: function(val, oldVal) {
+        this.visible = JSON.parse(JSON.stringify(val));
+        this.itemShow = true
+        },
+        immediate: true
+      }
+    },
+    data() {
+      return {
+        visible:false,
+        itemShow:false,
+
+      }
+    },
+    methods:{
+       // 关闭窗口
+      handleClose(){
+       this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .dataCont{
+    border:0px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    height: calc(100vh * 0.85);
+    padding:20px;
+  }
+</style>

+ 6 - 1
src/views/statistics/properties/s1jianCePro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog  v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -114,6 +114,7 @@
         }
         
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s1jianCeItem = () => import('../item/s1jianCe.vue')
@@ -140,6 +141,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s1zhiLiangMuBiaoPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog  v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -106,6 +106,7 @@
           default:''
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s5zhiLiangMuBiaoItem = () => import('../item/s1zhiLiangMuBiao.vue')
@@ -132,6 +133,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 11 - 2
src/views/statistics/properties/s2manYiDuPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -40,7 +40,11 @@
               <el-divider content-position="left">{{data.t_khmydtjbNum.date}} 年度</el-divider>
               评分得分 :<el-tag>{{data.t_khmydtjbNum.number[0]}} </el-tag>
               <br>
-              有效问卷总分 :<el-tag>{{data.t_khmydtjbNum.num}} </el-tag>
+              有效问卷总分:<el-tag>{{data.t_khmydtjbNum.num}} </el-tag>
+              <br>
+              问卷个数 :<el-tag>{{data.t_khmydtjbNum.numn[0]}} </el-tag>
+              <br>
+              单个问卷总分 :<el-tag>50分</el-tag>
               <br>
               客户满意度 :<el-tag>{{data.t_khmydtjbNum.res[0]}} %</el-tag>
               <br>
@@ -86,6 +90,7 @@
           default:''
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s2manYiDuItem = () => import('../item/s2manYiDu.vue')
@@ -205,6 +210,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 7 - 2
src/views/statistics/properties/s3tousuPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -37,7 +37,7 @@
         <el-aside style="border:0px;width: 30%;">
            <div class="dataCont" style="font-size: 14px;">
             <el-divider content-position="left">{{data.t_complaintNum.date}} 年度</el-divider>
-              投诉总数次数 :<el-tag>{{data.t_complaintNum.number[0]}} 次</el-tag>
+              投诉总数次数 :<el-tag>{{data.t_complaintNum.comwNum[0]}} 次</el-tag>
               <br>
               委托总数次数 :<el-tag>{{data.t_complaintNum.numberAll[0]}} 次</el-tag>
               <br>
@@ -85,6 +85,7 @@
           default:''
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s3tousuItem = () => import('../item/s3tousu.vue')
@@ -111,6 +112,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s4renYuanPeiXunPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -92,6 +92,7 @@
           default:window.screen.height * 0.5 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s4renYuanPeiXunItem = () => import('../item/s4renYuanPeiXun.vue')
@@ -118,6 +119,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s7sheBeiJiaoZhunPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -93,6 +93,7 @@
           default:window.screen.height * 0.4 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s7sheBeiJiaoZhunItem = () => import('../item/s7sheBeiJiaoZhun.vue')
@@ -121,6 +122,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 6 - 1
src/views/statistics/properties/s8sheBeiHeChaPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+''"
@@ -91,6 +91,7 @@
           default:window.screen.height * 0.4 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s8sheBeiHeChaItem = () => import('../item/s8sheBeiHeCha.vue')
@@ -118,6 +119,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 8 - 3
src/views/statistics/properties/s9neiBuZhiLiangPro.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog
+    <el-dialog v-on:mouseenter.native="rollstopz()"
       :visible.sync="visible"
       ref="dialog"
       :title="title+'详情'"
@@ -37,9 +37,9 @@
         <el-aside style="border:0px;width: 30%;">
            <div class="dataCont" style="font-size: 14px;">
             <el-divider content-position="left">{{data.t_mjzlkzxbNum.date}} 年度</el-divider>
-              计划内质量控制完成数量 :<el-tag>{{data.t_mjzlkzxbNum.number[1]}} 次</el-tag>
+              计划内质量控制完成数量 :<el-tag>{{data.t_mjzlkzxbNum.number[2]}} 次</el-tag>
               <br>
-              计划内质量控制总数 :<el-tag>{{data.t_mjzlkzxbNum.number[2]}} 次</el-tag>
+              计划内质量控制总数 :<el-tag>{{data.t_mjzlkzxbNum.number[1]}} 次</el-tag>
               <br>
               计划内质量控制完成率 :<el-tag>{{data.t_mjzlkzxbNum.valna}} %</el-tag>
               <br>
@@ -86,6 +86,7 @@
           default:window.screen.height * 0.5 +'px'
         }
       },
+      inject:['rollstop'],
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s9neiBuZhiLiangItem = () => import('../item/s9neiBuZhiLiang.vue')
@@ -112,6 +113,10 @@
        // 关闭窗口
       handleClose(){
        this.$emit('close', false)
+      },
+      rollstopz(){
+        this.rollstop()
+        console.log("监听到了")
       }
     }
   }

+ 49 - 17
src/views/statistics/sendDatas.js

@@ -12,12 +12,13 @@ export default {
                         //         matchArr.push(this.relData[matching+this.dataScope[i]])
                         // }
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                                // console.log(matching+this.endDate,'4565676575675',typeof this.relData[matching+this.endDate])
                                 if(typeof this.relData[matching+this.endDate] === "undefined"){
                                         matchArr.push(0)
                                         // console.log(matchArr,'1hiuhkj')
                                 }else{
                                         matchArr.push(this.relData[matching+this.endDate])
-                                        // console.log('2nhkjhiuhkj')
+                                        // console.log(matchArr,'2nhkjhiuhkj')
                                 }
                         // }
                         return matchArr
@@ -28,12 +29,14 @@ export default {
                         //         matchArr.push(this.relData[matching+'S'+this.dataScope[i]])
                         // }
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                                // console.log(matchArr,matching+'S'+this.endDate,'4565676575675',typeof this.relData[matching+'S'+this.endDate])
                                 if(typeof this.relData[matching+'S'+this.endDate] === "undefined"){
                                         matchArr.push(0)
                                         // console.log(matchArr,'1hiuhkj')
                                 }else{
                                         matchArr.push(this.relData[matching+'S'+this.endDate])
                                         // console.log('2nhkjhiuhkj')
+                                        // console.log(matchArr,matching+'S'+this.endDate,'4565676575675',typeof this.relData[matching+'S'+this.endDate])
                                 }
                         // }
                         return matchArr
@@ -140,12 +143,12 @@ export default {
                         }
                         val.forEach( function(item){
                                 if(item>0){
-                                        a += 1 ;
+                                        a += item ;
                                 }
                         });
                         valAll.forEach( function(item){
                                 if(item>0){
-                                        b += 1 ;
+                                        b += item ;
                                 }
                         });
                         if(a>b){
@@ -228,7 +231,7 @@ export default {
                         } else {
                                 numm = Math.floor((12-that.biaozhunTObj[0].time)/3) + 1
                         }
-                        // a=a*numm
+                        a=a*4
                         // console.log(numm,'numm')
                         if(b>a){
                                 b=a
@@ -285,7 +288,7 @@ export default {
                         } else {
                                 numm = Math.floor((12-that.bzJunZhuTObj[0].time)/3) + 1
                         }
-                        // a=a*numm
+                        a=a*4
                         // console.log(numm,'numm')
                         if(b>a){
                                 b=a
@@ -343,7 +346,7 @@ export default {
                         } else {
                                 numm = Math.floor((12-that.bzXiBaoTObj[0].time)/3) + 1
                         }
-                        // a=a*numm
+                        a=a*2
                         // console.log(numm,'numm')
                         if(b>a){
                                 b=a
@@ -445,6 +448,7 @@ export default {
                 getS2manYiDu(){
                         let khmydtjbNum = this.getMatchingData('t_khmydtjb')
                         let khmydtjbNumN = this.getMatchingData('t_khmydtjbnum') * 50
+                        let khmydtjbNumNn = this.getMatchingData('t_khmydtjbnum')
                         let khmydtjbSNum = this.getMatchingDataSame('t_khmydtjb')
                         let barData = []
                         // for (let i = 0; i < this.dataScope.length; i++) {
@@ -475,7 +479,7 @@ export default {
                                 "t_myddc5End" :{"date": this.endDate,"number": this.relData['t_myddc5'+this.endDate]},
                                 "t_myddc6Begin" :{"date": this.BeginDate,"number": this.relData['t_myddc6'+this.BeginDate]},
                                 "t_myddc6End" :{"date": this.endDate,"number": this.relData['t_myddc6'+this.endDate]},
-                                "t_khmydtjbNum" :{"date": this.endDate,"number": khmydtjbNum, "numberAll": khmydtjbSNum, "res": barData,'num':khmydtjbNumN},
+                                "t_khmydtjbNum" :{"date": this.endDate,"number": khmydtjbNum, "numberAll": khmydtjbSNum, "res": barData,'num':khmydtjbNumN,'numn':khmydtjbNumNn},
                                 "config":this.getMyConfig("客户满意度") //返回需要的对应参数
                         }
                 },
@@ -484,6 +488,7 @@ export default {
                         let complainNum = this.getMatchingDataSame('t_complain')
                         let complaintNumS = this.getMatchingDataSame('t_complaint')
                         let mjwtsqbNum = this.getMatchingData('t_mjwtsqb')
+                        let comwNum = this.getMatchingData('t_comwt')
                         let e=0
                         let barData =[]
                         let e1=0
@@ -493,7 +498,7 @@ export default {
                         if (mjwtsqbNum[0]===0) {
                                 e =0
                         } else {
-                                e =Math.floor(complaintNum[0]/mjwtsqbNum[0] * 10000) / 100
+                                e =Math.floor(comwNum[0]/mjwtsqbNum[0] * 10000) / 100
                         }
                         if (complaintNum[0]===0) {
                                 e1 =0
@@ -520,7 +525,7 @@ export default {
                         barData2.push(e2)
                         
                         return {
-                                "t_complaintNum" :{"date": this.endDate,"number": complaintNum,"numberAll":mjwtsqbNum,"res":barData,"num48":complaintNumS,"res1":barData1,"numtong":complainNum,"res2":barData2},
+                                "t_complaintNum" :{"date": this.endDate,"comwNum":comwNum,"number": complaintNum,"numberAll":mjwtsqbNum,"res":barData,"num48":complaintNumS,"res1":barData1,"numtong":complainNum,"res2":barData2},
                                 "t_mjwtsqbNum" :{"date": this.dataScope,"number": mjwtsqbNum},
                                 "config":this.getMyConfig("客户投诉率") //返回需要的对应参数
                         }
@@ -550,6 +555,33 @@ export default {
                                 "config":this.getMyConfig("人员培训") //返回需要的对应参数
                         }
                 },
+                getS18gangqian(){
+                        let ryywpxjNum = this.getMatchingData('t_lhgqpxjhzb')
+                        let ryywpxjSNum = this.getMatchingDataSame('t_lhgqpxjhzb')
+                        let barData = []
+                        console.log(ryywpxjSNum,'barDatabarDatabarDatabarDatabarData')
+                        // for (let i = 0; i < this.dataScope.length; i++) {
+                                if(ryywpxjNum[0]>ryywpxjSNum[0]){
+                                        ryywpxjNum[0]=ryywpxjSNum[0]
+                                }
+                                let e=0
+                                if (ryywpxjSNum[0]===0) {
+                                        e =0
+                                } else {
+                                        e =Math.floor(ryywpxjNum[0]/ryywpxjSNum[0] * 10000) / 100
+                                }
+                                barData.push(e)
+                        // }
+                        
+                        return {
+                                "t_lhgqpxjhzbNum" :{"date": this.endDate,"number": ryywpxjNum, "numberAll": ryywpxjSNum, "res": barData},
+                                "t_ryndpxjhBegin" :{"date": this.BeginDate,"number": this.relData['t_ryndpxjh'+this.BeginDate]},
+                                "t_ryndpxjhEnd" :{"date": this.endDate,"number": this.relData['t_ryndpxjh'+this.endDate]},
+                                "t_rypxjlnkBegin" :{"date": this.BeginDate,"number": this.relData['t_rypxjlnk'+this.BeginDate]},
+                                "t_rypxjlnkEnd" :{"date": this.endDate,"number": this.relData['t_rypxjlnk'+this.endDate]},
+                                "config":this.getMyConfig("人员培训") //返回需要的对应参数
+                        }
+                },
                 getS5renYuanJianDu(){
                         let zljdNum = this.getMatchingData('t_zljd')
                         let zljdSNum = this.getMatchingDataSame('t_zljd')
@@ -619,9 +651,9 @@ export default {
                 },
                 getS9neiBuZhiLiang(){
                         //年度总
-                        let mjzlkzxbNum = this.getMatchingDataSame('t_mjzlkzxb')
+                        let mjzlkzxbSNum = this.getMatchingDataSame('t_mjzlkzxb')
                         //年度条件
-                        let mjzlkzxbSNum = this.getMatchingData('t_mjzlkzxb')
+                        let mjzlkzxbNum = this.getMatchingData('t_mjzlkzxb')
                         // //部门总
                         // let mjzlkzjlbNum = this.getMatchingData('t_mjzlkzjlb')
                         // //部门条件
@@ -640,8 +672,8 @@ export default {
                         //         e =Math.floor(mjzlkzxbNum[0]/mjzlkzxbSNum[0] * 10000) / 100
                         // }
                         numData.push('计划内')
-                        numData.push(mjzlkzxbNum[0])
                         numData.push(mjzlkzxbSNum[0])
+                        numData.push(mjzlkzxbNum[0])
                         // numAData.push('计划外')
                         // numAData.push(mjzlkzjlbNum[0])
                         // numAData.push(mjzlkzjlbSNum[0])
@@ -675,22 +707,22 @@ export default {
                         let numData = []
                         let numAData = []
                         let barData = []
-                        if(mjsyshdfxsbykzjhxbSNum[0]>mjsyshdfxsbykzjhxbNum[0]){
-                                mjsyshdfxsbykzjhxbSNum[0]=mjsyshdfxsbykzjhxbNum[0] 
+                        if(mjsyshdfxsbykzjhxbNum[0]>mjsyshdfxsbykzjhxbSNum[0]){
+                                mjsyshdfxsbykzjhxbNum[0] =mjsyshdfxsbykzjhxbSNum[0]
                         }
                         // for (let i = 0; i < this.dataScope.length; i++) {
                         let e=0
-                        if (mjsyshdfxsbykzjhxbNum[0]===0) {
+                        if (mjsyshdfxsbykzjhxbSNum[0]===0) {
                                 e =0
                         } else {
-                                e =Math.floor(mjsyshdfxsbykzjhxbSNum[0]/mjsyshdfxsbykzjhxbNum[0] * 10000) / 100
+                                e =Math.floor(mjsyshdfxsbykzjhxbNum[0]/mjsyshdfxsbykzjhxbSNum[0] * 10000) / 100
                         }
                         numData.push(mjsyshdfxsbykzjhxbSNum[0])
                         numData.push(mjsyshdfxsbykzjhxbNum[0])
                         barData.push(e)
                         // }
                         return {
-                                "t_mjsyshdfxsbykzjhxbNum" :{"date": this.endDate,"number": mjsyshdfxsbykzjhxbSNum, "numberAll":mjsyshdfxsbykzjhxbNum, "res":barData},
+                                "t_mjsyshdfxsbykzjhxbNum" :{"date": this.endDate,"number": mjsyshdfxsbykzjhxbNum, "numberAll":mjsyshdfxsbykzjhxbSNum, "res":barData},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },