1.产品工艺参数清单， 增加 字段 HTechParamClassID int //工艺参数大类（Gy_TechnologyParameterClas...

zrg

2024-08-08 b6d581e3dc7f85861625a6aa5e849321f0257511

1.产品工艺参数清单， 增加 字段 HTechParamClassID int //工艺参数大类（Gy_TechnologyParameterClass） HSNO int //工艺次序 HStdNextTimes money //理论次序间隔 HTechParamIDStd int //对应设定值工艺参数(Gy_TechnologyParameter) （都是非必录）
2.修改报表格式

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\GIT仓库\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
@@ -16,8 +16,9 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>views/user/login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,13 +3,13 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
 /*   var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    *//*//张瑞广本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html

@@ -570,6 +570,10 @@
                    "HDataForm": "设备采集",
                    "HDataUnit": "秒",
                    "HDataTimes": "0",
                    "HTechParamClassID": "0",
                    "HSNO": "0",
                    "HStdNextTimes": "0",
                    "HTechParamIDStd":"0",
                    "HSourceBillNo": "0",
                    "HSourceBillType": "0",
                    "HSourceEntryID": "0",
@@ -661,6 +665,12 @@
                        , { field: 'HDataForm', title: '采集来源', templet: '#HDataForm-select' }
                        , { field: 'HDataUnit', title: '采集时间单位', templet: '#HDataUnit-select' }
                        , { field: 'HDataTimes', title: '采集周期频率', edit: 'text', totalRow: true }
                        , { field: 'HTechParamClassID', title: '工艺参数大类', hide: true }
                        , { field: 'HTechParamClassName', title: '工艺参数大类名称', edit: 'text', event: "HTechParamClassName" }     //f7
                        , { field: 'HSNO', title: '工艺次序', edit: 'text', totalRow: true }
                        , { field: 'HStdNextTimes', title: '理论次序间隔', edit: 'text', totalRow: true }
                        , { field: 'HTechParamIDStd', title: '对应设定值工艺参数', hide: true }
                        , { field: 'HTechParamIDStdName', title: '对应设定值工艺参数值', edit: 'text', event: "HTechParamIDStdName  " }     //f7
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
                }
@@ -943,6 +953,10 @@
                                            "HDataForm": "手工录入",
                                            "HDataUnit": "秒",
                                            "HDataTimes": "0",
                                            "HTechParamClassID": "0",
                                            "HSNO": "0",
                                            "HStdNextTimes": "0",
                                            "HTechParamIDStd": "0",
                                            "HSourceBillNo": "0",
                                            "HSourceBillType": "0",
                                            "HSourceEntryID": "0",
@@ -1025,6 +1039,85 @@
                                }
                            });
                        }
                        //工艺参数大类
                        if (obj.event == "HTechParamClassName") {
                            //打开工艺参数大类小窗体
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '工艺参数大类',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameterClass.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    obj.update({
                                        "HTechParamClassID": checkStatus.data[0].HItemID,
                                        "HTechParamClassName": checkStatus.data[0].工艺参数大类名称,

                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , end: function () {
                                    //if (OptionData.length > 0) {
                                    //    //更新表格缓存的数据
                                    //    obj.update({
                                    //        "HTechParamClassID": OptionData[0].HItemID,
                                    //        "HTechParamClassName": OptionData[0].工艺参数大类名称,
                                    //    });
                                    //    OptionData = [];
                                    //}
                                }
                            });
                        }
                        //对应设定值工艺参数
                        if (obj.event == "HTechParamIDStdName") {
                            //打开对应设定值工艺参数(小窗体
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '对应设定值工艺参数列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameter.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    obj.update({
                                        "HTechParamIDStd": checkStatus.data[0].HItemID,
                                        "HTechParamIDStdName": checkStatus.data[0].对应设定值工艺参数名称,

                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , end: function () {
                                    //if (OptionData.length > 0) {
                                    //    //更新表格缓存的数据
                                    //    obj.update({
                                    //        "HTechParamIDStd": OptionData[0].HItemID,
                                    //        "HTechParamIDStdName": OptionData[0].对应设定值工艺参数名称,

                                    //    });
                                    //    OptionData = [];
                                    //}
                                }
                            });
                        }
                        obj.event = "";
                        return false;
                    }

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformanceFirstPass.html

@@ -473,6 +473,7 @@
                var HWasterQty_Work = [];//工废
                var HWasterQty_Mater = [];//料废
                var FistPass = [];//一次合格率
                var target = [];//目标值
                var HTitle = "直通率趋势图";//图形标题
                if (option.data.length > 0) {
                    for (let i = 0; i < option.data.length; i++) {
@@ -485,6 +486,7 @@
                        HWasterQty_Work.push(option.data[i].工废);
                        HWasterQty_Mater.push(option.data[i].料废);
                        FistPass.push((option.data[i].一次合格率).replace('%', ''));
                        target.push(('95.00%').replace('%', ''))
                   
                    }
                }
@@ -570,6 +572,18 @@
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#00DDDD' // è®¾ç½®æŸ±çŠ¶å›¾è“è‰²
                            },
                            data: HBackWorkQty
                        },
                        {
@@ -582,13 +596,25 @@
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                                }   
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#FFFF00' // è®¾ç½®æŸ±çŠ¶å›¾é»„色
                            },
                            data: HWasterQty_Work
                        },
                        {
                            name: '料废',
                            type: 'bar',
                            type: 'bar',                           
                            stack: 'Ad',
                            emphasis: {
                                focus: 'series'
@@ -598,11 +624,27 @@
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#FFAA33' // è®¾ç½®æŸ±çŠ¶å›¾æ©™è‰²
                            },
                            data: HWasterQty_Mater
                        },
                        {
                            name: '一次合格率',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
@@ -611,12 +653,34 @@
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: 'green' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                        color: '#00BBFF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    },
                                    color: 'green' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    color: '#00BBFF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                }
                            },                           
                            data: FistPass
                        },
                        {
                            name: '目标值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            data: FistPass
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#FF0000' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    },
                                    color: '#FF0000' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                }
                            },
                            data: target
                        }
                    ]
                };
@@ -701,12 +765,34 @@
                    series: [
                        {
                            name: '工料率',
                            type: 'line',                          
                            type: 'line',
                            label: {
                                show: true
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#FF0000' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    },
                                    color: '#FF0000' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                }
                            },
                            data: HWorkPass
                        },
                        {
                            name: '料废率',
                            type: 'line',                                                  
                            type: 'line',
                            label: {
                                show: true
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#77DDFF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    },
                                    color: '#77DDFF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                }
                            },
                            data: HMaterPass
                        }                      
                    ]

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformancePass.html

@@ -468,6 +468,7 @@
                var H_X = [];//X轴标题
                var HBackCount = [];//不良总数
                var Pass = [];//合格率
                var target = [];//目标值
                var HTitle = "合格率趋势图";//图形标题
                if (option.data.length > 0) {
                    for (let i = 0; i < option.data.length; i++) {
@@ -478,6 +479,7 @@

                        HBackCount.push(option.data[i].不良总数);                     
                        Pass.push((option.data[i].合格率).replace('%', ''));
                        target.push(('95.00%').replace('%', ''))
                   
                    }
                }
@@ -507,7 +509,7 @@
                        }
                    },
                    legend: {
                        data: ['不良总数','合格率'],
                        data: ['不良总数','合格率','目标值'],
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },
@@ -552,7 +554,10 @@
                    series: [
                        {
                            name: '不良总数',
                            type: 'bar',                         
                            type: 'bar',
                            label: {
                                show: true
                            },
                            barGap: 0,
                            emphasis: {
                                focus: 'series'
@@ -562,11 +567,18 @@
                                    return value;
                                }
                            },
                            itemStyle: {
                                color: '#33CCFF' // è®¾ç½®æŸ±çŠ¶å›¾è“è‰²
                            },
                            data: HBackCount
                        },
                        {
                            name: '合格率',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
@@ -575,12 +587,34 @@
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: 'green' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                        color: '#0066FF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    },
                                    color: 'green' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    color: '#0066FF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                }
                            },
                            data: Pass
                        },
                        {
                            name: '目标值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#FF0000' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                    },
                                    color: '#FF0000' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç»¿è‰²
                                }
                            },
                            data: target
                        }
                    ]
                };

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/SB_TechnologyParameterList.html

@@ -570,6 +570,10 @@
                        {
                            name: '实际值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
@@ -580,6 +584,10 @@
                        {
                            name: '上限值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
@@ -598,6 +606,10 @@
                        {
                            name: '下限值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
@@ -616,6 +628,10 @@
                        {
                            name: '标准值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/Sc_StationOutBil_HProc.html

@@ -198,7 +198,7 @@
            var option = [];
            var HModName = "Sc_StationOutBil_HProc";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["å¹´", "月", "工序"];
            var titleData = ["å¹´", "月", "工序名称"];


            var ins;                        //用于导出excel
@@ -462,7 +462,7 @@
                    sWhere += " and æœˆ = '" + HMonth + "'";
                }
                if (HProcName) {
                    sWhere += " and å·¥åºåç§° like '%" + HNumber + "%'";
                    sWhere += " and å·¥åºåç§° like '%" + HProcName + "%'";
                }
                get_Display(sWhere);
                //加载柱状图
@@ -501,31 +501,28 @@
                var option_ZZT;

                //柱状图绑定数据
                var H_X = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'];//X轴标题
                var H_X = [];//X轴标题
                var HQtySumNum = [];//生产总数量
                var HQtyNum = [];//合格总数量
                var HBadCount = [];//不良数量
                var HBackWorkQty = [];//返工数
                var FistPass = [];//一次合格
                var Pass = [];//合格
                var HTitle = "各工序趋势图";//图形标题
                if (option.data.length > 0) {                 
                    for (let i = 0; i < H_X.length; i++) {
                        HQtySumNum.push(0);
                        HQtyNum.push(0);
                        HBadCount.push(0);
                    for (let i = 0; i < option.data.length; i++) {
                        H_X.push(option.data[i].日期);
                    }
                    // å¡«å……数据
                    for (let i = 0; i < option.data.length; i++) {
                        let monthIndex = option.data[i].日期 - 1; // æ—¥æœŸä»½åœ¨æ•°ç»„中的索引（注意转换为从0开始）
                        HQtySumNum[monthIndex] += option.data[i].生产总数;

                        // å¤„理注塑良率
                        let qualifiedRateString = option.data[i].合格数; //
                        let qualifiedRate = parseFloat(qualifiedRateString); // è½¬æ¢ä¸ºæ•°å­—
                        HQtyNum[monthIndex] = qualifiedRate;
                        HQtySumNum.push(option.data[i].生产总数);
                        HQtyNum.push(option.data[i].合格数);
                        HBadCount.push(option.data[i].不良数);
                        HBackWorkQty.push(option.data[i].返工数);
                        FistPass.push((option.data[i].一次合格率).replace('%', ''));
                        Pass.push((option.data[i].合格率).replace('%', ''))                     

                        // å¤„理全检良率
                        let firstPassRateString = option.data[i].不良数; //
                        let firstPassRate = parseFloat(firstPassRateString); // è½¬æ¢ä¸ºæ•°å­—
                        HBadCount[monthIndex] = firstPassRate;
                    }
                }
                option_ZZT = {
@@ -537,13 +534,28 @@
                        trigger: 'axis',
                        axisPointer: {
                            type: 'shadow'
                        },
                        formatter: function (params) {
                            let tooltipHtml = params[0].axisValue + '<br>'; // X轴数值

                            params.forEach(function (item) {
                                if (item.seriesType === 'line') {
                                    let valueToShow = parseFloat(item.value); // å°†å­—符串转换为数值
                                    tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // æŠ˜çº¿å›¾æ•°æ®æ ¼å¼åŒ–为百分比
                                } else {
                                    tooltipHtml += item.seriesName + ': ' + item.value + '<br>'; // æŸ±çŠ¶å›¾æ•°æ®ç›´æŽ¥æ˜¾ç¤º
                                }
                            });

                            return tooltipHtml;
                        }

                    },
                    legend: {
                        data: ['生产总数', '良品数', '不良数'],
                        data: ['生产总数', '良品数', '不良数','返工数','一次合格率','合格率'],
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },
                    },                   
                    toolbox: {
                        show: true,
                        orient: 'vertical',
@@ -566,7 +578,20 @@
                    ],
                    yAxis: [
                        {
                            type: 'value'
                            type: 'value',
                            name: '数量',
                            axisLabel: {
                                formatter: '{value}'
                            }
                        },
                        {
                            type: 'value',
                            name: '百分比',
                            min: 0,
                            max: 100,
                            axisLabel: {
                                formatter: '{value}%'
                            }
                        }
                    ],
                    series: [
@@ -582,6 +607,18 @@
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#BBFFEE' // è®¾ç½®æŸ±çŠ¶å›¾è“è‰²
                            },
                            data: HQtySumNum
                        },
                        {
@@ -594,6 +631,18 @@
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#00BBFF' // è®¾ç½®æŸ±çŠ¶å›¾è“è‰²
                            },
                            data: HQtyNum
                        },
@@ -608,7 +657,70 @@
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#FF0000' // è®¾ç½®æŸ±çŠ¶å›¾æ©™è‰²
                            },
                            data: HBadCount
                        },
                        {
                            name: '返工数',
                            type: 'bar',
                            emphasis: {
                                focus: 'series'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#FF0000' // è®¾ç½®æŸ±çŠ¶å›¾æ©™è‰²
                            },
                            data: HBackWorkQty
                        },
                        {
                            name: '一次合格率',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª yAxis æ˜¾ç¤ºç™¾åˆ†æ¯”
                            data: FistPass,
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            lineStyle: {
                                color: '#FFB6C1' // è®¾ç½®æŠ˜çº¿å›¾é¢œè‰²
                            }
                        },
                        {
                            name: '合格率',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª yAxis æ˜¾ç¤ºç™¾åˆ†æ¯”
                            data: Pass,
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            lineStyle: {
                                color: '#87CEFA' // è®¾ç½®æŠ˜çº¿å›¾é¢œè‰²
                            }
                        }
                    ]
                };