From cc91c286ed8384f9f43d0024a3459da989895ca6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 三月 2026 10:47:43 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam_Temp.html |  540 +++++++++--------------------------------------------------
 1 files changed, 85 insertions(+), 455 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
index 075e059..9b6ae51 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
@@ -53,15 +53,15 @@
                                     </div>
                                 </div>
 
-                                <div class="layui-row">
+                                <div class="layui-row" style="margin-top:10px;margin-bottom:10px">
                                     <div class="layui-inline">
                                         <label class="layui-form-label">璁惧缂栫爜</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HSourceCode" id="HSourceCode" style="width:190px;">
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">宸ヨ壓鍙傛暟鍚嶇О</label>
+                                    <div class="layui-inline" style="width:400px">
+                                        <label class="layui-form-label" style="width:90px">宸ヨ壓鍙傛暟鍚嶇О</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HTechParamName" id="HTechParamName" style="width:190px;">
                                         </div>
@@ -71,100 +71,13 @@
                                         <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>
-                
-                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
-                                <div class="layui-inline" style="margin-left:5px;">
-                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
-                                </div>
+                                </div>                              
                                 <div class="layui-colla-content">
-                                </div>
-                                <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" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" 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" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
-                                        </div>
-                                    </div>
-                                </div>
+                                </div>                               
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div id="page"></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="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -195,32 +108,12 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var Name = "MouldProdInHouseCellWidth";
-            var HModName = "Cg_ContractBillList";
-            var HBillType = "1100";
-            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "1100";
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-            //#endregion
-
+            var HModName = "Sb_EquipMentCollectionTechParam_Temp";
+          
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "宸ヨ壓鍙傛暟", "宸ュ簭","鍚屾鏍囪"];
             //#endregion
-
-            //#region 銆愯繃婊ゆ柟妗堛��
-
-            //杩囨护鏉′欢鐨刢lass绫�
-            var HClassTag = "ForFilteringSchemes";
-            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "璁惧宸ヨ壓鍙傛暟鏁伴噰";
-            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
-            window.HDefaultFilter = "";
-            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
-            window.HInterID_Choose = 0;
-
-            //#endregion
-
+            
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             set_ClearBill();
             //#endregion
@@ -237,60 +130,21 @@
                         break;
                 };
             });
-
-            //閲嶆柊鍚屾鎸夐挳
-            form.on('submit(btnResCnz)', function (data) {
-                set_ResCnz();
+            
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                optionPage.curr = 1;
+                get_FastQuery();
             });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
+                optionPage.curr = 1;
                 set_ClearQuery();
             });
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option,2);
-            });
-
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '渚涘簲鍟嗗垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/SupplierInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HSupName").val(checkStatus.data[0].HName);
-                        $("#HSupID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
             //#endregion
+
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
             form.on('select(HInitTimeCycle)', function (data) {
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -337,234 +191,134 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
+                    , height: 'full-110'
+                    , page: false
                     , totalRow: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
+                    , limits: [50, 100]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 200
                     , done: function (res, curr, count) {
                         soulTable.render(this);
-                    }
+                    }                   
                 };
-                ////璁剧疆鍒楀
-                //var colWidth = getColumnsWidth();
-                //if (colWidth == "" || colWidth == []) {
 
-                //}
-                //else {
-                //    $.each(columns, function (x, m) {
-                //        m["width"] = colWidth[x];
-                //    });
-                //}
-            }
-            //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-
-                //鍗曟嵁鍙疯秴閾炬帴
-                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
-                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
-                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
-                        , area: ['100%', '100%']
-                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
-                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: './Add_Edit_Cg_ContractBillList.html?OperationType=3&linterid='+linterid+'&HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
-                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
-                        end: function () {  //褰撳叧闂椂璋冪敤
-                            get_FastQuery(table, option);
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 1000, 2000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            console.log(obj)
+                            get_FastQuery();
                         }
-                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
+                    }
                 }
-            });
-             //#endregion
-            //鍔犺浇缃戞牸
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
+                laypage.render(optionPage);
+            }
+
+            //#region 鏌ヨ(涓昏〃)-鍒嗛〉
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + 'EquipMentCollectionTemp/list',
+                    url: GetWEBURL() + '/Sb_EquipMentReport/Sb_EquipMentCollectionTechParam_Temp_Page',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
                             var data = [];
