Quellcode durchsuchen

实验室看板修改

cyy vor 2 Jahren
Ursprung
Commit
2e74b0931a

+ 511 - 255
src/views/statistics/index.vue

@@ -33,12 +33,12 @@
             line-height: 45%;
             text-align:center;
             float: left;
-            margin: -2.5% 0 0 1%;
+            margin: -2.5% 0 0 6.7%;
             font-size: 100%;
             color: #fff !important;
             align-items: center;
             display:flex" >
-            <div>
+            <!-- <div>
               部门:
             </div>
             <el-select v-model="bumen" clearable @change="selectAll()" placeholder="请选择部门">
@@ -48,7 +48,7 @@
                 :label="item.name_"
                 :value="item.id_">
               </el-option>
-            </el-select>
+            </el-select> -->
             <div>
               月份:
             </div>
@@ -122,183 +122,157 @@
           </div>
           
         </div>
-        <!-- <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" ><div class="ttitle">质量方针:公正、科学、准确、高效</div></dv-border-box-7>
-        <div class="congxiebox7" style="display: flex;justify-content: space-between;padding: 1.5% 0.2%;">
-          <div style="width:16.4%">
-            <div class="gongshiAll">
-              <div class="touwidth">检测任务完成及时率=</div>
-              <div style="margin: 0 0.2%;">
-                <div class="gongshiXian">及时完成检测项目数量</div>
-                <div style="text-align:center;font-size:12px;padding-top: 6%;">有效检测任务总数</div>
+        <dv-border-box-1 style="width: 100%; height: 89%;box-sizing: border-box; overflow: hidden">
+          <div style="height:43%;margin-top:1%" v-for="(item,i) in zhiliangmuNeirong" :key="i" v-show="pageOT==Math.ceil(i/2)">
+            <div class="congxiebox7" style="display:inline-block;margin:1% 1%; height:100%;width:98%;" >
+              <div class="ttitle" style="text-align: center;height:3%">{{item.name}}质量目标与质量指标</div>
+              <div class="componentsData" style="height:90%" v-if="relOf">
+                  <!-- 
+                  <s1jianCe :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[1].val"
+                  v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
+                  <s3tousu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[3].val"
+                  v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
+                  <s13shengWu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[4].val"
+                  v-if="showAll || showComponents[17]" :data = "getS3tousu()"/> -->
+                  <div :id="`card${i}`" style="width:100%;height:100%" ></div>
+                  <!-- <div class="nullDate" v-if="zhiliangmuNeirong[i].data.length<=0">暂无数据</div> -->
+                  <div class="clear"></div>
               </div>
-              <div>×100%</div>
+              <dv-decoration-10 style="height:0.5%" v-if="i % 2 != 0 && i != zhiliangmuNeirong.length" />
             </div>
-            <div class="mubiaozhi">当前目标值:{{quality[0].val}}</div>
+            
           </div>
-          <div style="width:21.4%">
-            <div class="gongshiAll">
-              <div class="touwidth">检测报告差错率=</div>
-              <div style="margin: 0 0.2%;">
-                <div class="gongshiXian">统计期内检测数据的差错次数</div>
-                <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内检测报告总数</div>
-              </div>
-              <div>×100%</div>
+          <!-- <div class="congxiebox7" style="display:inline-block;height:43%;width:98%;margin:1% 1%;text-align: center;overflow:hiddien" v-if="pageOT==Math.floor((zhiliangmuNeirong)/2)">
+            <div class="ttitle" style="margin:2% 0;text-align: center;">质量目标与质量指标公式</div>
+            <div class="componentsData" style="height:82%"  v-if="relOf">
+                <dv-scroll-board style="height:100%;white-space:pre-wrap"
+                  v-if="(showAll || showComponents[23])&&tableData1.data.length>0"
+                  :config="tableData1"
+                />
+                <div class="nullDate" v-if="(showAll || showComponents[23])&&tableData1.data.length<=0">暂无数据</div>
+                <div class="clear"></div>
+
             </div>
-            <div class="mubiaozhi">当前目标值:{{quality[1].val}}</div>
-          </div>
-          <div style="width:17.4%">
-            <div class="gongshiAll">
-              <div class="touwidth">客户满意度=</div>
-              <div style="margin: 0 0.2%;">
-                <div class="gongshiXian">评分得分*有效问卷数量</div>
-                <div style="text-align:center;font-size:12px;padding-top: 6%;">有效问卷总分</div>
-              </div>
-              <div>×100%</div>
+          </div> -->
+          <!-- <div class="congxiebox7" style="display:inline-block;width:79%;height:85%" v-if="pageOT==1&&bumen==''">
+            <div class="ttitle" style="text-align: center;">各部门质量目标与质量指标</div>
+            <div class="componentsData" v-if="relOf">
+                <s11biaoZhunWu style="height:100%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
+                v-if=" buhegelvObj.length>0 && (showAll || showComponents[15])" :data = "getyangPinCaiJiObjNum()"/>
+                <div class="nullDate" v-if="buhegelvObj.length<=0&&( showAll || showComponents[15])">暂无数据</div>
+                <div class="clear"></div>
+
             </div>
-            <div class="mubiaozhi">当前目标值:{{quality[2].val}}</div>
           </div>
-          <div style="width:17.4%">
-            <div class="gongshiAll">
-              <div class="touwidth">投诉率=</div>
-              <div style="margin: 0 0.2%;">
-                <div class="gongshiXian">统计期内有效投诉项目数</div>
-                <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内检测委托总数</div>
-              </div>
-              <div>×100%</div>
+          <div class="congxiebox7" style="display:inline-block;width:19%;float:right;height:85%;overflow:hiddien" v-if="pageOT==1&&bumen==''">
+            <div class="ttitle" style="margin:8% 0;text-align: center;">质量目标与质量指标总计</div>
+            <div class="componentsData" v-if="relOf">
+                <dv-scroll-board style="height:100%;"
+                  v-if="(showAll || showComponents[22])&&tableData.data.length>0"
+                  :config="tableData"
+                />
+                <div class="nullDate" style="height:100%;" v-if="(showAll || showComponents[22])&&tableData.data.length<=0">暂无数据</div>
+                <div class="clear"></div>
+
             </div>
-            <div class="mubiaozhi">当前目标值:{{quality[3].val}}</div>relOf
-          </div>
-          <div style="width:27.4%">
-            <div class="gongshiAll">
-              <div class="touwidth">投诉回复及时率=</div>
-              <div style="margin: 0 0.2%;">
-                <div class="gongshiXian">统计期内投诉处理完成次数</div>
-                <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内有效投诉总次数</div>
-              </div>
-              <div>×100%</div>
+          </div> -->
+          
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:43%;" v-if="pageOT==Math.ceil(pageAll/2)">
+            <div class="ttitle" style="text-align: center;">人员培训与管理</div>
+            <div class="componentsData" style="height:87%" v-if="relOf">
+              <s4renYuanPeiXun style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[1]" :data = "getS4renYuanPeiXun()"/>
+              <s4renYuanPeiXunCol style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[2]" :data = "getS4renYuanPeiXunFB()"/>
+              <s5renYuanJianDu style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[3]" :data = "getS5renYuanJianDu()"/>
+              <s5renYuanJianDuCol style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[4]" :data = "getS5renYuanJianDuFB()"/>
+                <!-- <s16bzJunZhu :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
+                <s17bzXiBao :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/> -->
+                <div class="clear"></div>
             </div>
-            <div class="mubiaozhi">当前目标值:{{quality[4].val}}</div>
-          </div>
-        </div> -->
-        <div class="congxiebox7" style="display:inline-block;height:42%;width:100%;" v-if="pageOT==1&&bumen!=''">
-          <div class="ttitle" style="text-align: center;">部门质量目标与质量指标</div>
-          <div class="componentsData" style="height:82%" v-if="relOf">
-              <!-- 
-              <s1jianCe :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[1].val"
-              v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
-              <s3tousu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[3].val"
-              v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
-              <s13shengWu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[4].val"
-              v-if="showAll || showComponents[17]" :data = "getS3tousu()"/> -->
-              <s11biaoZhunWucol style="height:100%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
-              v-if="fenzuzlmb.length>0&&(showAll || showComponents[15])" :data = "getfenzuZLZBObjNum()"/>
-              <div class="nullDate" v-if="fenzuzlmb.length<=0&&( showAll || showComponents[15])">暂无数据</div>
-              <div class="clear"></div>
-          </div>
-        </div>
-        <div class="congxiebox7" style="display:inline-block;height:42%;width:100%;text-align: center;overflow:hiddien" v-if="pageOT==1&&bumen!=''">
-          <div class="ttitle" style="margin:2% 0;text-align: center;">质量目标与质量指标公式</div>
-          <div class="componentsData" style="height:82%"  v-if="relOf">
-              <dv-scroll-board style="height:100%;white-space:pre-wrap"
-                v-if="(showAll || showComponents[23])&&tableData1.data.length>0"
-                :config="tableData1"
-              />
-              <div class="nullDate" v-if="(showAll || showComponents[23])&&tableData1.data.length<=0">暂无数据</div>
-              <div class="clear"></div>
-
           </div>
-        </div>
-        <div class="congxiebox7" style="display:inline-block;width:79%;height:85%" v-if="pageOT==1&&bumen==''">
-          <div class="ttitle" style="text-align: center;">各部门质量目标与质量指标</div>
-          <div class="componentsData" v-if="relOf">
-              <s11biaoZhunWu style="height:100%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
-              v-if=" buhegelvObj.length>0 && (showAll || showComponents[15])" :data = "getyangPinCaiJiObjNum()"/>
-              <div class="nullDate" v-if="buhegelvObj.length<=0&&( showAll || showComponents[15])">暂无数据</div>
-              <div class="clear"></div>
-
+          <dv-decoration-10 style="height:0.5%;width:98%;margin-top:1%;margin-right:1%;margin-left:1%;"  v-if="pageOT==Math.ceil(pageAll/2)"/>
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:1%;margin-right:1%;margin-left:1%;height:43%;" v-if="pageOT==Math.ceil(pageAll/2)">
+            <div class="ttitle" style="text-align: center;">设备维保</div>
+            <div class="componentsData" style="height:87%" v-if="relOf">
+              <s7sheBeiJiaoZhun style="height:100%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[5]" :data = "getJiaoYanObjNum()"/>
+                <s7sheBeiJiaoZhunCol style="height:100%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[6]" :data = "getJiaoYanObjNumFB()"/>
+                <s8sheBeiHeCha style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[7]" :data = "gethechaObjNum()"/>
+                <s8sheBeiHeChaCol style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[8]" :data = "gethechaObjNumFB()"/>
+                <div class="clear"></div>
+            </div>
           </div>
-        </div>
-        <div class="congxiebox7" style="display:inline-block;width:19%;float:right;height:85%;overflow:hiddien" v-if="pageOT==1&&bumen==''">
-          <div class="ttitle" style="margin:8% 0;text-align: center;">质量目标与质量指标总计</div>
-          <div class="componentsData" v-if="relOf">
-              <dv-scroll-board style="height:100%;"
-                v-if="(showAll || showComponents[22])&&tableData.data.length>0"
-                :config="tableData"
-              />
-              <div class="nullDate" style="height:100%;" v-if="(showAll || showComponents[22])&&tableData.data.length<=0">暂无数据</div>
-              <div class="clear"></div>
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==Math.ceil(pageAll/2)+1">
 
-          </div>
-        </div>
-        
-        <div class="congxiebox7" style="display:inline-block;width:49%;height:25%;" v-if="pageOT==2">
-          <div class="ttitle" style="text-align: center;">人员培训与管理</div>
-          <div class="componentsData" style="height:87%" v-if="relOf">
-            <s4renYuanPeiXun style="height:100%"  :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
-            <s5renYuanJianDu style="height:100%"  :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
-              <!-- <s16bzJunZhu :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
-              <s17bzXiBao :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/>
-              <div class="clear"></div> -->
-          </div>
-        </div>
-        <div class="congxiebox7" style="display:inline-block;width:49%;float:right;height:25%;" v-if="pageOT==2">
-          <div class="ttitle" style="text-align: center;">设备维保</div>
-          <div class="componentsData" style="height:87%" v-if="relOf">
-            <s7sheBeiJiaoZhun style="height:100%" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[12]" :data = "getJiaoYanObjNum()"/>
-              <s8sheBeiHeCha style="height:100%"  :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[11]" :data = "gethechaObjNum()"/>
-              <!-- <div class="clear"></div> -->
-          </div>
-        </div>
-         <div class="congxiebox7" style="display:inline-block;width:100%;height:60%;" v-if="pageOT==2">
+            <div class="ttitle" style="text-align: center;">质量管理</div>
+            <div class="componentsData" style="height:87%" v-if="relOf">
+                <s9neiBuZhiLiang style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[9]" :data = "getS9neiBuZhiLiang()"/>
+                <s9neiBuZhiLiangCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[10]" :data = "getS9neiBuZhiLiangFB()"/>
+                <s10waiBuNengLi style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[11]" :data = "getnengtliObjNum()"/>
+                <s10waiBuNengLiCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[12]" :data = "getnengtliObjNumFB()"/>
+                
+                <s15tousu style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[13]" :data = "getS3tousu()"/>
+                <s15tousuCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[14]" :data = "getS3tousuFB()"/>
+                <s12fengXian style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[15]" :data = "getS12fengXian()"/>
+                <s12fengXianCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="showAll || showComponents[16]" :data = "getS12fengXianFB()"/>
+                
+                <div class="clear"></div>
+            </div>
+          </div> 
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==Math.ceil(pageAll/2)+2">
 
-          <div class="ttitle" style="text-align: center;">质量管理</div>
-          <div class="componentsData" style="height:87%" v-if="relOf">
-              <s9neiBuZhiLiang style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
-              <s10waiBuNengLi style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
-              
-              <s15tousu style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[19]" :data = "getS3tousu()"/>
-              <s12fengXian style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-              v-if="showAll || showComponents[16]" :data = "getS12fengXian()"/>
-              
-              <s2manYiDu style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw" 
-              v-if="showAll || showComponents[7]"  :data = "getS2manYiDu()"/>
-              <s14bufuhexiang style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-              v-if="bufuheObj.length>0&&(showAll || showComponents[18])" :data = "getS14bufuhexiang()"/>
-              <div class="nullDate1" v-if="bufuheObj.length<=0&&(showAll || showComponents[18])">暂无数据</div>
+            <div class="ttitle" style="text-align: center;">质量管理</div>
+            <div class="componentsData" style="height:87%" v-if="relOf">
+                <s2manYiDu style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
+                v-if="showAll || showComponents[17]"  :data = "getS2manYiDu()"/>
+                <s2manYiDuCol style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
+                v-if="showAll || showComponents[18]"  :data = "getS2manYiDuFB()"/>
+                <s14bufuhexiang style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+                v-if="bufuheObj.length>0&&(showAll || showComponents[19])" :data = "getS14bufuhexiang()"/>
+                <div class="nullDate1" v-if="bufuheObj.length<=0&&(showAll || showComponents[19])">暂无数据</div>
+                
+                <s1zhiLiangMuBiao style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
+                v-if="showAll || showComponents[21]" :data = "getS1renwu()"/>
+                <s1zhiLiangMuBiaoCol style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
+                v-if="showAll || showComponents[22]" :data = "getS1renwuFB()"/>
+                <s16bzJunZhu style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+                v-if="gaijinxiangObj.length>0&&(showAll || showComponents[23])" :data = "getbzJunZhujNum()"/>
+                <div class="nullDate1" v-if="gaijinxiangObj.length<=0&&(showAll || showComponents[23])">暂无数据</div>
+                <div class="clear"></div>
+            </div>
+          </div> 
+          <!-- <div class="congxiebox7" style="display:inline-block;width:49%;" v-if="pageOT==2">
+            <div class="ttitle" style="text-align: center;">内审计划</div>
+            <div class="componentsData" v-if="relOf">
               
