MES-WEB-LayUI.git

parent: 5e6845bb | 补丁 | 提交 | ignore whitespace

zrg

2024-08-13 102dcb5088bf4b7cc7eb984dde2c5a48ba160239

修改报表显示颜色
器具寿命耗用分析报表

6个文件已修改

1个文件已添加

	WebTM/WebTM.csproj	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/器具报表/Sc_MouldLifeUsePicReport.html	812 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -374,6 +374,7 @@
    <Content Include="views\åºç¡èµæ\éèåè®¾ç½®\Gy_GridView_Hide_New.html" />
    <Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldMaintainTaskReport.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldRepairCheckTaskReport.html" />
@@ -424,6 +425,8 @@
    <Content Include="views\ç³»ç»ç®¡ç\å¤çº§å®¡æ¹\å®¡æ¹è¿åº¦\Xt_CheckFlowProgressList.html" />
    <Content Include="views\ç³»ç»ç®¡ç\ç¨æ·ç®¡ç\Xt_UserRightQuery.html" />
    <Content Include="views\è®¡åç®¡ç\å·¥èºè·¯çº¿\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\è®¾å¤ç®¡ç\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\è®¾å¤ç®¡ç\Sb_EquipRepairSignBillMain.html" />
    <Content Include="views\è®¾å¤ç®¡ç\è®¾å¤åæºå\Sb_EquipStopBillList_PDA.html" />
    <Content Include="views\è®¾å¤ç®¡ç\è®¾å¤åæºå\Sb_EquipStopBill_PDA.html" />
    <Content Include="views\è®¾å¤ç®¡ç\è®¾å¤å·¥èºåæ°è®¢åç¹æ£è¡¨\SB_EquipICMOTechParamBillList.html" />

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,8 +8,8 @@
    /*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:81/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/Ä£ÖÎ¾ß¹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUsePicReport.html

New file
@@ -0,0 +1,812 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>å¨å·å¯¿å½è¶å¿åææ¥è¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>

</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¥æé´é</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¨¡å·ç¼å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMouldNo" id="HMouldNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¨¡å·åç§°</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
                                                <option value="10">ä¸åå«</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
                                                <option value="10">ä¸åå«</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
                                                <option value="10">ä¸åå«</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div>
                            <div style="width:99%;height:calc(100vh);">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
                            </div>
                            <div id="histogram1" style="width:99.5%;height:calc(68vh);margin-top:30px;">
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>

                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            //æ¥è¯¢æ¡ä»¶
            var sWhere = "";
            var option = [];
            var HModName = "Sc_MouldLifeUsePicReport";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["HMaterID"];


            var ins;                        //ç¨äºå¯¼åºexcel
            //#endregion

            //#region è¿å¥é¡µé¢æ¢å è½½
            //åå§åçé¢
            set_ClearBill();
            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
                    //éåºæé®
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                        var HBillType = "Sc_StationOutBil_HProcList";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            // éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region ç¹å»è¡éä¸é«äº®
            table.on('row(mainTable)', function (obj) {
                //éä¸è¡æ¹åé¢è²
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //æ¥æé´éä¸æåè¡¨çå¬
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);

                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                    //æ§è¡æ¥è¯¢æ¹æ³
                    get_FastQuery();
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }
            });

            //#region æ¤é¡µé¢æææ¹æ³
            // åå§åçé¢
            function set_ClearBill() {
                //åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
                setSelect_HInitTimeCycle();
                //è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }

                //æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //åå§åè¡¨
                set_InitGrid();
                //æ¥è¯¢
                get_FastQuery();
                         

            }
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90

                };
            }            
            //æ¥è¯¢
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var ajaxLoad = layer.load();
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldRepairInBillList/Get_Sc_MouldLifeUsePicReport',
                    type: "GET",
                    async:false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            ins = table.render(option);
                            //å·æ°æé®æ¾ç¤º
                            var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                            var HBillType = "Sc_MouldLifeUsePicReport";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                layer.close(index);
            }
            //å¿«éæ¥è¯¢
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val();
                var HMouldNo = $("#HMouldNo").val();
                var HName = $("#HName").val();

                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var ColName1 = $("#ColName1").val();//å¤éæ¡
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//å¤éæ¡
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(7),æ¥æ, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(7),æ¥æ, 23) <= '" + HEndDate + "'";
                }
                if (HMouldNo != "" || HName != "") {
                    if (HMouldNo) {
                        sWhere += " and æ¨¡å·ç¼å· like '%" + HMouldNo + "%'";
                    }
                    if (HName) {
                        sWhere += " and æ¨¡å·åç§° like '%" + HName + "%'";
                    }
                    get_Display(sWhere);
                    //å è½½æ±ç¶å¾
                    set_Graphics();
                } else {
                    if (HMouldNo) {
                        sWhere += " and æ¨¡å·ç¼å· like '%" + HMouldNo + "%'";
                    }
                    if (HName) {
                        sWhere += " and æ¨¡å·åç§° like '%" + HName + "%'";
                    }
                    get_Display(sWhere);
                }
                  
               
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

            }
            //éç½®å¿«éæ¥è¯¢
            function set_ClearQuery() {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //ç»ææ¥æ          

                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                form.render('select');

                sWhere = "";
            }
            //#region åå§æ¥æé´é ä¸æåè¡¨
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
                var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];

                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >ä»»æé´é</option>';
                for (var i = 0; i < valueList.length; i++) {
                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("29");
            }
            //#endregion
            //å·æ°
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }

            //#region ãæ±ç¶å¾ã
            function set_Graphics() {
                var chartDom = document.getElementById('histogram');
                var myChart = echarts.init(chartDom);
                var option_ZZT;

                //æ±ç¶å¾ç»å®æ°æ®
                var H_X = [];//Xè½´æ é¢
                var Life = [];//å¯¿å½
                var HTitle = "å¨å·å¯¿å½èç¨è¶å¿å¾";//å¾å½¢æ é¢
                if (option.data.length > 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++) {

                        Life.push(option.data[i].åå©ä½å¯¿å½);
                   
                    }
                }
                option_ZZT = {
                    title: {
                        text: HTitle,
                        left: 'center'
                    },
                    tooltip: {
                        trigger: 'axis',
                        axisPointer: {
                            type: 'shadow'
                        },                    
                    },
                    legend: {
                        data: ['å¯¿å½'],
                        top: 'bottom',  // å°å¾ä¾æ¾ç½®å¨å¾è¡¨çä¸æ¹
                        left: 'center'  // æè 'right'ï¼æ ¹æ®éè¦è°æ´æ°´å¹³ä½ç½®
                    },
                    toolbox: {
                        show: true,
                        orient: 'vertical',
                        left: 'right',
                        top: 'center',
                        feature: {
                            mark: { show: true },
                            dataView: { show: true, readOnly: false },
                            magicType: { show: true, type: ['line', 'bar', 'stack'] },
                            restore: { show: true },
                            saveAsImage: { show: true }
                        }
                    },
                    xAxis: [
                        {
                            type: 'category',
                            axisTick: { show: false },
                            data: H_X
                        }
                    ],
                    yAxis: [
                        {
                            type: 'value',
                            name: 'æ°é',
                            axisLabel: {
                                formatter: '{value}'
                            }
                        }                        
                    ],
                    series: [                     
                        {
                            name: 'å¯¿å½',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#FF0000' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
                                    },
                                    color: '#FF0000' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
                                }
                            },
                            data: Life
                        }
                    ]
                };

                option_ZZT && myChart.setOption(option_ZZT);
            }
            //#endregion


            //#region å¯¼åºExecel
            function get_Export() {
                var ModRightNameCheck = "QC_ProcessPerformancePass";

                //é»è¾å®¡æ ¸æ¹æ³
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 

                contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: [contentUrl, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion
            //#region æ¾ç¤ºåæ°æ®
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            //var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //è®¾ç½®åå®½
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //è®¾ç½®åå®¹åä½å¤§å°
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //è®¾ç½®åå®½
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //æ¾ç¤ºå
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //åæ¶å»ç»å
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //å»ç»å
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åææ¾ç¤ºä¸ææ¡
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion

            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>

</body>
</html>

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

@@ -582,7 +582,7 @@
                                        }
                                    }
                                },
                                color: '#00DDDD' // è®¾ç½®æ±ç¶å¾èè²
                                color: '#1E90FF' // è®¾ç½®æ±ç¶å¾èè²
                            },
                            data: HBackWorkQty
                        },
@@ -634,7 +634,7 @@
                                        }
                                    }
                                },
                                color: '#FFAA33' // è®¾ç½®æ±ç¶å¾æ©è²
                                color: '#FF8C00' // è®¾ç½®æ±ç¶å¾æ©è²
                            },
                            data: HWasterQty_Mater
                        },
@@ -653,9 +653,9 @@
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#00BBFF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
                                        color: '#1E90FF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
                                    },
                                    color: '#00BBFF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
                                    color: '#1E90FF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
                                }
                            },                           
                            data: FistPass

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

@@ -508,7 +508,7 @@
                var HStd = [];//æ åå¼
                var HMax = [];//ä¸çº¿å¼
                var HMin = [];//ä¸éå¼
                var HTitle = "è®¾å¤å·¥èºåæ°è¶å¿å¾";//å¾å½¢æ é¢
                var HTitle = "è®¾å¤å·¥èºåæ°å¤§ç±»è¶å¿å¾";//å¾å½¢æ é¢
                if (option.data.length > 0) {   
                    for (let i = 0; i < option.data.length ; i++) {
                        H_X.push(option.data[i].å·¥èºæ¬¡åº);

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

@@ -617,7 +617,7 @@
                                        }
                                    }
                                },
                                color: '#BBFFEE' // è®¾ç½®æ±ç¶å¾èè²
                                color: '#0000FF' // è®¾ç½®æ±ç¶å¾é»è²
                            },
                            data: HQtySumNum
                        },
@@ -642,7 +642,7 @@
                                        }
                                    }
                                },
                                color: '#00BBFF' // è®¾ç½®æ±ç¶å¾èè²
                                color: '#00FF00' // è®¾ç½®æ±ç¶å¾ç»¿è²
                            },
                            data: HQtyNum
                        },
@@ -706,7 +706,7 @@
                                formatter: '{c}%'
                            },
                            lineStyle: {
                                color: '#FFB6C1' // è®¾ç½®æçº¿å¾é¢è²
                                color: '#1E90FF' // è®¾ç½®æçº¿å¾é¢è²èè²
                            }
                        },
                        {
@@ -719,7 +719,7 @@
                                formatter: '{c}%'
                            },
                            lineStyle: {
                                color: '#87CEFA' // è®¾ç½®æçº¿å¾é¢è²
                                color: '#1E90FF' // è®¾ç½®æçº¿å¾èè²
                            }
                        }
                    ]

			@@ -374,6 +374,7 @@
			<Content Include="views\åºç¡èµæ\éèåè®¾ç½®\Gy_GridView_Hide_New.html" />
			<Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBill.html" />
			<Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBillList.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldLifeUsePicReport.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldDotCheckTaskReport.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldMaintainTaskReport.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\å¨å·æ¥è¡¨\Sc_MouldRepairCheckTaskReport.html" />
			@@ -424,6 +425,8 @@
			<Content Include="views\ç³»ç»ç®¡ç\å¤çº§å®¡æ¹\å®¡æ¹è¿åº¦\Xt_CheckFlowProgressList.html" />
			<Content Include="views\ç³»ç»ç®¡ç\ç¨æ·ç®¡ç\Xt_UserRightQuery.html" />
			<Content Include="views\è®¡åç®¡ç\å·¥èºè·¯çº¿\Pay_ProcPriceTypeChangeReport.html" />
			<Content Include="views\è®¾å¤ç®¡ç\Sb_Add_EquipRepairSignBillList.html" />
			<Content Include="views\è®¾å¤ç®¡ç\Sb_EquipRepairSignBillMain.html" />
			<Content Include="views\è®¾å¤ç®¡ç\è®¾å¤åæºå\Sb_EquipStopBillList_PDA.html" />
			<Content Include="views\è®¾å¤ç®¡ç\è®¾å¤åæºå\Sb_EquipStopBill_PDA.html" />
			<Content Include="views\è®¾å¤ç®¡ç\è®¾å¤å·¥èºåæ°è®¢åç¹æ£è¡¨\SB_EquipICMOTechParamBillList.html" />

			@@ -2,7 +2,7 @@
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<ProjectView>ShowAllFiles</ProjectView>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />

			@@ -8,8 +8,8 @@
			/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:81/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

			@@ -582,7 +582,7 @@
			}
			}
			},
			color: '#00DDDD' // è®¾ç½®æ±ç¶å¾èè²
			color: '#1E90FF' // è®¾ç½®æ±ç¶å¾èè²
			},
			data: HBackWorkQty
			},
			@@ -634,7 +634,7 @@
			}
			}
			},
			color: '#FFAA33' // è®¾ç½®æ±ç¶å¾æ©è²
			color: '#FF8C00' // è®¾ç½®æ±ç¶å¾æ©è²
			},
			data: HWasterQty_Mater
			},
			@@ -653,9 +653,9 @@
			itemStyle: {
			normal: {
			lineStyle: {
			color: '#00BBFF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
			color: '#1E90FF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
			},
			color: '#00BBFF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
			color: '#1E90FF' // è®¾ç½®çº¿æ¡é¢è²ä¸ºç»¿è²
			}
			},
			data: FistPass

			@@ -508,7 +508,7 @@
			var HStd = [];//æ åå¼
			var HMax = [];//ä¸çº¿å¼
			var HMin = [];//ä¸éå¼
			var HTitle = "è®¾å¤å·¥èºåæ°è¶å¿å¾";//å¾å½¢æ é¢
			var HTitle = "è®¾å¤å·¥èºåæ°å¤§ç±»è¶å¿å¾";//å¾å½¢æ é¢
			if (option.data.length > 0) {
			for (let i = 0; i < option.data.length ; i++) {
			H_X.push(option.data[i].å·¥èºæ¬¡åº);

			@@ -617,7 +617,7 @@
			}
			}
			},
			color: '#BBFFEE' // è®¾ç½®æ±ç¶å¾èè²
			color: '#0000FF' // è®¾ç½®æ±ç¶å¾é»è²
			},
			data: HQtySumNum
			},
			@@ -642,7 +642,7 @@
			}
			}
			},
			color: '#00BBFF' // è®¾ç½®æ±ç¶å¾èè²
			color: '#00FF00' // è®¾ç½®æ±ç¶å¾ç»¿è²
			},
			data: HQtyNum
			},
			@@ -706,7 +706,7 @@
			formatter: '{c}%'
			},
			lineStyle: {
			color: '#FFB6C1' // è®¾ç½®æçº¿å¾é¢è²
			color: '#1E90FF' // è®¾ç½®æçº¿å¾é¢è²èè²
			}
			},
			{
			@@ -719,7 +719,7 @@
			formatter: '{c}%'
			},
			lineStyle: {
			color: '#87CEFA' // è®¾ç½®æçº¿å¾é¢è²
			color: '#1E90FF' // è®¾ç½®æçº¿å¾èè²
			}
			}
			]