Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

@@ -158,6 +158,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function(res){
                                         if(res.data.cmdbSupplier){
                                             manufacturerName = res.data.cmdbSupplier.shortName;
@@ -248,6 +249,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function(res){
                                         if(res.data.cmdbSupplier){
                                             manufacturerName = res.data.cmdbSupplier.shortName;
@@ -310,6 +312,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
+                async: false,
                 success: function (res) {
                     var options = "<option value=''>=工作单位=</option>";
                     $.each(res.data, function (i, v) {

@@ -131,7 +131,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             });
 
         }
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
 
         //初始化日期插件
         function initDatePlus() {

@@ -80,7 +80,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                 saveForm()
             }
         })
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         //保存
         function saveForm() {
             layer.load(2)

@@ -127,6 +127,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                             var url =domainName +'/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&id='+d.machineRoomId+'&accessToken='+accessToken
                             $.ajax({
                                 url: url,
+                                async: false,
                                 success: function(res){
                                     $.each(res.data, function (i, v) {
                                         machineRoomName = v.shortName;
@@ -218,6 +219,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
             $.ajax({
                 url: url,
+                async: false,
                 success: function(res){
                     var options = "<option value=''>=归属机房=</option>";
                     $.each(res.data, function (i, v) {

@@ -49,7 +49,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 saveForm()
             }
         })
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         //保存
         function saveForm() {
 

@@ -163,6 +163,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function(res){
                                         if(res.data.cmdbSupplier){
                                             manufacturerName = res.data.cmdbSupplier.shortName;
@@ -253,6 +254,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                     var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
                                     $.ajax({
                                         url: url,
+                                        async: false,
                                         success: function(res){
                                             if(res.data.cmdbSupplier){
                                                 manufacturerName = res.data.cmdbSupplier.shortName;
@@ -357,6 +359,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
+                async: false,
                 success: function (res) {
                     var options = "<option value=''>=工作单位=</option>";
                     $.each(res.data, function (i, v) {

@@ -191,7 +191,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
         }
 
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         //初始化日期插件
         function initDatePlus() {
             currentDate = laydate.render({

@@ -397,6 +397,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
+                async: false,
                 success: function (res) {
                     var options = "<option value=''>=工作单位=</option>";
                     $.each(res.data, function (i, v) {
@@ -411,9 +412,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     form.render();
                 }
             });
-            var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=' + objectId + '&accessToken=' + accessToken
+            url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=' + objectId + '&accessToken=' + accessToken
             $.ajax({
                 url: url,
+                async: false,
                 success: function (res) {
                     var options = "<option value=''>=归属机房=</option>";
                     $.each(res.data, function (i, v) {
@@ -485,6 +487,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         value: 1
                     });
                 });
+                let zoomShow = false;
+                if (xData.length > 14) {
+                    zoomShow = true;
+                } else {
+                    zoomShow = false;
+                }
                 var series = [{
 
                     name: '设备进出',
@@ -604,7 +612,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                             }
                         }
                     }],
-                    series: series
+                    series: series,
+                    dataZoom: [//滚动条
+                        {
+                            show: zoomShow,
+                            type: 'slider',
+                            realtime: true,
+                            startValue: 0,
+                            endValue: 14,
+                            xAxisIndex: [0],
+                            bottom: '10',
+                            left: '30',
+                            height: 10,
+                            borderColor: 'rgba(0,0,0,0)',
+                            textStyle: {
+                                color: '#05D5FF',
+                            },
+                        },
+                    ]
                 };
                 timeChart.setOption(option)
             });

@@ -122,6 +122,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url =domainName +'/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&id='+d.machineRoomId+'&accessToken='+accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function(res){
                                         $.each(res.data, function (i, v) {
                                             machineRoomName = v.shortName;
@@ -147,6 +148,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function(res){
                                       if(res.data.cmdbSupplier){
                                           manufacturerName = res.data.cmdbSupplier.shortName;
@@ -239,6 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
+                async: false,
                 success: function (res) {
                     var options = "<option value=''>=工作单位=</option>";
                     $.each(res.data, function (i, v) {
@@ -253,9 +256,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     form.render();
                 }
             });
-            var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
+             url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId='+objectId+'&accessToken='+accessToken
             $.ajax({
                 url: url,
+                async: false,
                 success: function(res){
                     var options = "<option value=''>=归属机房=</option>";
                     $.each(res.data, function (i, v) {

@@ -130,6 +130,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url = domainName + '/cmdb-CI/supplier/find/' + d.manufacturerId + '?accessToken=' + accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function (res) {
                                         if (res.data.cmdbSupplier) {
                                             manufacturerName = res.data.cmdbSupplier.shortName;
@@ -206,6 +207,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
+                async: false,
                 success: function (res) {
                     var options = "<option value=''>=工作单位=</option>";
                     $.each(res.data, function (i, v) {

@@ -47,7 +47,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 saveForm()
             }
         })
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         //保存
         function saveForm() {
 

@@ -42,7 +42,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 saveForm()
             }
         })
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         //保存
         function saveForm() {
             layer.load(2)

@@ -161,6 +161,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         value: 1
                     });
                 });
+                let zoomShow = false;
+                if (xData.length > 16) {
+                    zoomShow = true;
+                } else {
+                    zoomShow = false;
+                }
                 var series = [{
                     name: '会议纪要数',
                     data: countList,
@@ -267,7 +273,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                             }
                         }
                     }],
-                    series: series
+                    series: series,
+                    dataZoom: [//滚动条
+                        {
+                            show: zoomShow,
+                            type: 'slider',
+                            realtime: true,
+                            startValue: 0,
+                            endValue: 14,
+                            xAxisIndex: [0],
+                            bottom: '10',
+                            left: '30',
+                            height: 10,
+                            borderColor: 'rgba(0,0,0,0)',
+                            textStyle: {
+                                color: '#05D5FF',
+                            },
+                        },
+                    ]
                 };
                 orgChart.setOption(option)
             });

@@ -208,7 +208,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
                             inside: false,
                             show:true,
                             textStyle: {
-                                color: '#000'
+                                color: '#a3a3a4'
                             },
                             rotate:60
                         },
@@ -229,7 +229,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
                         },
                         axisLabel: {
                             textStyle: {
-                                color: '#999'
+                                color: '#a3a3a4'
                             },
                             formatter:'{value}条'
                         }
@@ -247,9 +247,9 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
                                 color: new echarts.graphic.LinearGradient(
                                     0, 0, 0, 1,
                                     [
-                                        {offset: 0, color: '#83bff6'},
-                                        {offset: 0.5, color: '#188df0'},
-                                        {offset: 1, color: '#188df0'}
+                                        {offset: 0, color: '#1e90ff'},
+                                        {offset: 0.5, color: '#1e90ff'},
+                                        {offset: 1, color: '#1e90ff'}
                                     ]
                                 )
                             },
@@ -273,9 +273,9 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
                                     color: new echarts.graphic.LinearGradient(
                                         0, 0, 0, 1,
                                         [
-                                            {offset: 0, color: '#2378f7'},
-                                            {offset: 0.7, color: '#2378f7'},
-                                            {offset: 1, color: '#83bff6'}
+                                            {offset: 0, color: '#1e90ff'},
+                                            {offset: 0.7, color: '#1e90ff'},
+                                            {offset: 1, color: '#1e90ff'}
                                         ]
                                     )
                                 }
@@ -306,9 +306,9 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
             }
             var html = `
                         <div class="log-content-line1">
-                            <div style="width: 25%"><span>IP : </span>${item.host == null ? '-' : item.host}</div>
-                            <div style="width: 25%"><span>类型 : </span>${item.type == null ? '-' : item.type}</div>
-                            <div style="width: 50%"><span>标签 : </span><span>${item.tags == null || !item.tags? '-' : item.tags
+                            <div style="width: 33.3%"><span>IP : </span >${item.host == null ? '-' : item.host}</div>
+                            <div style="width: 33.3%"><span>类型 : </span>${item.type == null ? '-' : item.type}</div>
+                            <div style="width: 33.3%"><span>标签 : </span><span>${item.tags == null || !item.tags? '-' : item.tags
             }</span></div>
                         </div>
                         <div class="log-content-line2">${item.msg == null ? item.contents : item.msg}</div>
@@ -323,7 +323,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
 
             var cols = [
                 {type: 'numbers', title: '序号', align: 'center'},
-                {field: 'datetime', title: '时间', width: 180, height: '60px', align: 'center', sort: false},
+                {field: 'datetime', title: '时间', width: 280, height: '60px', align: 'center', sort: false},
                 {
                     field: 'contents1', title: '事件', align: 'center', sort: false, templet: function (d) {
                         return formartContents(d);

@@ -207,6 +207,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
             var databaseName =$("select#slt-resId").find("option:selected").text();
             $("input#databaseName").val(databaseName);
         })
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         // 初始化下拉框
         function loadSelect() {
             admin.req({

@@ -50,7 +50,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
 
 
         })
-
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
         //保存
         function saveForm() {
             layer.load(2)

@@ -38,6 +38,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
             }
         })
 
+        form.verify({
+            account: function(value, item){
+                var max = item.getAttribute('maxlength');
+                if(value.length > max){
+                    layer.msg('不能大于'+ max +'个字符的长度') ;
+                }
+            }
+        });
+
+
         //保存
         function saveForm() {
             layer.load(2)

@@ -96,6 +96,10 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
                 access_token: accessToken,
                 nickname: $('#userlist-condition-nickname').val()
             }
+            ,request: {
+                pageName: 'page' //页码的参数名称，默认：page
+                ,limitName: 'perPage' //每页数据量的参数名，默认：limit
+            }
             , cols: tableCols
             , limit: 20
             , limits: [300, 600, 900]

@@ -727,7 +727,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         type: 'value',
                         gridIndex: 0,
                         axisLabel: {
-                            color: '#333'
+                            color: '#a3a3a4'
                         },
                         splitLine: {
                             lineStyle: {

@@ -32,7 +32,7 @@
                     <label class="layui-form-label"><span
                             style="color: red;font-size: 16px">*</span>预案版本</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="title" id="title" lay-verify="required">
+                        <input type="text" class="layui-input" name="title" id="title" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
             </div>
@@ -49,7 +49,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="principal" id="principal" lay-verify="required">
+                        <input type="text" class="layui-input" name="principal" id="principal" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -64,7 +64,7 @@
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维人员</label>
                     <div class="layui-input-inline">
                         <input type="text" class="layui-input" name="operationUser" id="operationUser"
-                               lay-verify="required">
+                               lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -166,14 +166,14 @@
                 <label class="layui-form-label textarea-label" style="text-overflow: clip;"><span
                         style="color: red;font-size: 16px">*</span>缺陷/汇总</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" name="defect" maxlength="100" placeholder="方案缺陷/演练汇总"></textarea>
+                    <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="方案缺陷/演练汇总"></textarea>
                 </div>
             </div>
             <div class="layui-form-item">
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyA" id="partyA" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyA" id="partyA" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
@@ -188,7 +188,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>运维(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyB" id="partyB" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyB" id="partyB" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">

@@ -29,7 +29,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>升级文件/补丁版本</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="upgradeFiles" id="upgradeFiles" lay-verify="required">
+                        <input type="text" class="layui-input" name="upgradeFiles" id="upgradeFiles" lay-verify="required|account"  maxlength="50" onkeyup="if(this.value.length>50) this.value=this.value.substr(0,50)">
                     </div>
                 </div>
             </div>
@@ -37,7 +37,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="principal" id="principal" lay-verify="required">
+                        <input type="text" class="layui-input" name="principal" id="principal" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
@@ -51,7 +51,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>升级人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="upgradePerson"  id = "upgradePerson" lay-verify="required">
+                        <input type="text" class="layui-input" name="upgradePerson"  id = "upgradePerson" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">

@@ -32,7 +32,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备型号</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="deviceModel" id="deviceModel" lay-verify="required">
+                        <input type="text" class="layui-input" name="deviceModel" id="deviceModel" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
             </div>
@@ -59,7 +59,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required">
+                        <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
             </div>
@@ -87,7 +87,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>现物理位置</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="localPlace"  id= "localPlace" lay-verify="required">
+                        <input type="text" class="layui-input" name="localPlace"  id= "localPlace" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -99,7 +99,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>值班人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="watchkeeper"  id= "watchkeeper" lay-verify="required">
+                        <input type="text" class="layui-input" name="watchkeeper"  id= "watchkeeper" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
             </div>
@@ -107,26 +107,26 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required">
+                        <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>总集成</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="integration" id="integration" lay-verify="required">
+                        <input type="text" class="layui-input" name="integration" id="integration" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required">
+                        <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>进入事由</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required"></textarea>
+                    <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required|account"  maxlength="300" onkeyup="if(this.value.length>300) this.value=this.value.substr(0,300)" ></textarea>
                 </div>
             </div>
             <button type="submit" lay-submit lay-filter="device-form-save-id" class="layui-btn hide"

@@ -29,7 +29,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备名称</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="deviceInfo" id="deviceInfo" lay-verify="required">
+                        <input type="text" class="layui-input" name="deviceInfo" id="deviceInfo" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
             </div>
@@ -37,7 +37,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>故障发现人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="hitchDiscover" id="hitchDiscover" lay-verify="required">
+                        <input type="text" class="layui-input" name="hitchDiscover" id="hitchDiscover" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -67,7 +67,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required">
+                        <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -81,7 +81,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>维修人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="repairer"  id= "repairer" lay-verify="required">
+                        <input type="text" class="layui-input" name="repairer"  id= "repairer" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -148,7 +148,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label textarea-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>故障现象描述</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" name="hitchDesc" maxlength="20" placeholder="故障现象描述"></textarea>
+                    <textarea class="layui-textarea" name="hitchDesc" maxlength="200" placeholder="故障现象描述"></textarea>
                 </div>
             </div>
             <div class="layui-form-item">
@@ -161,13 +161,13 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyA" id="partyA" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyA" id="partyA" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>乙方(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyB" id="partyB" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyB" id="partyB" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
             </div>

@@ -21,7 +21,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>加班人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="extraWorker" id="extraWorker" lay-verify="required">
+                        <input type="text" class="layui-input" name="extraWorker" id="extraWorker" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -55,13 +55,13 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>加班时长(小时)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="extraDuration" id="extraDuration" lay-verify="required">
+                        <input type="text" class="layui-input" name="extraDuration" id="extraDuration" lay-verify="required|account"  maxlength="3" onkeyup="if(this.value.length>5) this.value=this.value.substr(0,3)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird" >
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>甲方负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required">
+                        <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -100,7 +100,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>甲方确认签字</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partA" id="partA" lay-verify="required">
+                        <input type="text" class="layui-input" name="partA" id="partA" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">

@@ -20,7 +20,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>会议室</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="meetingRoom" id="meetingRoom" lay-verify="required">
+                        <input type="text" class="layui-input" name="meetingRoom" id="meetingRoom" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
             </div>
@@ -48,7 +48,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联调人员</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="unitadjustPerson" id="unitadjustPerson" lay-verify="required">
+                        <input type="text" class="layui-input" name="unitadjustPerson" id="unitadjustPerson" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -62,13 +62,13 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>会议主办处室负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="sponsorPrincipal"  id= "sponsorPrincipal" lay-verify="required">
+                        <input type="text" class="layui-input" name="sponsorPrincipal"  id= "sponsorPrincipal" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>信息中心负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="ticPrincipal"  id= "ticPrincipal" lay-verify="required" >
+                        <input type="text" class="layui-input" name="ticPrincipal"  id= "ticPrincipal" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
 
                     </div>
                 </div>
@@ -78,7 +78,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label"><span style="color: red">*</span>经办人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="transactorPerson" id="transactorPerson" lay-verify="required">
+                        <input type="text" class="layui-input" name="transactorPerson" id="transactorPerson" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">

@@ -28,7 +28,7 @@
                         <div class="pie-chart" id="chart-meetingsummary-report" style="min-height: 240px"></div>
                     </div>
                 </div>
-                <div class="layui-card-body" style="margin-top: 10px;">
+                <div class="layui-card-body" style="margin-top: 20px;">
                     <div style="display: flex">
                         <form class="layui-form layui-card-header" onsubmit="return false"
                               lay-filter="form-meetingsummary-condition">

@@ -46,7 +46,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请单位</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="applyCity" id="applyCity" lay-verify="required">
+                        <input type="text" class="layui-input" name="applyCity" id="applyCity" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -60,13 +60,13 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>端口速率</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="portSpeed" id="portSpeed" lay-verify="required">
+                        <input type="text" class="layui-input" name="portSpeed" id="portSpeed" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>线路速率</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="electricSpeed" id="electricSpeed" lay-verify="required">
+                        <input type="text" class="layui-input" name="electricSpeed" id="electricSpeed" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">

@@ -24,13 +24,13 @@
                                 lay-filter="slt-staffadd-group" lay-verify="required">
                             <option value="">=工作单位=</option>
                         </select>
-                        <input type="text" name="manufacturerOther" id="manufacturerOther"  lay-filter="manufacturerOther"  class="layui-input" style="display: none">
+                        <input type="text" name="manufacturerOther" id="manufacturerOther"  lay-filter="manufacturerOther"  oninput="wordLeg(this);" maxlength="100" onchange="if(value.length>100) value=value.substr(0,100)"  class="layui-input" style="display: none">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required">
+                        <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" >
                     </div>
                 </div>
             </div>
@@ -58,19 +58,19 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label" ><span style="color: red;font-size: 16px">*</span>机房负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required">
+                        <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label" ><span style="color: red;font-size: 16px">*</span>项目管理员</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required">
+                        <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required">
+                        <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
             </div>
@@ -78,20 +78,20 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>携带物品</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="belongings" id="belongings" lay-verify="required">
+                        <input type="text" class="layui-input" name="belongings" id="belongings" lay-verify="required|account"  maxlength="150" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,150)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>值班人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="watchkeeper"  id= "watchkeeper" lay-verify="required">
+                        <input type="text" class="layui-input" name="watchkeeper"  id= "watchkeeper" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>进入事由</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required"></textarea>
+                    <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required|account"  maxlength="150" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,150)"></textarea>
                 </div>
             </div>
             <button type="submit" lay-submit lay-filter="staff-form-save-id" class="layui-btn hide"

@@ -117,12 +117,12 @@
     .log-content-line1 div{
         width: 33%;
         text-align: left;
-        font-weight: 100;
-        color: #000;
+        font-size: 12px;
+        color: #a3a3a4;
     }
 
     .log-content-line1 div span{
-
+        color: #a3a3a4;
     }
 
     .log-content-line2{

@@ -37,7 +37,7 @@
                 <div class="layui-inline inline-onethird">
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="principal" id="principal" lay-verify="required">
+                        <input type="text" class="layui-input" name="principal" id="principal" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -61,7 +61,7 @@
                     <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维负责人</label>
                     <div class="layui-input-inline">
                         <input type="text" class="layui-input" name="operationUser" id="operationUser"
-                               lay-verify="required">
+                               lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-onethird">
@@ -132,7 +132,7 @@
                     <label class="layui-form-label" style="width: 160px"><span
                             style="color: red;font-size: 16px">*</span>恢复方式</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="recoverMethod" id="recoverMethod" lay-verify="required"/>
+                        <input type="text" class="layui-input" name="recoverMethod" id="recoverMethod" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"/>
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
@@ -186,7 +186,7 @@
                 <label class="layui-form-label textarea-label" style="text-overflow: clip;width: 120px"><span
                         style="color: red;font-size: 16px">*</span>恢复验证缺陷</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" name="defect" maxlength="100" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea>
+                    <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea>
                 </div>
             </div>
             <fieldset class="layui-elem-field layui-field-title">
@@ -196,7 +196,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>运维负责人(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyOperation" id="partyOperation" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyOperation" id="partyOperation" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
@@ -211,7 +211,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>实施人(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyImplemented" id="partyImplemented" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyImplemented" id="partyImplemented" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
@@ -226,7 +226,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>甲方(确认签字)</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="partyA" id="partyA" lay-verify="required">
+                        <input type="text" class="layui-input" name="partyA" id="partyA" lay-verify="required|account"  maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
                     </div>
                 </div>
                 <div class="layui-inline inline-half">