-              <s1zhiLiangMuBiao style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw" 
-              v-if="showAll || showComponents[1]" :data = "getS1renwu()"/>
-              <s16bzJunZhu style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-              v-if="gaijinxiangObj.length>0&&(showAll || showComponents[20])" :data = "getbzJunZhujNum()"/>
-              <div class="nullDate1" v-if="gaijinxiangObj.length<=0&&(showAll || showComponents[20])">暂无数据</div>
-              <div class="clear"></div>
-          </div>
-        </div> 
-        <!-- <div class="congxiebox7" style="display:inline-block;width:49%;" v-if="pageOT==2">
-          <div class="ttitle" style="text-align: center;">内审计划</div>
-          <div class="componentsData" v-if="relOf">
-             
+            </div>
           </div>
-        </div>
-        <div class="congxiebox7" style="display:inline-block;width:49%;float:right;" v-if="pageOT==2">
-          <div class="ttitle" style="text-align: center;">管审计划</div>
-          <div class="componentsData" v-if="relOf">
-            
+          <div class="congxiebox7" style="display:inline-block;width:49%;float:right;" v-if="pageOT==2">
+            <div class="ttitle" style="text-align: center;">管审计划</div>
+            <div class="componentsData" v-if="relOf">
+              
+            </div>
           </div>
-        </div>
-        -->
-
+          -->
 
 
+      </dv-border-box-1>
       </div>
     </div>
   </dv-full-screen-container>
@@ -311,34 +285,44 @@
   import headerDecoration from './headerDecoration'
 
   import s1zhiLiangMuBiao from './item/s1zhiLiangMuBiao.vue'
+  import s1zhiLiangMuBiaoCol from './item/s1zhiLiangMuBiaoCol.vue'
   import s1zhiLiang1 from './item/s1zhiLiang1.vue'
   import s1zhiLiang2 from './item/s1zhiLiang2.vue'
   import s1zhiLiang3 from './item/s1zhiLiang3.vue'
   
   import s1jianCe from './item/s1jianCe.vue'
   import s2manYiDu from './item/s2manYiDu.vue'
+  import s2manYiDuCol from './item/s2manYiDuPro.vue'
   import s3tousu from './item/s3tousu.vue'
   import s4renYuanPeiXun from './item/s4renYuanPeiXun.vue'
+  import s4renYuanPeiXunCol from './item/s4renYuanPeiXunCol.vue'
   import s5renYuanJianDu from './item/s5renYuanJianDu.vue'
+  import s5renYuanJianDuCol from './item/s5renYuanJianDuCol.vue'
   import s6sheBeiWeiHu from './item/s6sheBeiWeiHu.vue'
   import s7sheBeiJiaoZhun from './item/s7sheBeiJiaoZhun.vue'
+  import s7sheBeiJiaoZhunCol from './item/s7sheBeiJiaoZhunCol.vue'
   import s8sheBeiHeCha from './item/s8sheBeiHeCha.vue'
+  import s8sheBeiHeChaCol from './item/s8sheBeiHeChaCol.vue'
   import s9neiBuZhiLiang from './item/s9neiBuZhiLiang.vue'
+  import s9neiBuZhiLiangCol from './item/s9neiBuZhiLiangCol.vue'
   import s10waiBuNengLi from './item/s10waiBuNengLi.vue'
+  import s10waiBuNengLiCol from './item/s10waiBuNengLiCol.vue'
   import s11biaoZhunWu from './item/s11biaoZhunWuCol2.vue'
   import s11biaoZhunWucol from './item/s11biaoZhunWuCol.vue'
   
   import s12fengXian from './item/s12fengXian.vue'
+  import s12fengXianCol from './item/s12fengXianCol.vue'
   import s13shengWu from './item/s13shengWu.vue'
   import s14bufuhexiang from './item/s14bufuhexiangCol.vue'
   import s15tousu from './item/s15tousu.vue'
+  import s15tousuCol from './item/s15tousuCol.vue'
   import s16bzJunZhu from './item/s16bzJunZhuCol2.vue'
   import s17bzXiBao from './item/s17bzXiBao.vue'
 
 
   import none from './item/none.vue'
-
-  import { DBData ,getConfig,getJiaoYanObj, gethechaObj, getnengliObj,getkangningyangpinObj,getgaijinxiangObj,getbufuheObj,getguanshenObj,getneishenObj,getfengxianObj,getyingjiObj,getneibuObj,getwaibuObj,gethechaMGObj,getJiaoYanMGObj,getgangqianpeixunObj,getzaigangrenyuanObj,getfenzuZLZBObj,getzongZLMBObj,getzhiliangzhibiaotitleObj, getyangPinCaiJiObj,getbiaozhunTObj,getbzJunZhuObj,getbzJunZhuTObj,getbzXiBaoObj,getbzXiBaoTObj} from './js/selectDB.js'
+  import echarts from 'echarts'
+  import { DBData ,getConfig,getJiaoYanObj, gethechaObj,getgangqianpeixunFBObj,getguanshenObjFB, getneishenObjFB,getfengxianObjFB,getyingjiObjFB,getwaibuObjFB,getneibuObjFB,getJiaoYanObjFB,gethechaObjFB,getnengliObj,getkangningyangpinObj,getzaigangrenyuanFBObj,getgaijinxiangObj,getbufuheObj,getguanshenObj,getneishenObj,getfengxianObj,getyingjiObj,getneibuObj,getwaibuObj,gethechaMGObj,getJiaoYanMGObj,getgangqianpeixunObj,getzaigangrenyuanObj,getfenzuZLZBObj,getzongZLMBObj,getzhiliangzhibiaotitleObj, getyangPinCaiJiObj,getbiaozhunTObj,getbzJunZhuObj,getbzJunZhuTObj,getbzXiBaoObj,getbzXiBaoTObj} from './js/selectDB.js'
   import sendDatas from './sendDatas.js'
   import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
   import * as forEach from 'lodash/forEach'
@@ -350,21 +334,31 @@
       s1zhiLiang2,
       s1zhiLiang3,
       s1zhiLiangMuBiao,
+      s1zhiLiangMuBiaoCol,
       s1jianCe,
       s2manYiDu,
+      s2manYiDuCol,
       s3tousu,
       s4renYuanPeiXun,
+      s4renYuanPeiXunCol,
       s5renYuanJianDu,
+      s5renYuanJianDuCol,
       s6sheBeiWeiHu,
       s7sheBeiJiaoZhun,
+      s7sheBeiJiaoZhunCol,
       s8sheBeiHeCha,
+      s8sheBeiHeChaCol,
       s9neiBuZhiLiang,
+      s9neiBuZhiLiangCol,
       s10waiBuNengLi,
+      s10waiBuNengLiCol,
       s11biaoZhunWu,
       s12fengXian,
+      s12fengXianCol,
       s13shengWu,
       s14bufuhexiang,
       s15tousu,
+      s15tousuCol,
       s16bzJunZhu,
       s17bzXiBao,
       s11biaoZhunWucol
@@ -407,16 +401,36 @@
        //获取统计的配置
       
       // if(this.buhegelvObj.length>0){
-        this.timer1 = setInterval(()=>{
-          if(this.pageOT>=2){
-            this.pageOT=1
-          }else{
-            this.pageOT = this.pageOT + 1
-          }
-          // console.log(this.pageOT)
-        },8000)
+        // console.log(this.pageAll,'76777index')
+        // this.timer1 = setInterval(()=>{
+        //   if(this.pageOT>=this.pageAll){
+        //     this.pageOT=1
+        //   }else{
+        //     this.pageOT = this.pageOT + 1
+        //   }
+        //   // console.log(this.pageOT)
+        // },8000)
       // }
+      // console.log('jjjjjjjjjjjjjjjjjjjjjjjjjjjjjj')
+      // this.drawLine()
       
+      
+    },
+    updated() {
+        //this.drawLine();
+        this.allEcharts.forEach((i) => {
+          i.resize();
+        });
+
+    },
+    watch: {
+        zhiliangmuNeirong: {
+            handler () {
+                // this.drawLine()
+                this.pageAll = this.zhiliangmuNeirong.length + 1
+            },
+            deep: true
+        }
     },
     data() {
       return {
@@ -428,11 +442,17 @@
         hechaObj:[],
         hechaMGObj:[],
         waibuObj:[],
+        waibuObjfb:[],
         neibuObj:[],
+        neibuObjfb:[],
         yingjiObj:[],
+        yingjifbObj:[],
         fengxianObj:[],
+        fengxianfbObj:[],
         neishenObj:[],
+        neishenfbObj:[],
         guanshenObj:[],
+        guanshenfbObj:[],
         bufuheObj:[],
         gaijinxiangObj:[],
         nengliObj:[],
@@ -445,7 +465,9 @@
         bzXiBaoTObj:[],
         fenzuzlmb:[],
         zaigangrenyuan:[],
+        zaigangrenyuanfb:[],
         gangqianpeixun:[],
+        gangqianpeixunfb:[],
         relData: {},
         relOf: false,
         selectEnd: '',
@@ -460,8 +482,14 @@
         rollup:true,
         idsStr:'',
         quality:[],
+        quality1:[],
+        allEcharts:[],
         bumen:'',
+        zhiliangmuTitle:[],
+        zhiliangmuNeirong:[],
+        zhiliangxianzhi:[],
         tableNum:[],
+        pageAll:0,
         tableData:{
           header: ['<span style="font-size:16px;height:53px">质量指标</span>', '<span style="font-size:16px;height:53px">百分比/数量</span>'],
           rowNum: 10,
@@ -482,7 +510,7 @@
         }
       }
     },
