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

ch

2022-11-07 a3aca1c1bfef24e3db60fa16b2618986e8b62fbe

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonList.html

@@ -21,6 +21,11 @@

                        <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" style="width: 85px;">故障原因代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
@@ -37,36 +42,37 @@
                                    <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-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" lay-filter="ColName" style="width:190px;">
                                <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" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" 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>
                                    <div class="layui-inline">
                                        <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>

                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
@@ -216,7 +222,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: 'full-80'
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50