Merge branch 'master' of http://124.71.187.17:8299/r/~zhd/IGD3000-filesystem

wuwei

2025-06-20 41b27cee360f8253137bd609c2998685545e52db

 local/www/warn-list.html

@@ -23,7 +23,7 @@
                    <form class="layui-form" id="form-param" lay-filter="form-param"

                          action="">

                        <div class="layui-row" style="margin: 0 20px;" >

                            <div class="layui-col-md6 " >

                            <div class="layui-col-md4 " >

                                <div class="layui-inline">

                                    <label class="layui-form-label">设备名称：</label>

                                    <div class="layui-input-block">

@@ -37,7 +37,7 @@
                                    </div>

                                </div>

                            </div>

                            <div class="layui-col-md6">

                            <div class="layui-col-md4">

                                <div class="layui-inline">

                                    <label class="layui-form-label">开始时间：</label>

                                    <div class="layui-input-block">

@@ -47,7 +47,7 @@
                                </div>

                            </div>



                            <div class="layui-col-md6">

                            <div class="layui-col-md4">

                                <div class="layui-inline">

                                    <label class="layui-form-label">结束时间：</label>

                                    <div class="layui-input-block">

@@ -56,7 +56,7 @@
                                    </div>

                                </div>

                            </div>

                            <div class="layui-col-md6" style="display: none;" id="param-btn">

                            <div class="layui-col-md4" style="" id="param-btn">

                                <div class="layui-inline">

                                    <div class="layui-input-block btns" style="margin-left: 15px">

                                        <button class="layui-btn layui-btn-normal"

@@ -92,7 +92,7 @@
                                </colgroup>

                                <thead>

                                <tr>

                                    <th>序号</th>

                                    <th></th>

                                    <th>设备名称</th>

                                    <th>设备ID</th>

                                    <th>警告时间</th>

@@ -115,22 +115,38 @@
                                    <col width="16%">

                                </colgroup>

                                <tbody id="warnList">

                                <tr>

                                    <td>1</td>

                                    <td>设备1</td>

                                    <td>10010001</td>

                                    <td>2021-02-18 16:46:46</td>

                                    <td>未处理</td>

                                    <td>UPS报警，电量仪报警，空调报警，1号温湿度报警</td>

                                    <td>

                                        <button style="height: 29px;line-height: 29px;"

                                                class="layui-btn layui-btn-normal" lay-event="edit">处理

                                        </button>

                                        <button style="height: 29px;line-height: 29px;"

                                                class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">查看

                                        </button>

                                    </td>

                                </tr>

<!--                                <tr>-->

<!--                                    <td>1</td>-->

<!--                                    <td>设备1</td>-->

<!--                                    <td>10010001</td>-->

<!--                                    <td>2021-02-18 16:46:46</td>-->

<!--                                    <td>未处理</td>-->

<!--                                    <td>UPS报警，电量仪报警，空调报警，1号温湿度报警</td>-->

<!--                                    <td>-->

<!--                                        <button style="height: 29px;line-height: 29px;"-->

<!--                                                class="layui-btn layui-btn-normal" lay-event="edit">处理-->

<!--                                        </button>-->

<!--                                        <button style="height: 29px;line-height: 29px;"-->

<!--                                                class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">查看-->

<!--                                        </button>-->

<!--                                    </td>-->

<!--                                </tr>-->

<!--                                <tr>-->

<!--                                    <td>1</td>-->

<!--                                    <td>设备1</td>-->

<!--                                    <td>10010001</td>-->

<!--                                    <td>2021-02-18 16:46:46</td>-->

<!--                                    <td>未处理</td>-->

<!--                                    <td>UPS报警，电量仪报警，空调报警，1号温湿度报警</td>-->

<!--                                    <td>-->

<!--                                        <button style="height: 29px;line-height: 29px;"-->

<!--                                                class="layui-btn layui-btn-normal" lay-event="edit">处理-->

<!--                                        </button>-->

<!--                                        <button style="height: 29px;line-height: 29px;"-->

<!--                                                class="layui-btn layui-btn-normal" onclick="warnTodo()" lay-event="detail">查看-->

<!--                                        </button>-->

<!--                                    </td>-->

<!--                                </tr>-->





                                </tbody>