-     beforeDestroy() {
+    beforeDestroy() {
       if(screenfull.isFullscreen){
         screenfull.toggle()
       }
@@ -498,11 +526,16 @@
       },
       getqualityData() {
         let pos = this.$store.getters.level.second?this.$store.getters.level.second:this.$store.getters.level.first
-        let sql="select id_,name_ from ibps_party_entity where name_ like '%组' and PATH_ like '%"+pos+"%'"
-        repostCurd('sql', sql).then(response => {
+        let sql="select id_,name_ from ibps_party_entity where name_ like '%组' and name_ NOT LIKE '%综合%' and name_ NOT LIKE '%质量%' and name_ NOT LIKE '%科研%'  and name_ NOT LIKE '%教学%' and PATH_ like '%"+pos+"%'"
+        let sql1="select id_,name_ from ibps_party_entity where name_ like '%组' and PATH_ like '%"+pos+"%'"
+        
+        Promise.all([repostCurd('sql', sql),repostCurd('sql', sql1)]).then(([response,response1]) => {
           // console.log(sql)
           let a = response.variables.data //结果一定存在第0个,因为只有一条数据
+          let a1 = response1.variables.data //结果一定存在第0个,因为只有一条数据
           this.quality = a
+          this.quality1 = a1
+          console.log(a,'335345345234543534')
           // for (let i = 0; i < this.quality.length; i++) {
           //   let a = {}
           //   a.value = this.quality[i].id_
@@ -512,23 +545,48 @@
           this.idsStr = this.quality.map(function(obj,index){
               return obj.id_;
           }).join(",");
-          if(this.bumen != ''){
-            this.getConfigData(this.endDate,this.bumen)
-          }else{
-            this.getConfigData(this.endDate,this.idsStr)
-          }
+          this.bumen = this.quality1.map(function(obj,index){
+              return obj.id_;
+          }).join(",");
+          console.log(this.quality,this.quality1,this.idsStr,this.bumen,'2434465565665656rterterte')
+          // if(this.bumen != ''){
+          //   this.getConfigData(this.endDate,this.bumen)
+          // }else{
+            this.getConfigData(this.endDate,this.bumen,this.idsStr)
+          // }
         })
       },
+      getNextMonth(date) {
+            let arr = date.split('-');
+            let year = arr[0]; //获取当前日期的年份
+            let month = arr[1]; //获取当前日期的月份
+            let year2 = year;
+            let month2 = parseInt(month) + 1;
+            if (month2 == 13) {
+                year2 = parseInt(year2) + 1;
+                month2 = 1;
+            }
+            month2=month2>9?month2:'0'+month2
+            let t2 = year2 + '-' +  month2;
+            return t2;
+      },
       /* 查询统计配置中的完成率*/
-      getConfigData(end,info) {
+      getConfigData(end,info,info1) {
         let that = this
-        Promise.all([repostCurd('sql', getConfig()),repostCurd('sql', getyangPinCaiJiObj(end,info)),repostCurd('sql', getzhiliangzhibiaotitleObj(end,info)),
-                     repostCurd('sql', getzongZLMBObj(end,info)),repostCurd('sql', getfenzuZLZBObj(end,info)),repostCurd('sql', getzaigangrenyuanObj(end,info)),
-                     repostCurd('sql', getgangqianpeixunObj(end,info)),repostCurd('sql', getJiaoYanObj(end,info)),repostCurd('sql', getJiaoYanMGObj(end,info)),
-                     repostCurd('sql', gethechaObj(end,info)),repostCurd('sql', gethechaMGObj(end,info)),repostCurd('sql', getwaibuObj(end,info)),
+        end[2]=end[1]
+        end[1]=this.getNextMonth(end[1])
+        Promise.all([repostCurd('sql', getConfig()),repostCurd('sql', getyangPinCaiJiObj(end,info1)),repostCurd('sql', getzhiliangzhibiaotitleObj(end,info1)),
+                     repostCurd('sql', getzongZLMBObj(end,info1)),repostCurd('sql', getfenzuZLZBObj(end,info1)),repostCurd('sql', getzaigangrenyuanObj(end,info)),
+                     repostCurd('sql', getgangqianpeixunObj(end,info)),repostCurd('sql', getJiaoYanObj(end,info)),repostCurd('sql', getJiaoYanObjFB(end,info)),
+                     repostCurd('sql', gethechaObj(end,info)),repostCurd('sql', gethechaObjFB(end,info)),repostCurd('sql', getwaibuObj(end,info)),
                      repostCurd('sql', getneibuObj(end,info)),repostCurd('sql', getyingjiObj(end,info)),repostCurd('sql', getfengxianObj(end,info)),
                      repostCurd('sql', getneishenObj(end,info)),repostCurd('sql', getguanshenObj(end,info)),repostCurd('sql', getbufuheObj(end,info)),
-                     repostCurd('sql', getgaijinxiangObj(end,info))]).then(([response,response1, response2,response3,response4,response5,response6,response7,response8,response9,response10,response11,response12,response13,response14,response15,response16,response17,response18]) => {
+                     repostCurd('sql', getgaijinxiangObj(end,info)),
+                     repostCurd('sql', getzaigangrenyuanFBObj(end,info)),repostCurd('sql', getgangqianpeixunFBObj(end,info)),
+                     repostCurd('sql', getneibuObjFB(end,info)),repostCurd('sql', getwaibuObjFB(end,info)),
+                     repostCurd('sql', getyingjiObjFB(end,info)),repostCurd('sql', getfengxianObjFB(end,info)),
+                     repostCurd('sql', getneishenObjFB(end,info)),repostCurd('sql', getguanshenObjFB(end,info))]).then(([response,response1, response2,response3,response4,response5,response6,response7,response8,response9,response10,response11,response12,response13,response14,response15,response16,response17,response18,
+                                                                                                             fb,fb1,fb2,fb3,fb4,fb5,fb6,fb7]) => {
 
                       that.config = response.variables.data
                       that.buhegelvObj = response1.variables.data 
@@ -543,7 +601,9 @@
                         that.tableData.data.push(changeArr)
                         that.tableData1.data.push(changeArr1)
                       }
-                      that.fenzuzlmb = response4.variables.data
+                      let qqaa = response4.variables.data
+                      that.fenzuzlmb= this.sortArr(qqaa,'bzbm')
+                      console.log(that.fenzuzlmb,'qqaaqqaaqqaa')
                       that.zaigangrenyuan = response5.variables.data 
                       that.gangqianpeixun = response6.variables.data 
                       that.jiaoyanObj = response7.variables.data
@@ -558,73 +618,17 @@
                       that.guanshenObj = response16.variables.data
                       that.bufuheObj = response17.variables.data
                       that.gaijinxiangObj = response18.variables.data
+                      that.getzzzbNum()
+                      that.zaigangrenyuanfb = fb.variables.data
+                      that.gangqianpeixunfb = fb1.variables.data
+                      that.neibuObjfb = fb2.variables.data
+                      that.waibuObjfb = fb3.variables.data
+                      that.yingjifbObj = fb4.variables.data
+                      that.fengxianfbObj = fb5.variables.data
+                      that.neishenfbObj = fb6.variables.data
+                      that.guanshenfbObj = fb7.variables.data
                       that.relOf = true
         })
-        // repostCurd('sql', getConfig()).then(response => {
-        //   that.config = response.variables.data //结果一定存在第0个,因为只有一条数据
-        //   repostCurd('sql', getyangPinCaiJiObj(end,info)).then(response1 => {
-        //     that.buhegelvObj = response1.variables.data 
-        //     console.log(that.buhegelvObj>0,'222222222222222222222222222222222222222222222222222222222')
-        //     repostCurd('sql', getzhiliangzhibiaotitleObj(end,info)).then(response2 => {
-        //       that.zhiliangzhibiaotitle = response2.variables.data
-        //       repostCurd('sql', getzongZLMBObj(end,info)).then(response3 => {
-        //         that.tableNum = response3.variables.data 
-        //         repostCurd('sql', getfenzuZLZBObj(end,info)).then(response4 => {
-        //           that.fenzuzlmb = response4.variables.data 
-        //           repostCurd('sql', getzaigangrenyuanObj(end,info)).then(response5 => {
-        //             that.zaigangrenyuan = response5.variables.data 
-        //             repostCurd('sql', getgangqianpeixunObj(end,info)).then(response6 => {
-        //               that.gangqianpeixun = response6.variables.data 
-        //               repostCurd('sql', getJiaoYanObj(end,info)).then(response7 => {
-        //                 that.jiaoyanObj = response7.variables.data
-        //                 repostCurd('sql', getJiaoYanMGObj(end,info)).then(response8 => {
-        //                   that.jiaoyanMGObj = response8.variables.data
-        //                   repostCurd('sql', gethechaObj(end,info)).then(response9 => {
-        //                     that.hechaObj = response9.variables.data
-        //                     repostCurd('sql', gethechaMGObj(end,info)).then(response10 => {
-        //                       that.hechaMGObj = response10.variables.data
-        //                       repostCurd('sql', getwaibuObj(end,info)).then(response11 => {
-        //                         that.waibuObj = response11.variables.data
-        //                         repostCurd('sql', getneibuObj(end,info)).then(response12 => {
-        //                           that.neibuObj = response12.variables.data
-        //                           repostCurd('sql', getyingjiObj(end,info)).then(response13 => {
-        //                             that.yingjiObj = response13.variables.data
-        //                             repostCurd('sql', getfengxianObj(end,info)).then(response14 => {
-        //                               that.fengxianObj = response14.variables.data
-        //                               repostCurd('sql', getneishenObj(end,info)).then(response15 => {
-        //                                 that.neishenObj = response15.variables.data
-        //                                 repostCurd('sql', getguanshenObj(end,info)).then(response16 => {
-        //                                   that.guanshenObj = response16.variables.data
-        //                                   repostCurd('sql', getbufuheObj(end,info)).then(response17 => {
-        //                                     that.bufuheObj = response17.variables.data
-        //                                     repostCurd('sql', getgaijinxiangObj(end,info)).then(response18 => {
-        //                                       that.gaijinxiangObj = response18.variables.data
-                                              
-        //                                       that.relOf = true
-        //                                     })
-        //                                   })
-        //                                 })
-        //                               })
-        //                             })
-        //                           })
-        //                         })
-        //                       })
-        //                     })
-        //                   })
-        //                 })
-        //               })
-        //             })
-        //           })
-        //         })
-        //       })
-        //     })
-        //   })
-        // })
-        
-        
-        
-        
-        // that.relOf = true
       },
       
       async costPlannedAmountChange(record,value) {
@@ -661,6 +665,258 @@
         // return [nowDate.getFullYear() - year + "-" + month1,date.getFullYear() + "-" + month];
         return [nowDate.getFullYear() - year + "-01",nowDate.getFullYear() - year + "-" + month1];
       },
+      sortArr(arr, str) {
+        let _arr = [],
+          _t = [],
+          // 临时的变量
+          _tmp;
+        
+        // 按照特定的参数将数组排序将具有相同值得排在一起
+        arr = arr.sort(function(a, b) {
+          let s = a[str],
+          t = b[str];
+        
+          return s < t ? -1 : 1;
+        });
+                        
+        if ( arr.length ){
+          _tmp = arr[0][str];
+        }
+        // 将相同类别的对象添加到统一个数组
+        for (let i in arr) {
+                                
+          if ( arr[i][str] === _tmp){
+            _t.push( arr[i] );
+          } else {
+            _arr.push( {'id_':_tmp,'data':_t} );
+            _tmp = arr[i][str];
+            _t = [arr[i]];
+          }
+        // console.log( _tmp,_t,arr[i]);
+        }
+        // 将最后的内容推出新数组
+        _arr.push( {'id_':_tmp,'data':_t});
+        return _arr;
+      },
+      getzzzbNum(){
+        //生成月份
+        let that = this
+        let d1 = this.endDate[0];
+        let d2 = this.endDate[2];
+        let dateArry = new Array();
+        let s1 = d1.split("-");
+        let s2 = d2.split("-");
+        let mCount = 0;
+        if (parseInt(s1[0]) < parseInt(s2[0])) {
+            mCount = (parseInt(s2[0]) - parseInt(s1[0])) * 12 + parseInt(s2[1]) - parseInt(s1[1])+1;
+        } else {
+            mCount = parseInt(s2[1]) - parseInt(s1[1])+1;
+        }
+        if (mCount > 0) {
+            let startM = parseInt(s1[1]);
+            let startY = parseInt(s1[0]);
+            for (let i = 0; i < mCount; i++) {
+              if (startM < 12) {
+                dateArry[i] = startY + "-" + (startM>9 ? startM : "0" + startM);
+                startM += 1;
+              } else {
+                dateArry[i] = startY + "-" + (startM > 9 ? startM : "0" + startM);
+                startM = 1;
+                startY += 1;
+              }
+            }
+        }
+        //处理数据
+        let zjarr = []
+        let fenshuzu = []
+        let zongfz = []
+        fenshuzu = that.quality
+        for (let m = 0; m < that.quality.length; m++) {
+                for (let n = 0; n < that.fenzuzlmb.length; n++) {
+                        //console.log(that.quality.id_ == that.fenzuzlmb.id_,that.quality,that.fenzuzlmb)
+                        if (that.quality[m].id_ == that.fenzuzlmb[n].id_) {
+                                fenshuzu[m].data=that.fenzuzlmb[n].data?that.fenzuzlmb[n].data:''
+                                continue
+                        }
+                }
+                
+        }
+        
+        // console.log(fenshuzu,,fenshuzu[1].hasOwnProperty('data'),'55353453535345')
+        let title = ['name_']
+        for (let zn = 0; zn < fenshuzu.length; zn++) {
+                let zmIndex = 0 
+                let zlzbfz = []
+                //zlzbfz = zjarr
+                for (let j = 0; j < dateArry.length; j++) {
+                  let rq = {}
+                  rq.name_ = dateArry[j]
+                  zlzbfz.push(rq)
+                  // console.log(zlzbfz,dateArry[j],'erw232222222222222222222222222224586')
+                }
+                for (let i = 0; i < zlzbfz.length; i++) {
+                        if(fenshuzu[zn].data&&fenshuzu[zn].data.length>0){
+                                for (let j = 0; j < fenshuzu[zn].data.length; j++) {
+                                        if(zlzbfz[i].name_ == fenshuzu[zn].data[j].bzsj){
+                                                let prop = fenshuzu[zn].data[j].zhi_liang_zhi_bia;
+                                                zlzbfz[i][prop] = fenshuzu[zn].data[j].location
+                                                // console.log(zlzbfz,'zlzbfzzlzbfz')
+                                                zmIndex=1
+                                        }
+                                        continue
+                                }
+                                
+                        }
+                        continue
+                }
+                console.log(zlzbfz,'ghshhhsuihihuisoio878788787878778')
+                if(zmIndex == 1){
+                  zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':zlzbfz})
+                }else{
+                  //zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':[]})
+
+                }
+                                
+        }
+        for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
+                title.push(this.zhiliangzhibiaotitle[t].zhi_liang_zhi_bia)
+                                
+        }
+        let zbval = []
+        for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
+                zbval.push(parseFloat(this.zhiliangzhibiaotitle[t].zhi_biao_xian_zhi.match(/(\d+(\.\d+)?)/)))
+                                
+        }
+        this.zhiliangmuTitle = title
+        this.zhiliangmuNeirong = zongfz
+        this.zhiliangxianzhi = zbval
+        this.pageAll = this.zhiliangmuNeirong.length 
+        this.drawLine()
+        clearInterval(this.timer1);
+        if(this.rollup == true){
+          this.timer1 = setInterval(()=>{
+            if(this.pageOT>=Math.ceil(this.pageAll/2)+2){
+              this.pageOT=1
+            }else{
+              this.pageOT = this.pageOT + 1
+            }
+          },8000)
+        }
+        
+        
+      },
+      drawLine(){
+        setTimeout(() => {
+          this.zhiliangmuNeirong.forEach((item, index) => {
+            let xunhuanzzzb = echarts.init(document.getElementById(`card${index}`))
+            let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+            let barNum = []
+            for (let i = 0; i < this.zhiliangxianzhi.length-1; i++) {
+              barNum.push({
+                type: 'bar',
+                itemStyle: {color: barColor[i]},
+                label:{
+                  normal:{
+                    show:true,
+                    position:'top',
+                            
+                    textStyle:{
+                      fontSize:16,
+                      color:'#B0CEFC'
+                    }
+                  }
+                },
+                markLine: {
+                  symbol: ['none', 'none'], // 去掉箭头
+                  // label: {
+                  //   show: false,
+                  //   position: 'start',
+                  //   formatter: '{b}'
+                  // },
+                  data: [
+                    {
+                      name: '阈值',
+                      yAxis: this.zhiliangxianzhi[i]*1
+                    }
+                  ],
+                  lineStyle: {
+                    color: barColor[i]
+                  }
+                } 
+    
+              })
+              
+            } 
+            let option = {
+              //v3
+              title: {
+                textStyle:{ fontSize:14,color: this.colorw }
+              },
+              legend: {
+                textStyle: {
+                    color: '#B0CEFC'  // 图例文字颜色
+                }
+
+              },
+              grid: {
+                    top: '10%',
+                    left: '3%',
+                    right: '4%',
+                    bottom: '5%',
+                    containLabel: true
+              },
+              xAxis: { 
+                splitLine:{show: false},
+                type: 'category',
+                axisLabel: {
+                  show: true,
+                  textStyle: {
+                    color: '#fff'   //这里用参数代替了
+                  }
+                },
+                axisLine:{
+                  lineStyle:{
+                    color:'#fff',
+                    width:1, //x轴线的宽度
+                  }
+                }
+              },
+              yAxis: {
+                splitLine:{show: false},
+                axisLabel: {
+                  show: true,
+                  textStyle: {
+                    color: '#fff'    //这里用参数代替了
+                  }
+                },
+                axisLine:{
+                  lineStyle:{
+                    color:'#fff',
+                    width:1, //x轴线的宽度
+                  }
+                }
+              },
+              dataset: {
+                dimensions: this.zhiliangmuTitle,
+                source: this.zhiliangmuNeirong[index].data
+              },
+              series: barNum,
+              dataZoom: [
+                {
+                    id: 'dataZoomY',
+                    type: 'inside',
+                    yAxisIndex: [0],
+                    filterMode: 'empty'
+                }
+              ],
+          
+            };
+            
+            this.allEcharts.push(xunhuanzzzb)
+            option && xunhuanzzzb.setOption(option);
+          })
+        }, 0)
+      },
       allView(){
         screenfull.request() //默认显示全屏
       },
@@ -670,7 +926,7 @@
       },
       rollcontinue(){
         this.timer1 = setInterval(()=>{
-          if(this.pageOT>=2){
+          if(this.pageOT>=Math.ceil(this.pageAll/2)+2){
             this.pageOT=1
           }else{
             this.pageOT = this.pageOT + 1
@@ -747,7 +1003,7 @@
     font-size: 120%;
     font-weight: 600;
     height: 2%;
-    margin: 2% 0;
+    margin: 1% 0;
   }
   .screen{
     height: 100%;

+ 2 - 1
src/views/statistics/item/s10waiBuNengLi.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">

+ 90 - 147
src/views/statistics/item/s10waiBuNengLiCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -31,11 +32,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/2+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s10waiBuNengLi"
+        default:"s10waiBuNengLifb"
       },
       click:{
         type:String,
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'能力验证计划完成情况',
+        title:'外部质量评价各部门完成情况',
         dialogOff:false,
       }
     },
@@ -66,166 +67,108 @@
        }
       },
       drawLine(){
-        let s10waiBuNengLi = echarts.init(document.getElementById(this.id))
-         
-
+        let s10waiBuNengLicol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
           
-        // let beginInof = GetPercent(Number(this.data.t_sbhcjlbBegin.number),Number(this.data.t_sbhcjhBegin.number))
-        // let endInof = GetPercent(Number(this.data.t_sbhcjlbEnd.number),Number(this.data.t_sbhcjhEnd.number))
-         
-        //  let data1 = [];
-        //  data1.push(this.data.t_sbhcjhBegin.number);
-        //  data1.push(this.data.t_sbhcjhEnd.number);
-        //  let data2 = [];
-        //  data2.push(this.data.t_sbhcjlbBegin.number);
-        //  data2.push(this.data.t_sbhcjlbEnd.number);
-        //  let data3 = [];
-        //  data3.push(this.data.t_sbhcjlbBegin.date);
-        //  data3.push(this.data.t_sbhcjlbEnd.date);
-        //  let max1=GetMax(data1)+1;
-        //  let max2=GetMax(data2)+1;
-        //  let maxVal=max1>max2?max1:max2;
-        //  console.log("max1:",max1,"max2:",max2);
-       let option = {
-           //v3
-          title: {
+        }  
+
+        option = {
+            title: {
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
-
-            // subtext: this.data.Num.date+"年"
           },
-          tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                          type: 'shadow'
-                        },
-                        formatter: function (datas) {
-                          console.log(datas)
-                            var res=datas[0].name+"<BR>"+'能力计划次数:'+datas[0].data+"<BR>"
-                            // res+='百分比:'+(datas[1].value==null||datas[1].value==0?"0.00":(datas[0].value/datas[1].value*100).toFixed(2))+"%"
-                            return res
-                        }
-          },
-          legend: {},
           grid: {
                 top: '10%',
                 left: '3%',
                 right: '4%',
                 bottom: '5%',
                 containLabel: true
-                    },
-          xAxis: {
-            type: 'value',
-            boundaryGap: [0, 0.01]
           },
-          yAxis: {
+          xAxis: { 
+            splitLine:{show: false},
             type: 'category',
-            data: this.data.Num.name,
             axisLabel: {
-                show: true, // 是否显示X轴的内容,不包含两端的文字
-                interval: 0,
-                // rotate: '50', // 旋转50°
-                lineHeight: 18,
-                formatter: function(params) {
-                  //  console.log('formatter', params, params.length)
-                  var newParamsName = ''// 最终拼接成的字符串
-                  var paramsNameNumber = params.length// 实际标签的个数
-                  var provideNumber = 8// 每行能显示的字的个数
-                  // 判断标签的个数是否大于规定的个数, 如果大于,则进行换行处理 如果不大于,即等于或小于,就返回原标签
-                  if (paramsNameNumber > provideNumber) {
-                    newParamsName = params.substring(0, 8) + '..'// 最终拼成的字符串
-                  } else { // 将旧标签的值赋给新标签
-                    newParamsName = params
-                  }
-                  // 将最终的字符串返回
-                  return newParamsName
-                }
-              },
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
+              }
+            },
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
           },
-          series: [
-            {
-              type: 'bar',
-              data: this.data.Num.number,
-              itemStyle: {color: '#669900'},
-              label: {
-                show: true,
-                position: 'right'
-              },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-            // {
-            //   type: 'bar',
-            //   data: this.data.Num.numberAll
-            // },
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
           ],
-                dataZoom: [
-        {
-            id: 'dataZoomY',
-            type: 'inside',
-            yAxisIndex: [0],
-            filterMode: 'empty'
-        }
-      ],
-         //v1
-        //   grid: {
-        //         top: '20%',
-        //         left: '3%',
-        //         right: '4%',
-        //         bottom: '10%',
-        //         containLabel: true
-        //     },
-        //    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
-        //           }
-        //    },
-        // title: {
-        //      text: this.title,
-        //      subtext: this.data.t_sbhcjlbBegin.date+"-"+this.data.t_sbhcjlbEnd.date+"年核查次数"
-        //      //subtext: this.data.t_sbhcjhBegin.date+'完成率为:' + beginInof +'\n'+this.data.t_sbhcjhEnd.date+'完成率为:'+endInof,
-        // },
-        // color: ['#003366', '#006699', '#4cabce', '#e5323e'],
-        //    legend: {
-        //      show:false
-        //  },
-        //  xAxis: [
-        //      {
-        //          type: 'category',
-        //          axisTick: {show: false},
-        //          data: data3
-        //      }
-        //  ],
-        //  yAxis:  [
-        //      {
-        //        max:maxVal,
-        //        min:0,
-        //          type: 'value'
-        //      }
-        //  ] 
-        //  ,
-        //  series: [
-        //     {
-        //          name: '计划条数',
-        //          type: 'bar',
-        //          barGap: 0,
-        //          data: data1
-        //    },
-        //     {
-        //          name: '记录条数',
-        //          type: 'bar',
-        //          barGap: 0,
-        //          data: data2
-        //    },
-        //  ]
-       };
+       
+        };
 
-       option && s10waiBuNengLi.setOption(option);
+       option && s10waiBuNengLicol.setOption(option);
       }
     }
   }

