MES-WEB-LayUI.git

parent: 6e1213c1 | 补丁 | 提交 | show whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2026-02-28 e11c2d0700f067451486dd993dadbd60aaee2fb0

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

3个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/器具报表/Sc_MouldDotCheckTaskReport.html	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/设备报表/Sb_EquipDotCheckTaskReport.html	55 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,7 +10,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://47.96.97.237/API/";          //æºäºæå¡å¨
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //ä½ææ°æ¬å°éç½®*/
    //var WEBURL = "http://localhost:81/API/";            // ééå²æ¬å°éç½®*/
    var WEBURL = "http://localhost:81/API/";            // ééå²æ¬å°éç½®*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //ææä¿æ¬å°éç½®
    //var WEBURL = "http://localhost:8088/ARAPI/";      //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //å¥¥é¦

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldDotCheckTaskReport.html

@@ -33,6 +33,7 @@
                                <li lay-id="1" class="layui-this">ä»æ¥å¾ç¹æ£</li>
                                <li lay-id="2">ä»æ¥å·²ç¹æ£</li>
                                <li lay-id="3">ä»å¤©å¨é¨ä»»å¡</li>
                                <li lay-id="4">é¾ææªç¹æ£</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -46,6 +47,10 @@
                                <div class="layui-tab-item">
                                    <!--ä»å¤©å¨é¨ä»»å¡-->
                                    <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--ä»å¤©å¨é¨ä»»å¡-->
                                    <table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
                                </div>
                            </div>
                        </div>
@@ -78,6 +83,7 @@
            var option_waitCheck = "";  //ä»æ¥å¾ç¹æ£
            var option_finishCheck = ""; //ä»æ¥å·²ç¹æ£
            var option_task = ""; //ä»å¤©å¨é¨ä»»å¡
            var option_outTime = ""; // é¾ææªç¹æ£ä»»å¡
            var ins;
            var TableTab = "mainTable_waitCheck";  //åå§åé¡µé¢æ¶é»è®¤ä¸º âä»æ¥å¾ç¹æ£â é¡µç¾
            var cur_title = "ä»æ¥å¾ç¹æ£"; //å½åéä¸é¡µç¾
@@ -116,6 +122,8 @@
                    TableTab = "mainTable_finishCheck";
                } else if (cur_title == "ä»å¤©å¨é¨ä»»å¡") {
                    TableTab = "mainTable_task";
                } else if (cur_title == "é¾ææªç¹æ£") {
                    TableTab = "mainTable_outTime";
                }
            })
            //#endregion
@@ -170,6 +178,18 @@
            function set_InitGrid_task() {
                option_task = {
                    elem: '#mainTable_task'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
                    , cols: []
                };
            }

            // åå§åé¾ææªç¹æ£åè¡¨
            function set_InitGrid_outTime() {
                option_outTime = {
                    elem: '#mainTable_outTime'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
@@ -321,6 +341,42 @@
                            }
                            table.render(option_task);

                            
                            var HBillNo_outTime = "";
                            var HRowBackgroundColor_outTime = "#E0F5F7";
                            option_outTime = {
                                elem: '#mainTable_outTime'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MouldDotCheckTaskReport3
                                , height: 'full-120'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    var that = this.elem.next();
                                    res.data.forEach(function (item, index) {
                                        if (HBillNo_outTime == "") {
                                            HBillNo_outTime = item.å¨å·ç¹æ£è®¡ååå·
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime == item.å¨å·ç¹æ£è®¡ååå·) {
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime != item.å¨å·ç¹æ£è®¡ååå· && HBillNo_outTime != "") {
                                            if (HRowBackgroundColor_outTime == "#E0F5F7") {
                                                HRowBackgroundColor_outTime = "#E8E5FA"
                                            } else {
                                                HRowBackgroundColor_outTime = "#E0F5F7"
                                            }
                                            HBillNo_outTime = item.å¨å·ç¹æ£è®¡ååå·
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        }

                                    })
                                }
                            }
                            table.render(option_outTime);

                            //å·æ°æé®æ¾ç¤º
                            var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                            var HBillType = "å¨å·ç¹æ£ä»»å¡";

 WebTM/views/Éè±¸¹ÜÀí/Éè±¸±¨±í/Sb_EquipDotCheckTaskReport.html

@@ -33,6 +33,7 @@
                                <li lay-id="1" class="layui-this">ä»æ¥å¾ç¹æ£</li>
                                <li lay-id="2">ä»æ¥å·²ç¹æ£</li>
                                <li lay-id="3">ä»å¤©å¨é¨ä»»å¡</li>
                                <li lay-id="4">é¾ææªç¹æ£</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -46,6 +47,10 @@
                                <div class="layui-tab-item">
                                    <!--ä»å¤©å¨é¨ä»»å¡-->
                                    <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--é¾ææªç¹æ£-->
                                    <table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
                                </div>
                            </div>
                        </div>
@@ -78,6 +83,7 @@
            var option_waitCheck = "";  //ä»æ¥å¾ç¹æ£
            var option_finishCheck = ""; //ä»æ¥å·²ç¹æ£
            var option_task = ""; //ä»å¤©å¨é¨ä»»å¡
            var option_outTime = ""; //é¾ææªç¹æ£ä»»å¡
            var ins;
            var TableTab = "mainTable_waitCheck";  //åå§åé¡µé¢æ¶é»è®¤ä¸º âä»æ¥å¾ç¹æ£â é¡µç¾
            var cur_title = "ä»æ¥å¾ç¹æ£"; //å½åéä¸é¡µç¾
