修改超时时间

liujun001
1 parent dd4c0cf6
Showing 7 changed files with 6 additions and 6 deletions
src/main/java/com/bsth/controller/video/VideoController.java
src/main/java/com/bsth/service/impl/videoimpl/VideoServiceImpl.java
src/main/resources/static/metronic_v4.5.4/layui/icon/bus1.png
src/main/resources/static/metronic_v4.5.4/layui/icon/company1.png
src/main/resources/static/metronic_v4.5.4/layui/icon/line.png
src/main/resources/static/metronic_v4.5.4/layui/icon/video1.ico
src/main/resources/static/other/video/video.html
@@ -158,7 +158,7 @@ public class VideoController {
                     tree.setType(401);
                     tree.setIcon("layui-icon-video");
                     String name = Objects.isNull(map.get("name")) ? map.get("channelId") + "_" + map.get("deviceId") : map.get("name").toString();
-                    tree.setText("<span><img src='/metronic_v4.5.4/layui/icon/movie.ico' class ='imageIcon' /></span><span>"+name+"</span>");
+                    tree.setText("<span><img src='/metronic_v4.5.4/layui/icon/video1.ico' class ='imageIcon' /></span><span>"+name+"</span>");
                     tree.setNodePValue(carNo);
                     trees.add(tree);
@@ -211,7 +211,7 @@ public class VideoServiceImpl implements VideoService {
         Iterator<Business> iterator = businessIterable.iterator();
         while (iterator.hasNext()) {
             Business business = iterator.next();
-            VideoTree videoTree = combinationVideoTree(business.getBusinessCode(), business.getBusinessName(), business.getUpCode(), business.getId(), null, "company", business.getBusinessCode());
+            VideoTree videoTree = combinationVideoTree(business.getBusinessCode(), business.getBusinessName(), business.getUpCode(), business.getId(), null, "company1", business.getBusinessCode());
             trees.add(videoTree);
         }
         List<VideoTree> groupTree = new ArrayList<>();
@@ -248,7 +248,7 @@ public class VideoServiceImpl implements VideoService {
     private VideoTree combinationVideoTree(Object id, String text, String parent, Object sourceId, Integer type, String icon, Object code) {
         VideoTree videoTree = new VideoTree();
         videoTree.setId(id);
-        videoTree.setText("<span><img src='/metronic_v4.5.4/layui/icon/"+icon+".ico' class ='imageIcon' /></span><span>"+text+"</span>");
+        videoTree.setText("<span><img src='/metronic_v4.5.4/layui/icon/"+icon+".png' class ='imageIcon' /></span><span>"+text+"</span>");
         videoTree.setSourceId(sourceId);
         videoTree.setNodePValue(parent);
         videoTree.setType(type);
@@ -267,7 +267,7 @@
             <div class="portlet-body">
                 <div>
                     <input type="text" placeholder="请输入车辆内部编号" autocomplete="off" class="layui-input" id="insideCode_like" style="display:inline-block;width: 200px"/>
-                    <button type="button" class="layui-btn layui-btn-primary" lay-on="get-vercode" onclick="queryTreeTable()">查询</button>
+                    <button type="button" class="layui-btn layui-btn-primary" lay-on="get-vercode" onclick="queryTreeTable()" data-i18n>$$$$$${txt-3841}</button>
                 </div>
                 <div id="video_tree" style="height: 91.5%;overflow:scroll"></div>
@@ -297,12 +297,12 @@
                         <div class="layui-tab-item" style="width: 100%;height: 90%">
                             <div class="layui-form-item" style="width: 100%; float: left">
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">$$$$$${txt-4004}</label>
+                                    <label class="layui-form-label" data-i18n>$$$$$${txt-4004}</label>
                                     <div class="layui-input-inline layui-input-wrap">
                                         <input type="text" placeholder="请选择需要查看的时间" autocomplete="off" class="layui-input" id="deviceVideoDate"/>
                                     </div>
                                     <div class="layui-form-mid" style="padding: 0!important;">
-                                        <button type="button" class="layui-btn layui-btn-primary" lay-on="get-vercode" id="queryDeviecChannel" onclick="deviceVidemoQueryHistory()">$$$$$${txt-3841}</button>
+                                        <button type="button" class="layui-btn layui-btn-primary" lay-on="get-vercode" id="queryDeviecChannel" onclick="deviceVidemoQueryHistory()" data-i18n>$$$$$${txt-3841}</button>
                                     </div>
                                 </div>
                                 <div class="layui-table-fixed-l" >