+ 3 - 2
src/views/statistics/item/s12fengXian.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'实验室活动风险识别与控制',
+        title:'实验室活动风险识别与控制完成率',
         dialogOff:false,
         measured:[]
       }

+ 99 - 75
src/views/statistics/item/s12fengXianCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -31,11 +32,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/4+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s12fengXian"
+        default:"s12fengXianfb"
       },
       click:{
         type:String,
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'实验室活动风险识别与控制数量',
+        title:'实验室活动风险识别与控制各部门完成情况',
         dialogOff:false,
         measured:[]
       }
@@ -70,85 +71,108 @@
 
         // let beginInof = Number(this.data.t_complaintBegin.number)
         // let endInof = Number(this.data.t_complaintEnd.number)
-        let s12fengXian = echarts.init(document.getElementById(this.id))
-        // let beingDate=this.data.t_complaintBegin.date
-        // let endDate=this.data.t_complaintEnd.date
-        var option;
-
-        //v3
-        let e=[this.data.t_mjsyshdfxsbykzjhxbNum.numberAll,this.data.t_mjsyshdfxsbykzjhxbNum.numbe]
-        // let e=[this.data.t_mjsyshdfxsbykzjhxbNum.number[0],this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0],this.data.t_mjsyshdfxsbykzjhxbNum.res[0]]
+        let s12fengXiancol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
         option = {
-            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:['已完成', '总数量', '完成率']
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
+              }
             },
-            yAxis: [
-              {
-                type: 'value',
-                scale: true,
-                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,
-                // boundaryGap: [0.2, 0.2]
-              },
-              // {
-              //   type: 'value',
-              //   scale: true,
-              //   name: '完成率',
-              //   max: this.data.t_mjsyshdfxsbykzjhxbNum.res[0],
-              //   min: 0,
-              //   axisLabel: {
-              //     formatter: '{value} %'
-              //   }
-              // }
-            ],
-            series: [
-              {
-                data: e,
-                type: 'bar',
-                barWidth: '20%',
-
-                itemStyle: {
-                  color: '#cc6633'
-                },
-                label: {
-                show: true,
-                position: 'top'
-              },
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
             }
+          ],
+       
         };
 
-        option && s12fengXian.setOption(option);
+        option && s12fengXiancol.setOption(option);
       }
     }
   }

+ 36 - 40
src/views/statistics/item/s14bufuhexiangCol.vue

@@ -49,7 +49,7 @@
     },
     data () {
       return {
-        title:'不符合项类型数量统计',
+        title:'不符合项各部门完成情况',
         dialogOff:false,
         measured:[]
       }
@@ -72,56 +72,52 @@
         // let beginInof = Number(this.data.t_complaintBegin.number)
         // let endInof = Number(this.data.t_complaintEnd.number)
         let s14bufuhexiang = echarts.init(document.getElementById(this.id))
-        // let beingDate=this.data.t_complaintBegin.date
-        // let endDate=this.data.t_complaintEnd.date
-        var option;
+        let option;
         let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
-        for (let i = 0; i < this.data.t_bfhxbgyjzcsjlbxNum.title.length-1; i++) {
-          barNum.push({
-            type: 'bar',
-            itemStyle: {color: barColor[i]},
-            label:{
-              normal:{
-                show:true,
-                position:'top',
-                        
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
                 textStyle:{
-                  fontSize:16,
-                  color:'#B0CEFC'
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
                 }
               }
-            }
-          })
+            })
+          }
           
         }  
-        //v3
-        // let e=[this.data.t_bfhxbgyjzcsjlbxNum.numberAll[0],this.data.t_bfhxbgyjzcsjlbxNum.number[0]]
-        // let e=[this.data.t_mjsyshdfxsbykzjhxbNum.number[0],this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0],this.data.t_mjsyshdfxsbykzjhxbNum.res[0]]
 
         option = {
             title: {
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
-          // tooltip: {
-          //               trigger: 'axis',
-          //               axisPointer: {
-          //                 type: 'shadow'
-          //               },
-          //               formatter: function (datas) {
-          //                 // console.log(datas)
-          //                   var res=datas[0].name+"<BR>"+'期间核查次数:'+datas[0].data+"<BR>期间核查完成次数"+datas[1].data
-          //                   // res+='百分比:'+(datas[1].value==null||datas[1].value==0?"0.00":(datas[0].value/datas[1].value*100).toFixed(2))+"%"
-          //                   return res
-          //               }
-          // },
-          // legend: {
-          //   textStyle: {
-          //       color: '#B0CEFC'  // 图例文字颜色
-          //   }
-
-          // },
           grid: {
                 top: '10%',
                 left: '3%',
@@ -161,8 +157,8 @@
             }
           },
           dataset: {
-            dimensions: this.data.t_bfhxbgyjzcsjlbxNum.title,
-            source: this.data.t_bfhxbgyjzcsjlbxNum.number
+            dimensions: this.data.num.title,
+            source: this.data.num.number
           },
           series: barNum,
           dataZoom: [

+ 3 - 2
src/views/statistics/item/s15tousu.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'应急预案演练计划完成率',
+        title:'应急预案演练完成率',
         dialogOff:false,
         measured:[]
       }

+ 101 - 160
src/views/statistics/item/s15tousuCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -31,11 +32,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/4+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s15tousu"
+        default:"s15tousufb"
       },
       click:{
         type:String,
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'客户投诉已通知数量',
+        title:'应急预案演练各部门完成率',
         dialogOff:false,
         measured:[]
       }
@@ -70,168 +71,108 @@
 
         // let beginInof = Number(this.data.t_complaintBegin.number)
         // let endInof = Number(this.data.t_complaintEnd.number)
-        let s15tousu = echarts.init(document.getElementById(this.id))
-        // let beingDate=this.data.t_complaintBegin.date
-        // let endDate=this.data.t_complaintEnd.date
-        var option;
-        //v2
-        // let that = this
-        // for (let i = 0; i < that.data.t_complaintNum.date.length; i++) {
-        //   let result = 0
-        //   if(that.data.t_mjwtsqbNum.number[i] === 0){
-        //     result = Math.floor(that.data.t_complaintNum.number[i]/1 * 10000) / 100
-        //   }else{
-        //     result = Math.floor(that.data.t_complaintNum.number[i]/that.data.t_mjwtsqbNum.number[i] * 10000) / 100
-        //   }
-        //   that.measured.push(result)
-        //   // console.log(that.data.t_complaintNum.number[i], that.data.t_mjwtsqbNum.number[i], result, 'res')
-        // }
-        //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,this.data.t_complaintNum.number]
-        
+        let s15tousucol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
         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_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,
-                // boundaryGap: [0.2, 0.2]
-              },
-              // {
-              //   type: 'value',
-              //   scale: true,
-              //   name: '客户投诉率',
-              //   max: this.data.t_complaintNum.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: '#cccc33'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-          //v2
-        //   rotate: {
-        //     min: -90,
-        //     max: 90
-        //   },
-        //   grid: {
-        //         top: '20%',
-        //         left: '3%',
-        //         right: '4%',
-        //         bottom: '10%',
-        //         containLabel: true
-        //     },
-        //   title: {
-        //      text: this.title,
-        //      subtext: '    '+this.data.t_complaintNum.date[0]+'-'+this.data.t_complaintNum.date[this.data.t_complaintNum.date.length-1],
-        //    },
-        //  xAxis: {
-        //    type: 'category',
-        //    data: this.data.t_complaintNum.date
-        //  },
-        //  yAxis: {
-        //   //  max:this.data.t_complaintBegin.number>this.data.t_complaintEnd.number?this.data.t_complaintBegin.number+1:this.data.t_complaintEnd.number+1,
-        //   // max: Math.max(...this.measured),
-        //   // min:0,
-        //   type: 'value',
-        //   axisLabel: {
-        //     show: true,
-        //     textStyle:{color:'#000'},
-        //     interval: 'auto',
-        //     formatter: '{value} %'
-        //   },
-        //  },
-        //  tooltip: {
-        //         trigger: 'axis',
-        //         axisPointer: {
-        //           type: 'shadow'
-        //         },
-        //         formatter: function (params) {
-        //           // console.log(params,'tousu ')
-        //           return params[0].axisValue + '<br/>客户投诉率:' + params[0].data;
-        //         }
-        //         // formatter: 
-        //         // function (datas) {
-        //         //     let year1 = datas[0].dataIndex==0||datas[0].dataIndex==2;
-        //         //     var res=(year1?beingDate+':':endDate+':')+datas[0].name+':'+datas[0].value
-        //         //     return res
-        //         // }
-        //  },
-        //  series: [
-        //    {
-        //      itemStyle: {
-        //             normal: {
-        //                 color: function(params) {
-        //                     var colorList = [
-        //                       '#F0805A','#B5C334','#FCCE10','#E87C25','#27727B',
-        //                        '#FE8463','#9BCA63','#FAD860','#F3A43B','#60C0DD',
-        //                        '#D7504B','#C6E579','#F4E001','#F0805A','#26C0C0'
-        //                     ];
-        //                     return colorList[params.dataIndex]
-        //                 },
-        //             }
-        //         },
-
-        //      data: this.measured,
-        //      type: 'bar',
-        //      barWidth:50
-        //    }
-        //  ]
-       };
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
+        };
 
-       option && s15tousu.setOption(option);
+       option && s15tousucol.setOption(option);
       }
     }
   }

+ 38 - 40
src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'改进项类型数量统计',
+        title:'改进项各部门完成情况',
         dialogOff:false,
       }
     },
@@ -67,54 +68,52 @@
       },
       drawLine(){
         let s16bzJunZhu = echarts.init(document.getElementById(this.id))
-        var option;
+        let option;
         let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
-        for (let i = 0; i < this.data.Num.title.length-1; i++) {
-          barNum.push({
-            type: 'bar',
-            itemStyle: {color: barColor[i]},
-            label:{
-              normal:{
-                show:true,
-                position:'top',
-                        
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
                 textStyle:{
-                  fontSize:16,
-                  color:'#B0CEFC'
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
                 }
               }
-            }
-          })
+            })
+          }
           
         }  
-        //v3
-        // let e=[this.data.t_bfhxbgyjzcsjlbxNum.numberAll[0],this.data.t_bfhxbgyjzcsjlbxNum.number[0]]
-        // let e=[this.data.t_mjsyshdfxsbykzjhxbNum.number[0],this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0],this.data.t_mjsyshdfxsbykzjhxbNum.res[0]]
 
         option = {
             title: {
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
-          // tooltip: {
-          //               trigger: 'axis',
-          //               axisPointer: {
-          //                 type: 'shadow'
-          //               },
-          //               formatter: function (datas) {
-          //                 // console.log(datas)
-          //                   var res=datas[0].name+"<BR>"+'期间核查次数:'+datas[0].data+"<BR>期间核查完成次数"+datas[1].data
-          //                   // res+='百分比:'+(datas[1].value==null||datas[1].value==0?"0.00":(datas[0].value/datas[1].value*100).toFixed(2))+"%"
-          //                   return res
-          //               }
-          // },
-          // legend: {
-          //   textStyle: {
-          //       color: '#B0CEFC'  // 图例文字颜色
-          //   }
-
-          // },
           grid: {
                 top: '10%',
                 left: '3%',
@@ -154,8 +153,8 @@
             }
           },
           dataset: {
-            dimensions: this.data.Num.title,
-            source: this.data.Num.number
+            dimensions: this.data.num.title,
+            source: this.data.num.number
           },
           series: barNum,
           dataZoom: [
@@ -169,7 +168,6 @@
        
         };
 
-
        option && s16bzJunZhu.setOption(option);
       }
     }

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

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <!-- <div>2323</div> -->
@@ -55,7 +56,7 @@
     },
     data () {
       return {
-        title:'管理评审计划完成情况',
+        title:'管理评审完成情况',
         dialogOff:false,
       }
     },