@@ -116,6 +122,8 @@
                    TableTab = "mainTable_finishCheck";
                } else if (cur_title == "ä»å¤©å¨é¨ä»»å¡") {
                    TableTab = "mainTable_task";
                } else if (cur_title == "é¾ææªç¹æ£") {
                    TableTab = "mainTable_outTime";
                }
            })
            //#endregion
@@ -170,6 +178,18 @@
            function set_InitGrid_task() {
                option_task = {
                    elem: '#mainTable_task'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
                    , cols: []
                };
            }

            // åå§åé¾æä»»å¡åè¡¨
            function set_InitGrid_outTime() {
                option_outTime = {
                    elem: '#mainTable_outTime'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
@@ -321,6 +341,41 @@
                            }
                            table.render(option_task);

                            var HBillNo_outTime = "";
                            var HRowBackgroundColor_outTime = "#E0F5F7";
                            option_outTime = {
                                elem: '#mainTable_outTime'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sb_EquipDotCheckTaskReport3
                                , height: 'full-120'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    var that = this.elem.next();
                                    res.data.forEach(function (item, index) {
                                        if (HBillNo_outTime == "") {
                                            HBillNo_outTime = item.è®¾å¤ç¹æ£è®¡ååå·
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime == item.è®¾å¤ç¹æ£è®¡ååå·) {
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime != item.è®¾å¤ç¹æ£è®¡ååå· && HBillNo_outTime != "") {
                                            if (HRowBackgroundColor_outTime == "#E0F5F7") {
                                                HRowBackgroundColor_outTime = "#E8E5FA"
                                            } else {
                                                HRowBackgroundColor_outTime = "#E0F5F7"
                                            }
                                            HBillNo_outTime = item.è®¾å¤ç¹æ£è®¡ååå·
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        }

                                    })
                                }
                            }
                            table.render(option_outTime);

                            //å·æ°æé®æ¾ç¤º
                            var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                            var HBillType = "è®¾å¤ç¹æ£ä»»å¡";

			@@ -10,7 +10,7 @@
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®*/
			//var WEBURL = "http://localhost:81/API/"; // ééå²æ¬å°éç½®*/
			var WEBURL = "http://localhost:81/API/"; // ééå²æ¬å°éç½®*/
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //å¥¥é¦

			@@ -33,6 +33,7 @@
			<li lay-id="1" class="layui-this">ä»æ¥å¾ç¹æ£</li>
			<li lay-id="2">ä»æ¥å·²ç¹æ£</li>
			<li lay-id="3">ä»å¤©å¨é¨ä»»å¡</li>
			<li lay-id="4">é¾ææªç¹æ£</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			@@ -46,6 +47,10 @@
			<div class="layui-tab-item">
			<!--ä»å¤©å¨é¨ä»»å¡-->
			<table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
			</div>
			<div class="layui-tab-item">
			<!--ä»å¤©å¨é¨ä»»å¡-->
			<table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
			</div>
			</div>
			</div>
			@@ -78,6 +83,7 @@
			var option_waitCheck = ""; //ä»æ¥å¾ç¹æ£
			var option_finishCheck = ""; //ä»æ¥å·²ç¹æ£
			var option_task = ""; //ä»å¤©å¨é¨ä»»å¡
			var option_outTime = ""; // é¾ææªç¹æ£ä»»å¡
			var ins;
			var TableTab = "mainTable_waitCheck"; //åå§åé¡µé¢æ¶é»è®¤ä¸º âä»æ¥å¾ç¹æ£â é¡µç¾
			var cur_title = "ä»æ¥å¾ç¹æ£"; //å½åéä¸é¡µç¾
			@@ -116,6 +122,8 @@
			TableTab = "mainTable_finishCheck";
			} else if (cur_title == "ä»å¤©å¨é¨ä»»å¡") {
			TableTab = "mainTable_task";
			} else if (cur_title == "é¾ææªç¹æ£") {
			TableTab = "mainTable_outTime";
			}
			})
			//#endregion
			@@ -170,6 +178,18 @@
			function set_InitGrid_task() {
			option_task = {
			elem: '#mainTable_task'
			, page: false
			, height: 500
			, cellMinWidth: 90
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, cols: []
			};
			}

			// åå§åé¾ææªç¹æ£åè¡¨
			function set_InitGrid_outTime() {
			option_outTime = {
			elem: '#mainTable_outTime'
			, page: false
			, height: 500
			, cellMinWidth: 90
			@@ -321,6 +341,42 @@
			}
			table.render(option_task);


			var HBillNo_outTime = "";
			var HRowBackgroundColor_outTime = "#E0F5F7";
			option_outTime = {
			elem: '#mainTable_outTime'
			//, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data.h_p_Sc_MouldDotCheckTaskReport3
			, height: 'full-120'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			, done: function (res, curr, count) {
			var that = this.elem.next();
			res.data.forEach(function (item, index) {
			if (HBillNo_outTime == "") {
			HBillNo_outTime = item.å¨å·ç¹æ£è®¡ååå·
			var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
			} else if (HBillNo_outTime == item.å¨å·ç¹æ£è®¡ååå·) {
			var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
			} else if (HBillNo_outTime != item.å¨å·ç¹æ£è®¡ååå· && HBillNo_outTime != "") {
			if (HRowBackgroundColor_outTime == "#E0F5F7") {
			HRowBackgroundColor_outTime = "#E8E5FA"
			} else {
			HRowBackgroundColor_outTime = "#E0F5F7"
			}
			HBillNo_outTime = item.å¨å·ç¹æ£è®¡ååå·
			var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
			}

			})
			}
			}
			table.render(option_outTime);

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "å¨å·ç¹æ£ä»»å¡";