From 5b56e005c12f524b6eedaddbdf442e257ea39855 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 26 二月 2022 16:09:17 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/issue/issue_detl.html |  243 +++++++++++-------------------------------------
 1 files changed, 55 insertions(+), 188 deletions(-)

diff --git a/src/main/webapp/views/issue/issue_detl.html b/src/main/webapp/views/issue/issue_detl.html
index 25d87d4..491f21b 100644
--- a/src/main/webapp/views/issue/issue_detl.html
+++ b/src/main/webapp/views/issue/issue_detl.html
@@ -55,7 +55,7 @@
         float: left;
         font-weight: bold;
         text-shadow: 0 1px 0 rgb(0 0 0 / 20%);
-        padding: .3em .6em;
+        padding: .3em 1em;
         font-size: 85%;
         height: 30px;
         line-height: 30px;
@@ -100,174 +100,87 @@
 
                 <div class="layui-form-item layui-row">
                     <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">璁惧缂栧彿:</label>
+                        <label class="layui-form-label">鏁呴殰缂栧彿:</label>
                         <div class="layui-input-block">
-                            <input name="uuid" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" class="layui-input"/>
+                            <input name="uuid" placeholder="鏈煡" class="layui-input" disabled />
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md4">
                         <label class="layui-form-label">鎵�灞為」鐩�:</label>
                         <div class="layui-input-block">
-                            <input name="hostId$" placeholder="璇疯緭鍏ユ墍灞為」鐩�" class="layui-input"/>
+                            <input name="hostId$" placeholder="璇疯緭鍏ユ墍灞為」鐩�" class="layui-input" disabled/>
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">ccid:</label>
+                        <label class="layui-form-label">鏁呴殰绫诲瀷:</label>
                         <div class="layui-input-block">
-                            <input name="sim" placeholder="璇疯緭鍏im鍗″彿" class="layui-input"/>
+                            <input name="issueType$" placeholder="鏈煡" class="layui-input" disabled />
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">绯荤粺鐘舵��:</label>
+                        <label class="layui-form-label">宸℃浜哄憳:</label>
                         <div class="layui-input-block">
-                            <select name="status">
-                                <option value="1">鍚敤</option>
-                                <option value="0">绂佺敤</option>
-                            </select>
+                            <input name="discoverer" placeholder="鏈煡" class="layui-input" disabled />
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">娣诲姞鏃堕棿:</label>
+                        <label class="layui-form-label">鑱旂郴鏂瑰紡:</label>
                         <div class="layui-input-block">
-                            <input id="formAdvDateSel1" name="createTime$" placeholder="璇烽�夋嫨鏃ユ湡"
-                                   class="layui-input icon-date" autocomplete="off"/>
+                            <input name="tel" placeholder="鏈煡" class="layui-input" disabled />
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label ">娣诲姞浜哄憳:</label>
+                        <label class="layui-form-label">瑙e喅浜哄憳:</label>
                         <div class="layui-input-block">
-                            <input name="createBy$" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" class="layui-input"/>
+                            <input name="dealer" placeholder="璇疯緭鍏�..." class="layui-input" />
                         </div>
                     </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label ">鍦扮悊浣嶇疆:</label>
+                    <div class="layui-inline layui-col-md4">
+                        <label class="layui-form-label">鍙戠敓鏃ユ湡:</label>
                         <div class="layui-input-block">
-                            <input name="locationMore" placeholder="鏈煡" class="layui-input" disabled/>
+                            <input name="startTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off" disabled/>
                         </div>
                     </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label ">鍏蜂綋鎻忚堪:</label>
+                    <div class="layui-inline layui-col-md4">
+                        <label class="layui-form-label">澶勭悊鏃ユ湡:</label>
                         <div class="layui-input-block">
-                            <input name="desc" placeholder="鏆傛棤" class="layui-input"/>
+                            <input id="endTime" name="endTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="layui-inline layui-col-md4">
+                        <label class="layui-form-label">鏇存柊鏃ユ湡:</label>
+                        <div class="layui-input-block">
+                            <input id="lastTime" name="lastTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off"/>
                         </div>
                     </div>
                 </div>
 
             </div>
         </div>
-        <!-- 璁惧鍙傛暟 -->
+        <!-- 宸℃鏄庣粏 -->
         <div class="layui-card">