+ 101 - 78
src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <!-- <div>2323</div> -->
@@ -33,11 +34,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/5+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s1zhiLiangMuBiao"
+        default:"s1zhiLiangMuBiaofb"
       },
       click:{
         type:String,
@@ -50,7 +51,7 @@
     },
     data () {
       return {
-        title:'管理评审计划完成数量统计',
+        title:'管理评审各部门完成情况',
         dialogOff:false,
       }
     },
@@ -68,85 +69,107 @@
        }
       },
       drawLine(){
-        let s5zhiLiangMuBiao = echarts.init(document.getElementById(this.id))
-        let e=[]
-        e=[this.data.t_jchzbNum.numberAll,this.data.t_jchzbNum.number]
-      
-        let option = {
-          //v3
-          legend: {},
-            tooltip: {
-              trigger: 'axis',
-              axisPointer: {
-                type: 'shadow'
-              },
-            },
-            xAxis: { 
-              type: 'category',
-              data:['计划完成数', '计划未完成数量'],
-              // data:['有效检测任务总数', '及时完成的检测项目数量','未及时完成的检测项目数量','未完成的检测项目数量'],
-              axisLabel: {  
-                interval: 0,  
-                formatter:function(value){  
-                    var ret = "";//拼接加\n返回的类目项  
-                    var maxLength = 5;//每项显示文字个数  
-                    var valLength = value.length;//X轴类目项的文字个数  
-                    var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
-                    if (rowN > 1)//如果类目项的文字大于5,  
-                    {  
-                        for (var i = 0; i < rowN; i++) {  
-                            var temp = "";//每次截取的字符串  
-                            var start = i * maxLength;//开始截取的位置  
-                            var end = start + maxLength;//结束截取的位置  
-                      //这里也可以加一个是否是最后一行的判断,但是不加也没有影响,那就不加吧  
-                            temp = value.substring(start, end) + "\n";  
-                            ret += temp; //凭借最终的字符串  
-                        }  
-                        return ret;  
-                    }  
-                    else {  
-                        return value;  
-                    }  
-                }  
-            } 
+        let s5zhiLiangMuBiaocol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
-            },
-            yAxis: [
-              {
-                type: 'value',
-                scale: true,
-                name: '数量',
-                min: 0,
-              },
-            ],
-            series: [
-              {
-                data: e,
-                type: 'bar',
-                barWidth: '20%',
-                itemStyle: {
-                  color: '#0099ff'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+        option = {
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-          
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
         };
-        option && s5zhiLiangMuBiao.setOption(option);
+        option && s5zhiLiangMuBiaocol.setOption(option);
       }
     }
   }

+ 3 - 2
src/views/statistics/item/s2manYiDu.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -55,7 +56,7 @@
     },
     data () {
       return {
-        title:'年度内审计划完成率',
+        title:'年度内审完成率',
         dialogOff:false,
       }
     },

+ 102 - 199
src/views/statistics/item/s2manYiDuPro.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -32,12 +33,12 @@
       },
       height:{
         type:String,
-        default: window.screen.height/5+"px"
+        default: "100%"
         // default: "100%"
       },
       id:{
         type:String,
-        default:"s2manYiDu"
+        default:"s2manYiDufb"
       },
       click:{
         type:String,
@@ -50,7 +51,7 @@
     },
     data () {
       return {
-        title:'客户满意度',
+        title:'年度内审各部门完成率',
         dialogOff:false,
       }
     },
@@ -68,206 +69,108 @@
        }
       },
       drawLine(){
-        let s2manYiDu = echarts.init(document.getElementById(this.id))
-
-        // let data2 = [];
-        // data2.push(Number(this.data.t_myddc2Begin.number*100))
-        // data2.push(Number(this.data.t_myddc2End.number*100))
-        // data2.push(Number(this.data.t_myddc3Begin.number*100))
-        // data2.push(Number(this.data.t_myddc3End.number*100))
-
-        // let dataAxis = [];
-        // dataAxis.push("检测")
-        // dataAxis.push("检测")
-        // dataAxis.push("满意率")
-        // dataAxis.push("满意率")
-        // let barData = []
-        // for (let i = 0; i < this.data.t_khmydtjbNum.date.length; i++) {
-        //   let e=[]
-        //   if (this.data.t_khmydtjbNum.numberAll[i]===0) {
-        //     e =[this.data.t_khmydtjbNum.date[i], 0]
-        //   } else {
-        //     e =[this.data.t_khmydtjbNum.date[i], Math.floor(this.data.t_khmydtjbNum.number[i]/this.data.t_khmydtjbNum.numberAll[i] * 10000) / 100]
-        //   }
-        //   barData.push(e)
-        // }
-        let e=[this.data.t_khmydtjbNum.numberAll,this.data.t_khmydtjbNum.number]
-        // let e=100-this.data.t_khmydtjbNum.res[0]
-
-        // let beingDate=this.data.t_myddc2Begin.date
-        // let endDate=this.data.t_myddc2End.date
-        let option = {
-          //   title: {
-          //   text: this.title,
-          //   // subtext: 'Fake Data',
-          //   left: 'left',
-          //   textStyle:{ fontSize:14 }
-          // },
-          // tooltip: {
-          //   trigger: 'item'
-          // },
-          // color:['#00ccff','#cc3333'],
-          // series: [
-          //   {
-          //     type: 'pie',
-          //     radius: '50%',
-          //     label: {
-          //       formatter: '{b}: {d}%'
-          //     },
-          //     data: [
-          //       { value: this.data.t_khmydtjbNum.res[0], name: '客户满意率' },
-          //       { value: e, name: '客户不满意率' }
-          //     ],
-          //     emphasis: {
-          //       itemStyle: {
-          //         shadowBlur: 10,
-          //         shadowOffsetX: 0,
-          //         shadowColor: 'rgba(0, 0, 0, 0.5)'
-          //       }
-          //     }
-          //   }
-          // ]
+        let s2manYiDucol = echarts.init(document.getElementById(this.id))
 
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
-            //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_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,
-                // boundaryGap: [0.2, 0.2]
-              },
-              // {
-              //   type: 'value',
-              //   scale: true,
-              //   name: '满意度',
-              //   max: this.data.t_khmydtjbNum.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: '#66CCCC'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+        option = {
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-        //v1
-        // xAxis: {
-        //   data: dataAxis,
-        //   axisLabel: {
-        //     inside: false,
-        //     color: '#000',
-        //     interval:0
-        //   },
-        //   axisTick: {
-        //     show: true
-        //   },
-        //   axisLine: {
-        //     show: true
-        //   },
-        //   z: 10
-        // },
-        // yAxis: {
-        //   axisLine: {
-        //     show: false
-        //   },
-        //   axisTick: {
-        //     show: false
-        //   },
-        //   axisLabel: {
-        //                          show: true,
-        //                          textStyle:{color:'#000'},
-        //                          interval: 'auto',
-        //                          formatter: '{value} %'
-        //                          },
-        // },
-        // dataZoom: [
-        //   {
-        //     type: 'inside'
-        //   }
-        // ],
-        // tooltip: {
-        //        trigger: 'axis',
-        //        axisPointer: {
-        //          type: 'shadow'
-        //        },
-        //        formatter: function (datas) {
-        //            let year1 = datas[0].dataIndex==0||datas[0].dataIndex==2;
-        //            var res=(year1?beingDate+':':endDate+':')+datas[0].name+':'+((datas[0].value-1))+"%"
-        //            return res
-        //        }
-        // },
-        // series: [
-        //   {
-        //     type: 'bar',
-        //     showBackground: true,
-        //     itemStyle: {
-        //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-        //         { offset: 0, color: '#83bff6' },
-        //         { offset: 0.5, color: '#188df0' },
-        //         { offset: 1, color: '#188df0' }
-        //       ])
-        //     },
-        //     emphasis: {
-        //       itemStyle: {
-        //         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-        //           { offset: 0, color: '#2378f7' },
-        //           { offset: 0.7, color: '#2378f7' },
-        //           { offset: 1, color: '#83bff6' }
-        //         ])
-        //       }
-        //     },
-        //     data: data2
-        //   }
-        // ]
-      };
-      option && s2manYiDu.setOption(option);
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
+        };
+      option && s2manYiDucol.setOption(option);
       }
     }
   }

+ 3 - 2
src/views/statistics/item/s4renYuanPeiXun.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -49,7 +50,7 @@
     },
     data () {
       return {
-        title:'在岗人员培训计划完成率',
+        title:'在岗人员培训完成率',
         dialogOff:false,
       }
     },

+ 100 - 206
src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -32,11 +33,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/5+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s4renyuanPeiXun"
+        default:"s4renyuanPeiXunfb"
       },
       click:{
         type:String,
@@ -49,7 +50,7 @@
     },
     data () {
       return {
-        title:'人员培训数量',
+        title:'在岗人员培训各部门完成率',
         dialogOff:false,
       }
     },
@@ -67,217 +68,110 @@
        }
       },
       drawLine(){
-        let s4renYuanPeiXun = echarts.init(document.getElementById(this.id))
+        let s4renYuanPeiXunfb = 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_ryywpxjlNum.numberAll,this.data.t_ryywpxjlNum.number]
-        //  console.log(this.data.t_ryywpxjlNum.numberAll,this.data.t_ryywpxjlNum.number,'577777777777777777777777777777777')
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
-        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_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,
-                // 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'
-                },
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-          //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]
-          //               },
-          //           }
-          //       },
-          //   }
-          // ]
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
         };
 
 
-       option && s4renYuanPeiXun.setOption(option);
+       option && s4renYuanPeiXunfb.setOption(option);
       }
     }
   }

+ 3 - 2
src/views/statistics/item/s5renYuanJianDu.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -49,7 +50,7 @@
     },
     data () {
       return {
-        title:'岗前培训计划完成率',
+        title:'岗前培训完成率',
         dialogOff:false,
       }
     },

+ 101 - 284
src/views/statistics/item/s5renYuanJianDuCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -32,11 +33,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/4+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s5renyuanJianDu"
+        default:"s5renyuanJianDufb"
       },
       click:{
         type:String,
@@ -49,7 +50,7 @@
     },
     data () {
       return {
-        title:'人员监督',
+        title:'岗前培训各部门完成率',
         dialogOff:false,
       }
     },
@@ -67,292 +68,108 @@
        }
       },
       drawLine(){
-        let s5renYuanJianDu = echarts.init(document.getElementById(this.id))
-        // let beginInof = GetPercent(Number(this.data.t_zljdssBegin.number),Number(this.data.t_zljdBegin.number))
-        // let endInof = GetPercent(Number(this.data.t_zljdssEnd.number),Number(this.data.t_zljdEnd.number))
-
-        //  let data1 = [];
-        //  data1.push(this.data.t_zljdBegin.number);
-        //  data1.push(this.data.t_zljdEnd.number);
-        //  let data2 = [];
-        //  data2.push(this.data.t_zljdssBegin.number);
-        //  data2.push(this.data.t_zljdssEnd.number);
-        //  let data3 = [];
-        //  data3.push(this.data.t_zljdssBegin.date);
-        //  data3.push(this.data.t_zljdssEnd.date);
-        //  const posList = [
-        //   'left',
-        //   'right',
-        //   'top',
-        //   'bottom',
-        //   'inside',
-        //   'insideTop',
-        //   'insideLeft',
-        //   'insideRight',
-        //   'insideBottom',
-        //   'insideTopLeft',
-        //   'insideTopRight',
-        //   'insideBottomLeft',
-        //   'insideBottomRight'
-        // ];
-        // app.configParameters = {
-        //   rotate: {
-        //     min: -90,
-        //     max: 90
-        //   },
-        //   align: {
-        //     options: {
-        //       left: 'left',
-        //       center: 'center',
-        //       right: 'right'
-        //     }
-        //   },
-        //   verticalAlign: {
-        //     options: {
-        //       top: 'top',
-        //       middle: 'middle',
-        //       bottom: 'bottom'
-        //     }
-        //   },
-        //   position: {
-        //     options: posList.reduce(function (map, pos) {
-        //       map[pos] = pos;
-        //       return map;
-        //     }, {})
-        //   },
-        //   distance: {
-        //     min: 0,
-        //     max: 100
-        //   }
-        // };
-        // app.config = {
-        //   rotate: 90,
-        //   align: 'left',
-        //   verticalAlign: 'middle',
-        //   position: 'bottom',
-        //   distance: 0,
-        //   onChange: function () {
-        //     const labelOption = {
-        //       rotate: app.config.rotate,
-        //       align: app.config.align,
-        //       verticalAlign: app.config.verticalAlign,
-        //       position: app.config.position,
-        //       distance: app.config.distance
-        //     };
-        //     myChart.setOption({
-        //       series: [
-        //         {
-        //           label: labelOption
-        //         },
-        //         {
-        //           label: labelOption
-        //         },
-        //         {
-        //           label: labelOption
-        //         },
-        //         {
-        //           label: labelOption
-        //         }
-        //       ]
-        //     });
-        //   }
-        // };
-        // const labelOption = {
-        //   show: true,
-        //   position: app.config.position,
-        //   distance: app.config.distance,
-        //   align: app.config.align,
-        //   verticalAlign: app.config.verticalAlign,
-        //   rotate: app.config.rotate,
-        //   formatter: '{c}  {name|{a}}',
-        //   fontSize: 16,
-        //   rich: {
-        //       name: {
-        //           textBorderColor: '#fff'
-        //       }
-        //   }
-        // };
-
-        //v2
-        // let barData = []
-        // for (let i = 0; i < this.data.t_zljdNum.date.length; i++) {
-        //   let e=[this.data.t_zljdNum.date[i],this.data.t_zljdNum.number[i],this.data.t_zljdNum.numberAll[i]]
-        //   barData.push(e)
-        // }
-        //v3
-         let e=[this.data.t_zljdNum.number,this.data.t_zljdNum.numberAll]
+        let s5renYuanJianDucol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
-        let 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:['已完成数量', '所有数量']},
-            yAxis: 
-              {
-                type: 'value',
-                scale: true,
-                name: '数量',
-                // max: this.data.t_zljdNum.number[0]>this.data.t_zljdNum.numberAll[0]?this.data.t_zljdNum.number[0]+1:this.data.t_zljdNum.numberAll[0]+1,
-                min: 0,
-                // boundaryGap: [0.2, 0.2]
-              },
-              // {
-              //   type: 'value',
-              //   scale: true,
-              //   name: '监督完成率',
-              //   max: this.data.t_zljdNum.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: '#9933cc'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+        option = {
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-          //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_zljdNum.date[0]+"-"+this.data.t_zljdNum.date[this.data.t_zljdNum.date.length-1]
-            // },
-            //v1
-          // grid: {
-          //               top: '20%',
-          //               left: '3%',
-          //               right: '4%',
-          //               bottom: '10%',
-          //               containLabel: true
-          //           },
-          // title: {
-          //           text: this.title,
-          //           subtext: this.data.t_zljdssBegin.date+"-"+this.data.t_zljdssEnd.date+"年监督次数"
-          //         },
-          // color : [
-          //                             '#C6E579','#B5C334','#FCCE10','#E87C25','#27727B',
-          //                              '#FE8463','#9BCA63','#FAD860','#F3A43B','#60C0DD',
-          //                              '#D7504B','#C6E579','#F4E001','#F0805A','#26C0C0'
-          //                           ],
-          // 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},
-          // xAxis: [
-          //   {
-          //     type: 'category',
-          //     axisTick: { show: false },
-          //     data: data3
-          //   }
-          // ],
-          // yAxis: [
-          //   {
-          //     type: 'value'
-          //   }
-          // ],
-          // series: [
-          //   {
-          //     name: '计划',
-          //     type: 'bar',
-          //     barGap: 0,
-          //     label: labelOption,
-          //     emphasis: {
-          //       focus: 'series'
-          //     },
-          //     data: data1
-          //   },
-          //   {
-          //     name: '记录',
-          //     type: 'bar',
-          //     label: labelOption,
-          //     emphasis: {
-          //       focus: 'series'
-          //     },
-          //     data:data2
-          //   }
-          // ]
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
         };
 