-                            var col = [];                           
+                            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 });
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
-                            for (var i = 0; i < data.length; i++) {                                
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+                            for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else if (data[i].name == '鍗曟嵁鍙�') {
-                                    col.push({
-                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
-                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
-                                        }, style: 'cursor: pointer;'});
-                                }
+                                } 
                                 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 HH:mm:ss')}}</div>", width: 200 });
+                                            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 HH:MM:ss')}}</div>", width: 200 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                             break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
                             option = {
                                 elem: '#mainTable'
                                 , toolbar: '#toolbarDemo'
+                                , totalRow: true
+                                , height: 'full-50'
+                                , page: false //寮�鍚垎椤�
+                                , limit: 50
+                                , limits: [50, 500, 2000, 5000]
                                 , cols: [col]
                                 , data: data1.data
-                                , height: 800
-                                , page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                , limits: [50, 500, 5000, 20000]
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
                                 }
-                            }
+                            };
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            laypage.render(optionPage);
                             table.render(option);
-                            //涓嬫媺鍒楄〃
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "1100";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
-                            layer.close(ajaxLoad);
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            layer.close(ajaxLoad);
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            laypage.render(optionPage);
+                            option.data = [];
+                            table.render(option);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+                layer.close(ajaxLoad);
             }
+            //#endregion
+
 
           
             //蹇�熻繃婊�
-            function get_FastQuery(table, option,number) {
+            function get_FastQuery() {
                 var HSourceCode = $("#HSourceCode").val();//璁惧缂栫爜
                 var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
-                var HTechParamName = $("#HTechParamName").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 && Comparator != 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 = "" + Comparator2 + "'" + ColContent2 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
+                var HTechParamName = $("#HTechParamName").val(); //宸ヨ壓鍙傛暟鍚嶇О               
                 if (HSourceCode) {
-                    sWhere += " and 璁惧缂栫爜 like '%" + HSourceCode + "%'";
+                    sWhere += " and HSourceCode like '%" + HSourceCode + "%'";
                 }
                 if (HTechParamName) {
-                    sWhere += " and 宸ヨ壓鍙傛暟鍚嶇О like '%" + HTechParamName + "%'";
+                    sWhere += " and HTechParamName like '%" + HTechParamName + "%'";
                 }
                 if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                    sWhere += " and CONVERT(varchar(100),HDate, 23) >= '" + HBeginDate + "'";
                 }
                 if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                    sWhere += " and CONVERT(varchar(100),HDate, 23) <= '" + HEndDate + "'";
                 }
-                sWhere += addSWhereByOpenType();
-
-                sWhere += "     order by  鏃ユ湡  desc";
-                var index = layer.load(0);
-                get_Display(sWhere);
+                get_DisplayPage(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
@@ -574,19 +328,9 @@
                 $("#HSourceCode").val("");
                 $("#HTechParamName ").val("");
                 $("#HBeginDate").val("");
-                $("#HEndDate").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
+                $("#HEndDate").val("");              
                 sWhere = "";
-                get_Display(sWhere);
+                get_DisplayPage(sWhere);
             }
 
             //#endregion
@@ -633,120 +377,6 @@
             }
             //#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
-
-            //#region 銆愯繃婊ゆ柟妗堛��
-
-            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
-            function get_DefaultModule() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
-                    type: "GET",
-                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
-                            var data = data1.data;
-                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
-                            HInterID_Choose = data[0].hmainid;
-                            //杩囨护鏂规鍐呯爜
-                            HInterID = data[0].hmainid
-                            //杩囨护鏂规鍚嶇О
-                            HDefaultFilter = data[0].鏂规鍚嶇О
-                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
-                            var HRemark = data[0].澶囨敞
-                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
-                            document.getElementById("HFilterScheme_Now").style.display = "block";
-                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
-                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
-                            for (let i = 0; i < data.length; i++) {
-                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
-                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
-                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
-                                }
-                            }
-
-                            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);
-                            }
-
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
-                        } else {
-                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
-                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
-                            document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //#endregion
-
-
-        //#region 鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
-            //#endregion
-            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
-            function addSWhereByOpenType() {
-                //鑾峰彇鍙傛暟
-                var params = getUrlVars();
-                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
-
-                var addSWhere = "";
-
-                if (openType == 2) {
-                    addSWhere = "";
-                }
-                return addSWhere;
-            }
-            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });

--
Gitblit v1.9.1