-            <div class="layui-card-header">璁惧鍙傛暟</div>
+            <div class="layui-card-header">宸℃鏄庣粏</div>
             <div class="layui-card-body">
-
                 <div class="layui-form-item layui-row">
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">涓婚-topic:</label>
+                    <div class="layui-inline layui-col-md12">
+                        <label class="layui-form-label">闂姒傝堪:</label>
                         <div class="layui-input-block">
-                            <input name="topic" placeholder="璇疯緭鍏ヤ富棰�" class="layui-input"/>
+                            <textarea name="title" placeholder="鏈煡" class="layui-textarea" disabled></textarea>
                         </div>
                     </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鍦板潃-ip:</label>
+                    <div class="layui-inline layui-col-md12">
+                        <label class="layui-form-label">鏁呴殰鍘熷洜:</label>
                         <div class="layui-input-block">
-                            <input name="ip" placeholder="璇疯緭鍏p鍦板潃" class="layui-input"/>
+                            <textarea name="reason" placeholder="璇疯緭鍏�..." class="layui-textarea"></textarea>
                         </div>
                     </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">绔彛-port:</label>
+                    <div class="layui-inline layui-col-md12">
+                        <label class="layui-form-label">瑙e喅鍔炴硶:</label>
                         <div class="layui-input-block">
-                            <input type="number" name="port" placeholder="璇疯緭鍏ョ鍙�" class="layui-input"
-                                   lay-verType="tips" lay-verify="number" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">淇″彿鍊�:</label>
-                        <div class="layui-input-block">
-                            <input type="number" name="signal" placeholder="璇疯緭鍏ヤ俊鍙峰��" class="layui-input"
-                                   lay-verType="tips" lay-verify="number" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鐢垫睜鐢甸噺:</label>
-                        <div class="layui-input-block">
-                            <input type="number" name="battery" placeholder="璇疯緭鍏ョ數閲�" class="layui-input"
-                                   lay-verType="tips" lay-verify="number" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鐜娓╁害-鈩�:</label>
-                        <div class="layui-input-block">
-                            <input type="number" name="tempe" placeholder="璇疯緭鍏ユ俯搴�" class="layui-input"
-                                   lay-verType="tips" lay-verify="number" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鍏呯數鐘舵��:</label>
-                        <div class="layui-input-block">
-                            <select name="charge">
-                                <option value="1">鍏呯數涓�</option>
-                                <option value="0">涓嶅湪鍏呯數</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鍊炬枩瑙掑害-掳:</label>
-                        <div class="layui-input-block">
-                            <input type="number" name="tiltZ" placeholder="鍊炬枩瑙掑害" class="layui-input"
-                                   lay-verType="tips" lay-verify="number" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鐮存崯鐘舵��:</label>
-                        <div class="layui-input-block">
-                            <select name="worn">
-                                <option value="1">宸茬牬鎹�</option>
-                                <option value="0">鏈牬鎹�</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">姘翠綅鎯呭喌:</label>
-                        <div class="layui-input-block">
-                            <select name="overflow">
-                                <option value="0">姘翠綅姝e父</option>
-                                <option value="1">姘翠綅瓒呮爣</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">鍏変紡鍔熻兘:</label>
-                        <div class="layui-input-block">
-                            <select name="agc">
-                                <option value="1">鏈�</option>
-                                <option value="0">娌℃湁</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">褰㈢姸:</label>
-                        <div class="layui-input-block">
-                            <select name="shape">
-                                <option value="1">鍦嗗舰</option>
-                                <option value="2">闀挎柟褰�</option>
-                                <option value="3">姝f柟褰�</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md4">
-                        <label class="layui-form-label">灏哄:</label>
-                        <div class="layui-input-block">
-                            <input type="number" name="size" placeholder="璇疯緭鍏ュ昂瀵�" class="layui-input"/>
+                            <textarea name="deal" placeholder="璇疯緭鍏�..." class="layui-textarea"></textarea>
                         </div>
                     </div>
                 </div>
-            </div>
-        </div>
-        <!-- 鎶ユ枃鏃ュ織 -->
-        <div class="layui-card">
-            <div class="layui-card-header">鎶ユ枃鏃ュ織</div>
-            <div class="layui-card-body">
-                <table id="sensorLogTable" lay-filter="sensorLogTable"></table>
             </div>
         </div>
     </div>