-        option && s5renYuanJianDu.setOption(option);
+        option && s5renYuanJianDucol.setOption(option);
       }
     }
   }

+ 3 - 2
src/views/statistics/item/s7sheBeiJiaoZhun.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -49,7 +50,7 @@
     },
     data () {
       return {
-        title:'设备检定/校准计划完成情况',
+        title:'设备检定/校准完成情况',
         dialogOff:false,
       }
     },

+ 99 - 80
src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -32,11 +33,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/5+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s7sheBeiJiaoZhun"
+        default:"s7sheBeiJiaoZhunfb"
       },
       click:{
         type:String,
@@ -49,7 +50,7 @@
     },
     data () {
       return {
-        title:'设备检定/校准计划完成情况',
+        title:'设备检定/校准各部门完成情况',
         dialogOff:false,
       }
     },
@@ -67,91 +68,109 @@
        }
       },
       drawLine(){
-        let s7sheBeiJiaoZhun = echarts.init(document.getElementById(this.id))
+        let s7sheBeiJiaoZhuncol = 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 option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
-        let e=[this.data.t_mjsbjdxzjhzbNum.numberAll,this.data.t_mjsbjdxzjhzbNum.number]
-        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:['设备检定/校准计划总数', '设备检定/校准计划已完成数量']
-
-            },
-            yAxis: [
-              {
-                type: 'value',
-                scale: true,
-                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,
-              },
-            ],
-            series: [
-              {
-                data: e,
-                type: 'bar',
-                barWidth: '20%',
-                itemStyle: {
-                  color: '#0099ff'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
         };
 
 
-       option && s7sheBeiJiaoZhun.setOption(option);
+       option && s7sheBeiJiaoZhuncol.setOption(option);
       }
     }
   }

+ 3 - 2
src/views/statistics/item/s8sheBeiHeCha.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'设备维护计划完成情况',
+        title:'设备维护完成情况',
         dialogOff:false,
       }
     },

+ 101 - 79
src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -31,11 +32,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/5+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s8sheBeiHeCha"
+        default:"s8sheBeiHeChafb"
       },
       click:{
         type:String,
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'设备期间核查计划完成情况总数量',
+        title:'设备维护各部门完成情况',
         dialogOff:false,
       }
     },
@@ -66,86 +67,107 @@
        }
       },
       drawLine(){
-        let s8sheBeiHeCha = echarts.init(document.getElementById(this.id))
-         
-
+        let s8sheBeiHeChacol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
           
-        // let beginInof = GetPercent(Number(this.data.t_sbhcjlbBegin.number),Number(this.data.t_sbhcjhBegin.number))
-        // let endInof = GetPercent(Number(this.data.t_sbhcjlbEnd.number),Number(this.data.t_sbhcjhEnd.number))
-         
-        //  let data1 = [];
-        //  data1.push(this.data.t_sbhcjhBegin.number);
-        //  data1.push(this.data.t_sbhcjhEnd.number);
-        //  let data2 = [];
-        //  data2.push(this.data.t_sbhcjlbBegin.number);
-        //  data2.push(this.data.t_sbhcjlbEnd.number);
-        //  let data3 = [];
-        //  data3.push(this.data.t_sbhcjlbBegin.date);
-        //  data3.push(this.data.t_sbhcjlbEnd.date);
-        //  let max1=GetMax(data1)+1;
-        //  let max2=GetMax(data2)+1;
-        //  let maxVal=max1>max2?max1:max2;
-        //  console.log("max1:",max1,"max2:",max2);
-        let e=[this.data.t_sbhcjlbNum.numberAll,this.data.t_sbhcjlbNum.number]
-        let 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:['设备期间核查总数', '设备期间核查已完成数量']
+        }  
 
-            },
-            yAxis: [
-              {
-                type: 'value',
-                scale: true,
-                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,
-              },
-            ],
-            series: [
-              {
-                data: e,
-                type: 'bar',
-                barWidth: '20%',
-                itemStyle: {
-                  color: '#0099ff'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+        option = {
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
-       };
-
-       option && s8sheBeiHeCha.setOption(option);
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
+        };
+       option && s8sheBeiHeChacol.setOption(option);
       }
     }
   }

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

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'内部比对实验计划完成率',
+        title:'内部比对实验完成率',
         dialogOff:false,
         measured:[]
       }

+ 100 - 63
src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -1,5 +1,6 @@
 <template>
-  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+  <!-- <div @click="toDetailed()" class="statisticsPage" :style="{width:width}"> -->
+  <div class="statisticsPage" :style="{width:width}">
     <div :id="id" :style="{height:height}"/>
     <!-- 打开详情弹窗-->
     <div v-if="dialogOff">
@@ -31,11 +32,11 @@
       },
       height:{
         type:String,
-        default: window.screen.height/5+"px"
+        default: "100%"
       },
       id:{
         type:String,
-        default:"s9neibu"
+        default:"s9neibufb"
       },
       click:{
         type:String,
@@ -48,7 +49,7 @@
     },
     data () {
       return {
-        title:'质量控制数量',
+        title:'内部比对实验各部门完成率',
         dialogOff:false,
         measured:[]
       }
@@ -70,72 +71,108 @@
 
         // let beginInof = Number(this.data.t_complaintBegin.number)
         // let endInof = Number(this.data.t_complaintEnd.number)
-        let s9neibu = echarts.init(document.getElementById(this.id))
-        // let beingDate=this.data.t_complaintBegin.date
-        // let endDate=this.data.t_complaintEnd.date
-        var option;
-        let e=[this.data.t_mjzlkzxbNum.numberAll,this.data.t_mjzlkzxbNum.number]
-        //v3
-        // let e=[this.data.t_complaintNum.number[0],this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.res[0]]
+        let s9neibucol = echarts.init(document.getElementById(this.id))
+        let option;
+        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barNum = []
+        for (let i = 0; i < this.data.num.title.length-1; i++) {
+          if(i==this.data.num.title.length-2){
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                show: true,
+				        formatter:function(params){ //标签内容
+                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
+					        return  params.value[params.seriesName]+'%'
+					      },
+                position: 'top',
+                textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+              }
+            })
+          }else{
+            barNum.push({
+              type: 'bar',
+              itemStyle: {color: barColor[i]},
+              label:{
+                normal:{
+                  show:true,
+                  position:'top',
+                          
+                  textStyle:{
+                    fontSize:16,
+                    color:'#B0CEFC'
+                  }
+                }
+              }
+            })
+          }
+          
+        }  
 
         option = {
-            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:['内部比对实验计划总数', '内部比对实验计划已完成数量']
-
-            },
-            yAxis: [
-              {
-                type: 'value',
-                scale: true,
-                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,
-              },
-            ],
-            series: [
-              {
-                data: e,
-                type: 'bar',
-                barWidth: '20%',
-                itemStyle: {
-                  color: '#0099ff'
-                },
-                label: {
-                  show: true,
-                  position: 'top'
-                },
+            title: {
+            text: this.title,
+            textStyle:{ fontSize:14,color: this.colorw }
+          },
+          grid: {
+                top: '10%',
+                left: '3%',
+                right: '4%',
+                bottom: '5%',
+                containLabel: true
+          },
+          xAxis: { 
+            splitLine:{show: false},
+            type: 'category',
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'   //这里用参数代替了
               }
-            ],
-            grid: {
-              top: '20%',
-              left: '3%',
-              right: '4%',
-              bottom: '10%',
-              containLabel: true
             },
-            title: {
-              text: this.title,
-              textStyle:{ fontSize:14,color: this.colorw }
-
-              // subtext: "        "+beingDate+"-"+endDate
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          yAxis: {
+            splitLine:{show: false},
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#fff'    //这里用参数代替了
+              }
             },
+            axisLine:{
+              lineStyle:{
+                color:'#fff',
+                width:1, //x轴线的宽度
+              }
+            }
+          },
+          dataset: {
+            dimensions: this.data.num.title,
+            source: this.data.num.number
+          },
+          series: barNum,
+          dataZoom: [
+            {
+                id: 'dataZoomY',
+                type: 'inside',
+                yAxisIndex: [0],
+                filterMode: 'empty'
+            }
+          ],
+       
         };
 
-        option && s9neibu.setOption(option);
+        option && s9neibucol.setOption(option);
       }
     }
   }

+ 34 - 4
src/views/statistics/js/selectDB.js

