From cbac9f1268f4a28b3cd90a49f98ae2b7fa1c02fb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 13 九月 2024 15:12:38 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html |   50 ++++++++++++++++++++------------------------------
 1 files changed, 20 insertions(+), 30 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index 34e51e6..344642a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -38,15 +38,7 @@
                                             <!--鍔ㄦ�佹覆鏌撳勾浠�-->
                                         </select>
                                     </div>
-                                </div>
-                                <div class="layui-inline" style="display:none">
-                                    <label class="layui-form-label">杞﹂棿</label>
-                                    <div class="layui-input-block" style="width: 190px;">
-                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
-                                            <!--鍔ㄦ�佹覆鏌撻儴闂�-->
-                                        </select>
-                                    </div>
-                                </div>
+                                </div>                              
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
                                     <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -208,8 +200,7 @@
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                Year(); //鍒濆鍖栧勾
-                DeptName();//鍒濆鍖栬溅闂�               
+                Year(); //鍒濆鍖栧勾              
                 Get_HProject(); //鑾峰彇椤圭洰鍙�
                 GetGy_Division();//鑾峰彇浜嬩笟閮�
                 set_InitGrid(); //鍒濆鍖栬〃鏍�
@@ -321,7 +312,6 @@
             //蹇�熸煡璇�
             function get_FastQuery() {
                 var HYear = $("#HYear").val();
-                var HDeptName = $("#HDeptName").val();//杞﹂棿
                 var HProject = $("#HProject").val();//椤圭洰鍙�
                 var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
                 var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -329,8 +319,7 @@
                 var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
                 
                 sWhere = {
-                    HYear: HYear
-                    , HDeptName: HDeptName
+                    HYear: HYear                    
                     , HProject: HProject
                     , HMaterNumber: HMaterNumber
                     , HMaterName: HMaterName
@@ -345,8 +334,7 @@
             }
             //閲嶇疆蹇�熸煡璇�
             function set_ClearQuery() {
-                $("#HYear").val(new Date().getFullYear());
-                $("#HDeptName").val("0");
+                $("#HYear").val(new Date().getFullYear());            
                 $("#HProject").val("");
                 $("#HMaterNumber").val("");
                 $("#HMaterName").val("");
@@ -476,15 +464,15 @@
                             },
                             itemStyle: {
                                 normal: {
+                                    color: '#808080', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�  
                                     label: {
-                                        show: true,		//寮�鍚樉绀�                                       
-                                        textStyle: {	    //鏁板�兼牱寮�
+                                        show: true,
+                                        textStyle: {
                                             color: 'black',
                                             fontSize: 16
                                         }
                                     }
-                                },
-                                color: '#1E90FF' // 璁剧疆鏌辩姸鍥捐摑鑹�
+                                }
                             },
                             data: HBackWorkQty
                         },
@@ -498,25 +486,25 @@
                             tooltip: {
                                 valueFormatter: function (value) {
                                     return value;
-                                }   
+                                }
                             },
                             itemStyle: {
                                 normal: {
+                                    color: '#FF0000', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�  
                                     label: {
-                                        show: true,		//寮�鍚樉绀�                                       
-                                        textStyle: {	    //鏁板�兼牱寮�
+                                        show: true,
+                                        textStyle: {
                                             color: 'black',
                                             fontSize: 16
                                         }
                                     }
-                                },
-                                color: '#FFFF00' // 璁剧疆鏌辩姸鍥鹃粍鑹�
+                                }
                             },
                             data: HWasterQty_Work
                         },
                         {
                             name: '鏂欏簾',
-                            type: 'bar',                           
+                            type: 'bar',
                             stack: 'Ad',
                             emphasis: {
                                 focus: 'series'
@@ -528,21 +516,22 @@
                             },
                             itemStyle: {
                                 normal: {
+                                    color: '#FFFF00', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�  
                                     label: {
-                                        show: true,		//寮�鍚樉绀�                                       
-                                        textStyle: {	    //鏁板�兼牱寮�
+                                        show: true,
+                                        textStyle: {
                                             color: 'black',
                                             fontSize: 16
                                         }
                                     }
-                                },
-                                color: '#FF8C00' // 璁剧疆鏌辩姸鍥炬鑹�
+                                }
                             },
                             data: HWasterQty_Mater
                         },
                         {
                             name: '涓�娆″悎鏍肩巼',
                             type: 'line',
+                            yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
                             label: {
                                 show: true,
                                 formatter: '{c}%'
@@ -565,6 +554,7 @@
                         {
                             name: '鐩爣鍊�',
                             type: 'line',
+                            yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
                             label: {
                                 show: true,
                                 formatter: '{c}%'

--
Gitblit v1.9.1