@@ -279,6 +192,7 @@
             <span class="issue-label"></span>
         </div>
         <button class="layui-btn" lay-filter="refresh" lay-submit><i class="layui-icon">&#xe666;</i>&emsp;鍒锋柊&emsp;</button>
+        <button class="layui-btn layui-btn-normal" lay-filter="save" lay-submit><i class="layui-icon">&#xe654;</i>&emsp;淇濆瓨&emsp;</button>
     </div>
 
 </form>
@@ -328,13 +242,11 @@
                         $('.issue-label').text(issue.uuid);
                         // 璁惧鏄庣粏
                         form.val('formAdvForm', issue);
-                        // 鏃ュ織琛ㄦ牸
-                        initLogTable(issue.id);
                         // 鍥剧墖
                         initImgs(issue.id, issue.imgArr);
-                        // 鍦ㄧ嚎鎯呭喌
                         $('.online-info').attr("class", issue.online?"online-info online-success":"online-info online-fail");
-                        $('.online-info').text(issue.online?"宸插畬鎴�":"浣滀笟涓�");
+                        $('.online-info').text(issue.settle$);
+                        layDateRender();
                     } else if (res.code === 403) {
                         top.location.href = baseUrl + "/";
                     } else {
@@ -344,64 +256,6 @@
             })
         }
 
-        /* 娓叉煋琛ㄦ牸 */
-        var LogTb;
-        function initLogTable(sensorId){
-            if (sensorId == null) {
-                return false;
-            }
-            if (typeof LogTb === "undefined") {
-                LogTb = table.render({
-                    elem: '#sensorLogTable',
-                    headers: {token: localStorage.getItem('token')},
-                    url: baseUrl+'/sensorLog/list/auth',
-                    where: {sensor_id: sensorId},
-                    page: true,
-                    limit: 10,
-                    limits: [10, 30, 50, 100, 200, 500],
-                    cols: [[
-                        {type: 'numbers', title: '#'}
-                        // ,{field: 'id', align: 'center',title: 'ID'}
-                        // ,{field: 'hostId$', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
-                        // ,{field: 'sensorId$', align: 'center',title: '璁惧缂栧彿'}
-                        // ,{field: 'senserType$', align: 'center',title: '璁惧绫诲瀷'}
-                        ,{field: 'data', align: 'center',title: '鎶ユ枃'}
-                        ,{field: 'createTime$', align: 'center',title: '鏃堕棿', minWidth: 200, width: 200}
-                        // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-                    ]],
-                    request: {
-                        pageName: 'curr',
-                        pageSize: 'limit'
-                    },
-                    parseData: function (res) {
-                        return {
-                            'code': res.code,
-                            'msg': res.msg,
-                            'count': res.data.total,
-                            'data': res.data.records
-                        }
-                    },
-                    response: {
-                        statusCode: 200
-                    },
-                    done: function(res, curr, count) {
-                        $('#sensorLogTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick', function(){
-                            var id = JSON.stringify($('#sensorLogTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover").data('index'));
-                            layer.open({
-                                type: 1,
-                                shade: false,
-                                area: '500px',
-                                title: false,
-                                content: "<div style='color: #ffffff;font-size: 18px;overflow: hidden;" +
-                                    "background-color: #5FB878;padding: 15px 10px;word-break:break-all;'>" + res.data[id].data + "</div>"
-                            });
-                        })
-                    }
-                });
-            } else {
-                LogTb.reload();
-            }
-        }
 
         /* 娓叉煋鍥剧墖 */
         function initImgs(sensorId, imgArr) {
@@ -456,16 +310,29 @@
         }
 
         /* 娓叉煋laydate */
-        laydate.render({
-            elem: '#createTime\\$',
-            type: 'datetime'
-        });
+        function layDateRender() {
+            laydate.render({
+                elem: '#endTime',
+                type: 'datetime'
+            });
+
+            laydate.render({
+                elem: '#lastTime',
+                type: 'datetime'
+            });
+        }
+        layDateRender();
+
 
         /* 鐩戝惉琛ㄥ崟鎻愪氦 */
         form.on('submit(refresh)', function (data) {
             init();
             return false;
         });
+        form.on('submit(save)', function (data) {
+            alert(1)
+            return false;
+        });
 
     });
 </script>

--
Gitblit v1.9.1