@@ -8,12 +8,18 @@ export const getConfig = (begin,end)=>{
 export const getJiaoYanObj = (end,info)=>{
   return "select COUNT(t_mjsbjdxzjhzb.id_) as num from t_mjsbjdxzjhzb JOIN t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_ = t_mjsbjdxzjh.id_ where FIND_IN_SET(t_mjsbjdxzjh.bian_zhi_bu_men_,'"+info+"') and t_mjsbjdxzjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' union all select COUNT(t_mjsbjdxzjhzb.id_) as num from t_mjsbjdxzjhzb JOIN t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_ = t_mjsbjdxzjh.id_ where FIND_IN_SET(t_mjsbjdxzjh.bian_zhi_bu_men_,'"+info+"') and t_mjsbjdxzjh.shi_fou_guo_shen_ = '已完成' and t_mjsbjdxzjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' "
 }
+export const getJiaoYanObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from(select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_mjsbjdxzjh.bian_zhi_bu_men_,COUNT(t_mjsbjdxzjhzb.id_) as numA from t_mjsbjdxzjhzb JOIN t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_ = t_mjsbjdxzjh.id_ where FIND_IN_SET(t_mjsbjdxzjh.bian_zhi_bu_men_,'"+info+"') and t_mjsbjdxzjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbjdxzjh.bian_zhi_bu_men_) a LEFT JOIN (select t_mjsbjdxzjh.bian_zhi_bu_men_,COUNT(t_mjsbjdxzjhzb.id_) as num from t_mjsbjdxzjhzb JOIN t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_ = t_mjsbjdxzjh.id_ where FIND_IN_SET(t_mjsbjdxzjh.bian_zhi_bu_men_,'"+info+"') and t_mjsbjdxzjh.shi_fou_guo_shen_ = '已完成' and t_mjsbjdxzjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbjdxzjh.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getJiaoYanMGObj = (end,info)=>{
   return "select a.mz,IFNULL(a.num,0) as num ,IFNULL(b.num,0) as wnum from (select t_mjsbjdxzjhzb.bian_hao_zhong_we,concat(t_mjsbjdxzjhzb.bian_hao_zhong_we,t_mjsbjdxzjhzb.she_bei_ming_chen) as mz,COUNT(t_mjsbjdxzjhzb.id_) as num from t_mjsbjdxzjhzb JOIN t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_ = t_mjsbjdxzjh.id_ where FIND_IN_SET(t_mjsbjdxzjh.bian_zhi_bu_men_,'"+info+"') and t_mjsbjdxzjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbjdxzjhzb.bian_hao_zhong_we) as a LEFT JOIN (select t_mjsbjdxzjhzb.bian_hao_zhong_we, COUNT(t_mjsbjdxzjhzb.id_) as num from t_mjsbjdxzjhzb JOIN t_mjsbjdxzjh on t_mjsbjdxzjhzb.parent_id_ = t_mjsbjdxzjh.id_ where FIND_IN_SET(t_mjsbjdxzjh.bian_zhi_bu_men_,'"+info+"') and t_mjsbjdxzjh.shi_fou_guo_shen_ = '已完成' and t_mjsbjdxzjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbjdxzjhzb.bian_hao_zhong_we) as b on a.bian_hao_zhong_we=b.bian_hao_zhong_we"
 }
 export const gethechaObj = (end,info)=>{
   return "select COUNT(t_mjsbwhjhzb.id_) as num from t_mjsbwhjhzb JOIN t_mjsbwhjhb on t_mjsbwhjhzb.parent_id_ = t_mjsbwhjhb.id_ where FIND_IN_SET(t_mjsbwhjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsbwhjhb.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION All select COUNT(t_mjsbwhbyjlby.id_) as num from t_mjsbwhbyjlby JOIN t_mjsbwhjhb on t_mjsbwhbyjlby.ji_hua_zong_wai_j = t_mjsbwhjhb.id_ where FIND_IN_SET(t_mjsbwhjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsbwhbyjlby.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const gethechaObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_mjsbwhjhb.bian_zhi_bu_men_,COUNT(t_mjsbwhjhzb.id_) as numA from t_mjsbwhjhzb JOIN t_mjsbwhjhb on t_mjsbwhjhzb.parent_id_ = t_mjsbwhjhb.id_ where FIND_IN_SET(t_mjsbwhjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsbwhjhb.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbwhjhb.bian_zhi_bu_men_) a LEFT JOIN (select t_mjsbwhjhb.bian_zhi_bu_men_,COUNT(t_mjsbwhbyjlby.id_) as num from t_mjsbwhbyjlby JOIN t_mjsbwhjhb on t_mjsbwhbyjlby.ji_hua_zong_wai_j = t_mjsbwhjhb.id_ where FIND_IN_SET(t_mjsbwhjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsbwhbyjlby.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbwhjhb.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const gethechaMGObj = (end,info)=>{
   return "select a.mz,IFNULL(a.num,0) as num,IFNULL(b.wnum,0) as wnum from (select t_mjsbwhjhzb.bian_hao_zhong_we,concat(t_mjsbwhjhzb.bian_hao_zhong_we,t_mjsbwhjhzb.she_bei_ming_chen) as mz,COUNT(t_mjsbwhjhzb.id_) as num from t_mjsbwhjhzb JOIN t_mjsbwhjhb on t_mjsbwhjhzb.parent_id_ = t_mjsbwhjhb.id_ where FIND_IN_SET(t_mjsbwhjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsbwhjhb.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsbwhjhzb.bian_hao_zhong_we) as a LEFT JOIN (select t_mjsbwhbyjlby.ri_qi_,COUNT(t_mjsbwhbyjlby.id_) as wnum from t_mjsbwhbyjlby JOIN t_mjsbwhjhb on t_mjsbwhbyjlby.ji_hua_zong_wai_j = t_mjsbwhjhb.id_ where FIND_IN_SET(t_mjsbwhjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsbwhbyjlby.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.shi_fou_guo_shen_ = '已完成' and t_mjsbwhjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'GROUP BY t_mjsbwhbyjlby.ri_qi_) as b on a.bian_hao_zhong_we= b.ri_qi_"
 }
@@ -27,43 +33,67 @@ export const getzongZLMBObj = (end,info)=>{
   return "select t_zlzbpjzb.*,IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_)) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjzb.zhi_liang_mu_biao"
 }
 export const getzhiliangzhibiaotitleObj = (end,info)=>{
-  return "select distinct t_zlzbpjzb.zhi_liang_zhi_bia from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjb.bian_zhi_bu_men_,t_zlzbpjzb.zhi_liang_mu_biao ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
+  return "select distinct t_zlzbpjzb.zhi_liang_zhi_bia,t_zlzbpjzb.zhi_biao_xian_zhi from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjb.bian_zhi_bu_men_,t_zlzbpjzb.zhi_liang_zhi_bia ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
 }
 export const getfenzuZLZBObj = (end,info)=>{
-  return "select t_zlzbpjzb.*,IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_)) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjzb.zhi_liang_mu_biao,bzsj ORDER BY bzsj"
+  return "select t_zlzbpjzb.*,ROUND(IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_))) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY bzsj,bzbm, t_zlzbpjzb.zhi_liang_zhi_bia ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
 }
 
 
 export const getzaigangrenyuanObj = (end,info)=>{
   return "select COUNT(t_ndrypxjhzb.id_) as num from t_ndrypxjhzb JOIN t_lhndrypxjh on t_ndrypxjhzb.parent_id_ = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhndrypxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getzaigangrenyuanFBObj = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.num as numA,IFNULL(b.num,0) as num  from (select t_lhndrypxjh.bian_zhi_bu_men_,COUNT(t_ndrypxjhzb.id_) as num from t_ndrypxjhzb JOIN t_lhndrypxjh on t_ndrypxjhzb.parent_id_ = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'  GROUP BY t_lhndrypxjh.bian_zhi_bu_men_) a LEFT JOIN (select t_lhndrypxjh.bian_zhi_bu_men_, COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhndrypxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhndrypxjh.id_ where FIND_IN_SET(t_lhndrypxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.shi_fou_guo_shen_ = '已完成' and t_lhndrypxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"') b on a.bian_zhi_bu_men_ = b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getgangqianpeixunObj = (end,info)=>{
   return "select COUNT(t_lhgqpxjhzb.id_) as num from t_lhgqpxjhzb JOIN t_lhgqpxjh on t_lhgqpxjhzb.parent_id_ = t_lhgqpxjh.id_ where FIND_IN_SET(t_lhgqpxjh.bian_zhi_bu_men_,'"+info+"') and t_lhgqpxjh.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhgqpxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhgqpxjh.id_ where FIND_IN_SET(t_lhgqpxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getgangqianpeixunFBObj = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_lhgqpxjh.bian_zhi_bu_men_,COUNT(t_lhgqpxjhzb.id_) as numA from t_lhgqpxjhzb JOIN t_lhgqpxjh on t_lhgqpxjhzb.parent_id_ = t_lhgqpxjh.id_ where FIND_IN_SET(t_lhgqpxjh.bian_zhi_bu_men_,'"+info+"') and t_lhgqpxjh.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'  GROUP BY t_lhgqpxjh.bian_zhi_bu_men_) a LEFT JOIN (select t_lhgqpxjh.bian_zhi_bu_men_,COUNT(t_lhrypxjlb.id_) as num from t_lhrypxjlb JOIN t_lhgqpxjh on t_lhrypxjlb.ji_hua_zong_wai_j = t_lhgqpxjh.id_ where FIND_IN_SET(t_lhgqpxjh.bian_zhi_bu_men_,'"+info+"') and t_lhrypxjlb.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.shi_fou_guo_shen_ = '已完成' and t_lhgqpxjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'  GROUP BY t_lhgqpxjh.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_ = b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 
 export const getwaibuObj = (end,info)=>{
   return "select COUNT(t_cjwbzlpjhdjhxqb.id_) as num from t_cjwbzlpjhdjhxqb JOIN t_cjwbzlpjhdjhb on t_cjwbzlpjhdjhxqb.parent_id_ = t_cjwbzlpjhdjhb.id_ where FIND_IN_SET(t_cjwbzlpjhdjhb.bu_men_,'"+info+"') and t_cjwbzlpjhdjhb.shi_fou_guo_shen_ = '已完成' and t_cjwbzlpjhdjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION All select COUNT(t_sjzpjgpjb.id_) as num from t_sjzpjgpjb JOIN t_cjwbzlpjhdjhb on t_sjzpjgpjb.shi_jian_zhi_ping = t_cjwbzlpjhdjhb.id_ where FIND_IN_SET(t_cjwbzlpjhdjhb.bu_men_,'"+info+"') and t_sjzpjgpjb.shi_fou_guo_shen_ = '已完成' and t_cjwbzlpjhdjhb.shi_fou_guo_shen_ = '已完成' and t_cjwbzlpjhdjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getwaibuObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from(select a.bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_cjwbzlpjhdjhb.bu_men_,COUNT(t_cjwbzlpjhdjhxqb.id_) as numA from t_cjwbzlpjhdjhxqb JOIN t_cjwbzlpjhdjhb on t_cjwbzlpjhdjhxqb.parent_id_ = t_cjwbzlpjhdjhb.id_ where FIND_IN_SET(t_cjwbzlpjhdjhb.bu_men_,'"+info+"') and t_cjwbzlpjhdjhb.shi_fou_guo_shen_ = '已完成' and t_cjwbzlpjhdjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_cjwbzlpjhdjhb.bu_men_) a LEFT JOIN (select t_cjwbzlpjhdjhb.bu_men_,COUNT(t_sjzpjgpjb.id_) as num from t_sjzpjgpjb JOIN t_cjwbzlpjhdjhb on t_sjzpjgpjb.shi_jian_zhi_ping = t_cjwbzlpjhdjhb.id_ where FIND_IN_SET(t_cjwbzlpjhdjhb.bu_men_,'"+info+"') and t_sjzpjgpjb.shi_fou_guo_shen_ = '已完成' and t_cjwbzlpjhdjhb.shi_fou_guo_shen_ = '已完成' and t_cjwbzlpjhdjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_cjwbzlpjhdjhb.bu_men_) b on a.bu_men_=b.bu_men_) c LEFT JOIN ibps_party_entity on c.bu_men_ = ibps_party_entity.id_"
+}
 export const getneibuObj = (end,info)=>{
   return "select COUNT(t_nbbdsyjhzb.id_) as num from t_nbbdsyjhzb JOIN t_nbbdsyjh on t_nbbdsyjhzb.parent_id_ = t_nbbdsyjh.id_ where FIND_IN_SET(t_nbbdsyjh.bian_zhi_bu_men_,'"+info+"') and t_nbbdsyjh.shi_fou_guo_shen_ = '已完成' and t_nbbdsyjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION All select COUNT(t_nbbdsy.id_) as num from t_nbbdsy JOIN t_nbbdsyjh on t_nbbdsy.ji_hua_id_ = t_nbbdsyjh.id_ where FIND_IN_SET(t_nbbdsyjh.bian_zhi_bu_men_,'"+info+"') and t_nbbdsy.shi_fou_guo_shen_ = '已完成' and t_nbbdsyjh.shi_fou_guo_shen_ = '已完成' and t_nbbdsyjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getneibuObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from(select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_nbbdsyjh.bian_zhi_bu_men_,COUNT(t_nbbdsyjhzb.id_) as numA from t_nbbdsyjhzb JOIN t_nbbdsyjh on t_nbbdsyjhzb.parent_id_ = t_nbbdsyjh.id_ where FIND_IN_SET(t_nbbdsyjh.bian_zhi_bu_men_,'"+info+"') and t_nbbdsyjh.shi_fou_guo_shen_ = '已完成' and t_nbbdsyjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_nbbdsyjh.bian_zhi_bu_men_) a LEFT JOIN (select t_nbbdsyjh.bian_zhi_bu_men_,COUNT(t_nbbdsy.id_) as num from t_nbbdsy JOIN t_nbbdsyjh on t_nbbdsy.ji_hua_id_ = t_nbbdsyjh.id_ where FIND_IN_SET(t_nbbdsyjh.bian_zhi_bu_men_,'"+info+"') and t_nbbdsy.shi_fou_guo_shen_ = '已完成' and t_nbbdsyjh.shi_fou_guo_shen_ = '已完成' and t_nbbdsyjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'  GROUP BY t_nbbdsyjh.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getyingjiObj = (end,info)=>{
   return "select COUNT(t_lisxttjyjyayljhzb.id_) as num from t_lisxttjyjyayljhzb JOIN t_lisxttjyjyayljh on t_lisxttjyjyayljhzb.parent_id_ = t_lisxttjyjyayljh.id_ where FIND_IN_SET(t_lisxttjyjyayljh.bian_zhi_bu_men_,'"+info+"') and t_lisxttjyjyayljh.shi_fou_guo_shen_ = '已完成' and t_lisxttjyjyayljh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL	select COUNT(t_lisxtgzyjylssjlb.id_) as num from t_lisxtgzyjylssjlb JOIN t_lisxttjyjyayljh on t_lisxtgzyjylssjlb.xuan_ze_ji_hua_= t_lisxttjyjyayljh.id_ where FIND_IN_SET(t_lisxttjyjyayljh.bian_zhi_bu_men_,'"+info+"') and t_lisxtgzyjylssjlb.shi_fou_guo_shen_ = '已完成' and t_lisxttjyjyayljh.shi_fou_guo_shen_ = '已完成' and t_lisxttjyjyayljh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getyingjiObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_lisxttjyjyayljh.bian_zhi_bu_men_,COUNT(t_lisxttjyjyayljhzb.id_) as numA from t_lisxttjyjyayljhzb JOIN t_lisxttjyjyayljh on t_lisxttjyjyayljhzb.parent_id_ = t_lisxttjyjyayljh.id_ where FIND_IN_SET(t_lisxttjyjyayljh.bian_zhi_bu_men_,'"+info+"') and t_lisxttjyjyayljh.shi_fou_guo_shen_ = '已完成' and t_lisxttjyjyayljh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_lisxttjyjyayljh.bian_zhi_bu_men_) a LEFT JOIN	(select t_lisxttjyjyayljh.bian_zhi_bu_men_,COUNT(t_lisxtgzyjylssjlb.id_) as num from t_lisxtgzyjylssjlb JOIN t_lisxttjyjyayljh on t_lisxtgzyjylssjlb.xuan_ze_ji_hua_= t_lisxttjyjyayljh.id_ where FIND_IN_SET(t_lisxttjyjyayljh.bian_zhi_bu_men_,'"+info+"') and t_lisxtgzyjylssjlb.shi_fou_guo_shen_ = '已完成' and t_lisxttjyjyayljh.shi_fou_guo_shen_ = '已完成' and t_lisxttjyjyayljh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_lisxttjyjyayljh.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getfengxianObj = (end,info)=>{
   return "select COUNT(t_mjsyshdfxsbykzjhxb.id_) as num from t_mjsyshdfxsbykzjhxb JOIN t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhxb.parent_id_ = t_mjsyshdfxsbykzjhb.id_ where FIND_IN_SET(t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_ = '已完成' and t_mjsyshdfxsbykzjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_mjsyshdfxkzypjjlb.id_) as num from t_mjsyshdfxkzypjjlb JOIN t_mjsyshdfxsbykzjhb on t_mjsyshdfxkzypjjlb.ji_hua_zong_wai_j = t_mjsyshdfxsbykzjhb.id_ where FIND_IN_SET(t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsyshdfxkzypjjlb.shi_fou_guo_shen_ = '已完成' and t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_ = '已完成' and t_mjsyshdfxsbykzjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getfengxianObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_,COUNT(t_mjsyshdfxsbykzjhxb.id_) as numA from t_mjsyshdfxsbykzjhxb JOIN t_mjsyshdfxsbykzjhb on t_mjsyshdfxsbykzjhxb.parent_id_ = t_mjsyshdfxsbykzjhb.id_ where FIND_IN_SET(t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_ = '已完成' and t_mjsyshdfxsbykzjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_) a LEFT JOIN	(select t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_,COUNT(t_mjsyshdfxkzypjjlb.id_) as num from t_mjsyshdfxkzypjjlb JOIN t_mjsyshdfxsbykzjhb on t_mjsyshdfxkzypjjlb.ji_hua_zong_wai_j = t_mjsyshdfxsbykzjhb.id_ where FIND_IN_SET(t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_,'"+info+"') and t_mjsyshdfxkzypjjlb.shi_fou_guo_shen_ = '已完成' and t_mjsyshdfxsbykzjhb.shi_fou_guo_shen_ = '已完成' and t_mjsyshdfxsbykzjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_mjsyshdfxsbykzjhb.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getneishenObj = (end,info)=>{
   return "select COUNT(t_nsjh.id_) as num from t_nsjh where FIND_IN_SET(t_nsjh.bian_zhi_bu_men_,'"+info+"') and t_nsjh.shi_fou_guo_shen_ = '已完成' and t_nsjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_nbshbgb.id_) as num from t_nbshbgb JOIN (select t_nbss.id_,t_nbss.shi_fou_guo_shen_ from t_nsjh join t_nbss on t_nbss.ji_hua_zong_wai_j = t_nsjh.id_ where FIND_IN_SET(t_nsjh.bian_zhi_bu_men_,'"+info+"') and t_nsjh.shi_fou_guo_shen_ = '已完成' and t_nsjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' ) as a on t_nbshbgb.ji_hua_zong_wai_j = a.id_ where t_nbshbgb.shi_fou_guo_shen_ = '已完成' and a.shi_fou_guo_shen_ = '已完成' "
 }
+export const getneishenObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select d.bian_zhi_bu_men_,d.numA as numA,IFNULL(b.num,0) as num from (select t_nsjh.bian_zhi_bu_men_,COUNT(t_nsjh.id_) as numA from t_nsjh where FIND_IN_SET(t_nsjh.bian_zhi_bu_men_,'"+info+"') and t_nsjh.shi_fou_guo_shen_ = '已完成' and t_nsjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_nsjh.bian_zhi_bu_men_) d LEFT JOIN (select a.bian_zhi_bu_men_,COUNT(t_nbshbgb.id_) as num from t_nbshbgb JOIN (select t_nbss.id_,t_nbss.shi_fou_guo_shen_,t_nsjh.bian_zhi_bu_men_ from t_nsjh join t_nbss on t_nbss.ji_hua_zong_wai_j = t_nsjh.id_ where FIND_IN_SET(t_nsjh.bian_zhi_bu_men_,'"+info+"') and t_nsjh.shi_fou_guo_shen_ = '已完成' and t_nsjh.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' ) as a on t_nbshbgb.ji_hua_zong_wai_j = a.id_ where t_nbshbgb.shi_fou_guo_shen_ = '已完成' and a.shi_fou_guo_shen_ = '已完成' GROUP BY a.bian_zhi_bu_men_) b on d.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getguanshenObj = (end,info)=>{
   return "select COUNT(t_gglpsjhx.id_) as num from t_gglpsjhx where FIND_IN_SET(t_gglpsjhx.bian_zhi_bu_men_,'"+info+"') and t_gglpsjhx.shi_fou_guo_shen_ = '已完成' and t_gglpsjhx.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' UNION ALL select COUNT(t_gsbgb.id_) as num from t_gsbgb JOIN t_gglpsjhx on t_gsbgb.zong_wai_jian_ = t_gglpsjhx.id_ where t_gsbgb.shi_fou_guo_shen_ = '已完成' and t_gglpsjhx.shi_fou_guo_shen_ = '已完成' and FIND_IN_SET(t_gglpsjhx.bian_zhi_bu_men_,'"+info+"')  and t_gglpsjhx.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"'"
 }
+export const getguanshenObjFB = (end,info)=>{
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,a.numA as numA,IFNULL(b.num,0) as num from (select t_gglpsjhx.bian_zhi_bu_men_,COUNT(t_gglpsjhx.id_) as numA from t_gglpsjhx where FIND_IN_SET(t_gglpsjhx.bian_zhi_bu_men_,'"+info+"') and t_gglpsjhx.shi_fou_guo_shen_ = '已完成' and t_gglpsjhx.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_gglpsjhx.bian_zhi_bu_men_) a LEFT JOIN (select t_gglpsjhx.bian_zhi_bu_men_,COUNT(t_gsbgb.id_) as num from t_gsbgb JOIN t_gglpsjhx on t_gsbgb.zong_wai_jian_ = t_gglpsjhx.id_ where t_gsbgb.shi_fou_guo_shen_ = '已完成' and t_gglpsjhx.shi_fou_guo_shen_ = '已完成' and FIND_IN_SET(t_gglpsjhx.bian_zhi_bu_men_,'"+info+"')  and t_gglpsjhx.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_gglpsjhx.bian_zhi_bu_men_) b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
+}
 export const getbufuheObj = (end,info)=>{
-  return "select a.bao_gao_lei_xing_,IFNULL(a.num,0) as num,IFNULL(b.numA,0) as numA from (select t_bfhhjzcsjlb.bao_gao_lei_xing_,COUNT(t_bfhhjzcsjlb.id_) as num from t_bfhhjzcsjlb where FIND_IN_SET(t_bfhhjzcsjlb.bian_zhi_bu_men_,'"+info+"') and t_bfhhjzcsjlb.shi_fou_guo_shen_ = '已完成' and t_bfhhjzcsjlb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_bfhhjzcsjlb.bao_gao_lei_xing_) as a LEFT JOIN (select t_bfhhjzcsjlb.bao_gao_lei_xing_,COUNT(t_bfhhjzcsjlb.id_) as numA from t_bfhhjzcsjlb where FIND_IN_SET(t_bfhhjzcsjlb.bian_zhi_bu_men_,'"+info+"') and t_bfhhjzcsjlb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_bfhhjzcsjlb.bao_gao_lei_xing_) as b on a.bao_gao_lei_xing_=b.bao_gao_lei_xing_"
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,IFNULL(a.num,0) as num,IFNULL(b.numA,0) as numA from (select t_bfhhjzcsjlb.bian_zhi_bu_men_,COUNT(t_bfhhjzcsjlb.id_) as num from t_bfhhjzcsjlb where FIND_IN_SET(t_bfhhjzcsjlb.bian_zhi_bu_men_,'"+info+"') and t_bfhhjzcsjlb.shi_fou_guo_shen_ = '已完成' and t_bfhhjzcsjlb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_bfhhjzcsjlb.bian_zhi_bu_men_) as a LEFT JOIN (select t_bfhhjzcsjlb.bian_zhi_bu_men_,COUNT(t_bfhhjzcsjlb.id_) as numA from t_bfhhjzcsjlb where FIND_IN_SET(t_bfhhjzcsjlb.bian_zhi_bu_men_,'"+info+"') and t_bfhhjzcsjlb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_bfhhjzcsjlb.bian_zhi_bu_men_) as b on a.bian_zhi_bu_men_=b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
 }
 export const getgaijinxiangObj = (end,info)=>{
-  return "select a.ping_shen_lei_xin,IFNULL(a.num,0) as num,IFNULL(b.numA,0) as numA from (select t_glpsjhb.ping_shen_lei_xin,COUNT(t_glpsjhb.id_) as num from t_glpsjhb where FIND_IN_SET(t_glpsjhb.bian_zhi_bu_men_,'"+info+"') and t_glpsjhb.shi_fou_guo_shen_ = '已完成' and t_glpsjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_glpsjhb.ping_shen_lei_xin) as a LEFT JOIN (select t_glpsjhb.ping_shen_lei_xin,COUNT(t_glpsjhb.id_) as numA from t_glpsjhb where FIND_IN_SET(t_glpsjhb.bian_zhi_bu_men_,'"+info+"') and t_glpsjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_glpsjhb.ping_shen_lei_xin) as b on a.ping_shen_lei_xin = b.ping_shen_lei_xin"
+  return "select ibps_party_entity.NAME_,c.numA,c.num,if(c.numA=0,0,ROUND((c.num/c.numA)*100,2)) as chu from (select a.bian_zhi_bu_men_,IFNULL(a.num,0) as num,IFNULL(b.numA,0) as numA from (select t_glpsjhb.bian_zhi_bu_men_,COUNT(t_glpsjhb.id_) as num from t_glpsjhb where FIND_IN_SET(t_glpsjhb.bian_zhi_bu_men_,'"+info+"') and t_glpsjhb.shi_fou_guo_shen_ = '已完成' and t_glpsjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_glpsjhb.bian_zhi_bu_men_) as a LEFT JOIN (select t_glpsjhb.bian_zhi_bu_men_,COUNT(t_glpsjhb.id_) as numA from t_glpsjhb where FIND_IN_SET(t_glpsjhb.bian_zhi_bu_men_,'"+info+"') and t_glpsjhb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_glpsjhb.bian_zhi_bu_men_) as b on a.bian_zhi_bu_men_ = b.bian_zhi_bu_men_) c LEFT JOIN ibps_party_entity on c.bian_zhi_bu_men_ = ibps_party_entity.id_"
 }
 // export const getbiaozhunTObj = (end)=>{
 //   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"

+ 226 - 22
src/views/statistics/sendDatas.js

@@ -49,10 +49,28 @@ export default {
                         }
                         barData.push(e)
                         return {
-                                "t_mjsbjdxzjhzbNum" :{"date": this.endDate,"number": ryywpxjNum[1].num, "numberAll": ryywpxjNum[0].num, "val": e,"nummg":this.jiaoyanMGObj},
+                                "t_mjsbjdxzjhzbNum" :{"date": this.endDate,"number": ryywpxjNum[1].num, "numberAll": ryywpxjNum[0].num, "val": e},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
+                getJiaoYanObjNumFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.jiaoyanMGObj,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 gethechaObjNum(){
                         let ryywpxjNum = this.hechaObj
                         let barData = []
@@ -64,10 +82,28 @@ export default {
                         }
                         barData.push(e)
                         return {
-                                "t_sbhcjlbNum" :{"date": this.endDate,"number": ryywpxjNum[1].num, "numberAll": ryywpxjNum[0].num, "val": e,"nummg":this.hechaMGObj},
+                                "t_sbhcjlbNum" :{"date": this.endDate,"number": ryywpxjNum[1].num, "numberAll": ryywpxjNum[0].num, "val": e},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
+                gethechaObjNumFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.hechaMGObj,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getnengtliObjNum(){
                         let ryywpxjNum = this.waibuObj
                         let barData = []
@@ -83,6 +119,24 @@ export default {
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
+                getnengtliObjNumFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.waibuObjfb,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getyangPinCaiJiObjNum(){
 
                         let zlzbfz = []
@@ -124,8 +178,9 @@ export default {
                 },
                 getfenzuZLZBObjNum(){
                         //生成月份
+                        let that = this
                         let d1 = this.endDate[0];
-                        let d2 = this.endDate[1];
+                        let d2 = this.endDate[2];
                         let dateArry = new Array();
                         let s1 = d1.split("-");
                         let s2 = d2.split("-");
@@ -152,44 +207,62 @@ export default {
                         //处理数据
                         let zlzbfz = []
                         let fenshuzu = []
-                        fenshuzu = this.fenzuzlmb
+                        let zongfz = []
+                        fenshuzu = that.quality
+                        for (let m = 0; m < that.quality.length; m++) {
+                                for (let n = 0; n < that.fenzuzlmb.length; n++) {
+                                        //console.log(that.quality.id_ == that.fenzuzlmb.id_,that.quality,that.fenzuzlmb)
+                                        if (that.quality[m].id_ == that.fenzuzlmb[n].id_) {
+                                                fenshuzu[m].data=that.fenzuzlmb[n].data?that.fenzuzlmb[n].data:''
+                                                continue
+                                        }
+                                }
+                                
+                        }
                         for (let j = 0; j < dateArry.length; j++) {
                                 let rq = {}
                                 rq.name_ = dateArry[j]
                                 zlzbfz.push(rq)
                                 // console.log(zlzbfz,dateArry[j],'erw232222222222222222222222222224586')
                         }
-                        
+                        console.log(fenshuzu,zlzbfz,'55353453535345')
                         let title = ['name_']
-                        for (let i = 0; i < zlzbfz.length; i++) {
-                                for (let j = 0; j < fenshuzu.length; j++) {
-                                        if(zlzbfz[i].name_ == fenshuzu[j].bzsj){
-                                                let prop = fenshuzu[j].zhi_liang_zhi_bia;
-                                                zlzbfz[i][prop] = fenshuzu[j].location
+                        for (let zn = 0; zn < fenshuzu.length; zn++) {
+                                for (let i = 0; i < zlzbfz.length; i++) {
+                                        if(fenshuzu[zn].data&&fenshuzu[zn].data.length>0){
+                                                for (let j = 0; j < fenshuzu[zn].data.length; j++) {
+                                                        if(zlzbfz[i].name_ == fenshuzu[zn].data[j].bzsj){
+                                                                let prop = fenshuzu[zn].data[j].zhi_liang_zhi_bia;
+                                                                zlzbfz[i][prop] = fenshuzu[zn].data[j].location
+                                                                console.log(zlzbfz)
+                                                        }
+                                                        //continue
+                                                }
+                                                
                                         }
+                                        //continue
                                 }
+                                zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':zlzbfz})
+                                
                         }
+                        console.log(zongfz,'0000000000000000767676767676767676767676')
                         for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
                                 title.push(this.zhiliangzhibiaotitle[t].zhi_liang_zhi_bia)
                                 
                         }
-                        // let arr  = this.tableNum
-                        // let aa =[]
-                        // for (let j = 0; j < arr.length; j++) {
-                        //         let changeArr = ['<span style="font-size:14px;height:45px;display:inline-block;">' + arr[j].zhi_liang_zhi_bia + '</span>','<span style="font-size:14px;height:45px;display:inline-block;">' + arr[j].ji_suan_gong_shi_ + '</span>','<span style="font-size:14px;height:45px;display:inline-block;">' + arr[j].zhi_biao_xian_zhi + '</span>']
-                        //         aa.push(changeArr)
-                        // }
-                        // this.$set(this.tableData1, 'data', aa)
+                        this.zhiliangmuTitle = title
+                        this.zhiliangmuNeirong = zongfz
+
                         
                         return {
-                                "Num" :{"date": this.endDate,"number": zlzbfz,"title":title},
+                                "Num" :{"date": this.endDate,"number": zongfz,"title":title},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
                 getbzJunZhujNum(){
-                        let title = ['ping_shen_lei_xin','num','numA']
+                        let title = ['NAME_','numA','num','chu']
                         return {
-                                "Num" :{"date": this.endDate,"number": this.gaijinxiangObj,"title":title},
+                                "num" :{"date": this.endDate,"number": this.gaijinxiangObj,"title":title},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
@@ -271,6 +344,24 @@ export default {
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
+                getS1renwuFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.guanshenfbObj,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS1jianCe(){
                         return {
                                 // "t_mjjcbgNum" :{"date": this.dataScope,"number": mjjcbgNum, "numberAll": mjjcbgSNum, "res": barData},
@@ -338,6 +429,24 @@ export default {
                                 "config":this.getMyConfig("客户满意度") //返回需要的对应参数
                         }
                 },
+                getS2manYiDuFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.neishenfbObj,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS3tousu(){
                         let ryywpxjNum = this.yingjiObj
                         let barData = []
@@ -355,6 +464,24 @@ export default {
                                 "config":this.getMyConfig("客户投诉率") //返回需要的对应参数
                         }
                 },
+                getS3tousuFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.yingjifbObj,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS4renYuanPeiXun(){
                         let ryywpxjNum = this.zaigangrenyuan
                         let barData = []
@@ -375,6 +502,25 @@ export default {
                                 "config":this.getMyConfig("人员培训") //返回需要的对应参数
                         }
                 },
+                getS4renYuanPeiXunFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        console.log(this.zaigangrenyuanfb,'43664564646767fghhfghg')
+                        return {
+                                "num" :{"date": this.endDate,"number": this.zaigangrenyuanfb,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS5renYuanJianDu(){
                         let zljdNum = this.gangqianpeixun
                         let zljdSNum = this.getMatchingDataSame('t_zljd')
@@ -398,6 +544,24 @@ export default {
                                 "config":this.getMyConfig("人员监督") //返回需要的对应参数
                         }
                 },
+                getS5renYuanJianDuFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.gangqianpeixunfb,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS6sheBeiWeiHu(){
                         return {
                                 "t_yqsbwhjhxmtBegin" :{"date": this.BeginDate,"number": this.relData['t_yqsbwhjhxmt'+this.BeginDate]},
@@ -431,6 +595,7 @@ export default {
                                 "config":this.getMyConfig("设备校准") //返回需要的对应参数
                         }
                 },
+                
                 getS8sheBeiHeCha(){
                         return {
                                 "t_sbhcjhBegin" :{"date": this.BeginDate,"number": this.relData['t_sbhcjh'+this.BeginDate]},
@@ -455,6 +620,24 @@ export default {
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
+                getS9neiBuZhiLiangFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.neibuObjfb,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS12fengXian(){
                         let ryywpxjNum = this.fengxianObj
                         let barData = []
@@ -469,13 +652,31 @@ export default {
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
+                getS12fengXianFB(){
+                        // let zlzbfz = []
+                        // zlzbfz = this.quality
+                        // let fenshuzu = []
+                        // fenshuzu = this.buhegelvObj
+                        
+                        let title = ['NAME_','numA','num','chu']
+
+                        // for (let t = 0; t < this.bufuheObj.length; t++) {
+                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
+                                
+                        // }
+                        // }
+                        return {
+                                "num" :{"date": this.endDate,"number": this.fengxianfbObj,"title":title},
+                                "config":this.getMyConfig("内部质量") //返回需要的对应参数
+                        }
+                },
                 getS14bufuhexiang(){
                         // let zlzbfz = []
                         // zlzbfz = this.quality
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['bao_gao_lei_xing_','num','numA']
+                        let title = ['NAME_','numA','num','chu']
 
                         // for (let t = 0; t < this.bufuheObj.length; t++) {
                         //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
@@ -483,9 +684,12 @@ export default {
                         // }
                         // }
                         return {
-                                "t_bfhxbgyjzcsjlbxNum" :{"date": this.endDate,"number": this.bufuheObj,"title":title},
+                                "num" :{"date": this.endDate,"number": this.bufuheObj,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
+                
+                
+
         }
 }