monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 6d18452712dbc282f61c101c87af8d078179a835 2 parents b296f2b2 a03edd04

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

Inline Side-by-side
Showing 18 changed files with 171 additions and 324 deletions
@@ -976,6 +976,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'msgTips' @@ -976,6 +976,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'msgTips'
976 $("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>'); 976 $("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
977 }); 977 });
978 } 978 }
  979 +
  980 + $('#indexActiveAlarmList').on('click','li[data-id]',function(){
  981 + let win = window.parent;
  982 + if (win) {
  983 + window.parent.postMessage({
  984 + type: 'openResAlarmDetail',
  985 + message: {
  986 + params:{
  987 + 'resId':$(this).data('id'),
  988 + 'batchNo':$(this).data('batchNo'),
  989 + },
  990 + title:'',
  991 + }
  992 + }, '*')
  993 + }
  994 + })
979 /** 995 /**
980 * 跳转到告警管理 996 * 跳转到告警管理
981 * bizId 业务id 997 * bizId 业务id
@@ -127,7 +127,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -127,7 +127,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
127 field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) { 127 field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) {
128 var manufacturerName = ''; 128 var manufacturerName = '';
129 if(d.omanufacturerId == '0'){ 129 if(d.omanufacturerId == '0'){
130 - manufacturerName = d.manufacturerOther; 130 + manufacturerName = '其他';
131 }else { 131 }else {
132 if(manufactureArr && manufactureArr.length>0){ 132 if(manufactureArr && manufactureArr.length>0){
133 $.each(manufactureArr, function (i, v) { 133 $.each(manufactureArr, function (i, v) {
@@ -96,6 +96,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -96,6 +96,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
96 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken 96 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
97 $.ajax({ 97 $.ajax({
98 url: url, 98 url: url,
  99 + async: false,
99 success: function(res){ 100 success: function(res){
100 if(res.data.cmdbSupplier){ 101 if(res.data.cmdbSupplier){
101 manufacturerName = res.data.cmdbSupplier.shortName; 102 manufacturerName = res.data.cmdbSupplier.shortName;
@@ -257,6 +258,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -257,6 +258,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
257 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 258 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
258 $.ajax({ 259 $.ajax({
259 url: url, 260 url: url,
  261 + async: false,
260 success: function (res) { 262 success: function (res) {
261 $.each(res.data, function (i, v) { 263 $.each(res.data, function (i, v) {
262 var obj = {}; 264 var obj = {};
@@ -230,7 +230,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -230,7 +230,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
230 }; 230 };
231 231
232 var option = { 232 var option = {
233 - color: ['#367bec', '#00cefc'], 233 + color: ['#367bec', '#00cefc','#ff2618'],
234 title: [{ 234 title: [{
235 text: '{val|' + total + '}', 235 text: '{val|' + total + '}',
236 top: 'center', 236 top: 'center',
@@ -27,7 +27,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -27,7 +27,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
27 var where = {} 27 var where = {}
28 var url = '' 28 var url = ''
29 var historywarningTable = {} 29 var historywarningTable = {}
30 - 30 + var datas = data.datas;
  31 + var nextId = id;
31 var viewType = data && data.viewType ? data.viewType : ''; 32 var viewType = data && data.viewType ? data.viewType : '';
32 init() 33 init()
33 $('#workReport_type').val(data.repType) 34 $('#workReport_type').val(data.repType)
@@ -49,6 +50,81 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -49,6 +50,81 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
49 saveForm() 50 saveForm()
50 } 51 }
51 }) 52 })
  53 + $("#workReport-form-next-id").on('click', function () {
  54 + if (datas.length > 0) {
  55 + var datas1 = {};
  56 + for (let i = 0; i < datas.length; i++) {
  57 + if (datas[i].id == nextId) {
  58 + datas1 = datas[(datas[i].LAY_TABLE_INDEX + 1)];
  59 + if (datas1 != undefined) {
  60 + nextId = datas1.id;
  61 + var title = datas1.createUserNickName+'-'+datas1.repTitle
  62 + // window.parent.postMessage({'title':title},"*");
  63 + $(".layui-card-body.workReport").find(".layui-field-title").html("<legend>"+title+"</legend>");
  64 + form.render(null, 'add-workReport-form');
  65 + form.val('add-workReport-form', datas1);
  66 + var time = ''
  67 + time = datas1.createTime
  68 + var userArr = []
  69 + $.each(datas1.reportUserList, function (i, v) {
  70 + userArr.push(v.userName)
  71 + })
  72 + userSelect.setValue(userArr)
  73 + if (datas1.attachmentList.length != 0) {
  74 + $.each(datas1.attachmentList, function (i, v) {
  75 + writeTagsInfo(v.id, v.originalName)
  76 + })
  77 + }
  78 + cols.push({
  79 + field: 'alarmStatus', title: '告警状态', align: 'center', minWidth: 100,
  80 + templet: function (d) {
  81 + var str = ''
  82 + if (d.alarmStatus == '0') {
  83 + str = '告警'
  84 + } else if (d.alarmStatus == '1') {
  85 + str = '关闭'
  86 + }
  87 + return `<div><span>${str}</span></div>`
  88 + }
  89 + }
  90 + , {
  91 + field: 'clearType', title: '消除类型', align: 'center', minWidth: 100,
  92 + templet: function (d) {
  93 + var str = ''
  94 + if (d.clearType == '0') {
  95 + str = '自动消除'
  96 + } else if (d.clearType == '1') {
  97 + str = '手动消除'
  98 + }
  99 + return `<div><span>${str}</span></div>`
  100 + }
  101 + }
  102 + , {field: 'clearUserId', title: '消除人', align: 'center', minWidth: 100,}
  103 + , {field: 'clearTime', title: '消除时间', align: 'center', minWidth: 180,}
  104 + , {field: 'clearReason', title: '消除原因', align: 'center', minWidth: 250})
  105 + where = {access_token: accessToken, reportId: nextId, time: time}
  106 + url = domainName + '/api-web/workreport/getAlarmListByReportId'
  107 + getAlarmInfo(where, cols, url)
  108 + admin.req({
  109 + url: domainName + '/api-web/workreport/setRead',
  110 + data: {workReportIds: [nextId]}
  111 + }).done(function (response) {
  112 + if (response.success) {
  113 + }
  114 + });
  115 + return;
  116 + } else {
  117 + layer.msg('当前页已读完', {
  118 + offset: '15px',
  119 + icon: 7,
  120 + time: 1000,
  121 + })
  122 + }
  123 + }
  124 + }
  125 +
  126 + }
  127 + })
52 128
53 //表单验证 129 //表单验证
54 form.verify({ 130 form.verify({
@@ -225,7 +301,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -225,7 +301,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
225 async: false, 301 async: false,
226 done: function (res) { 302 done: function (res) {
227 form.val('add-workReport-form', res.object) 303 form.val('add-workReport-form', res.object)
228 - time = res.object.createTime 304 + time = res.object.createTime;
  305 + var title = res.object.createUserNickName+'-'+ res.object.repTitle
  306 + // window.parent.postMessage({'title':title},"*");
  307 + $(".layui-card-body.workReport").find(".layui-field-title").html(" <legend>"+title+"</legend>");
229 var userArr = [] 308 var userArr = []
230 $.each(res.object.reportUserList, function (i, v) { 309 $.each(res.object.reportUserList, function (i, v) {
231 userArr.push(v.userName) 310 userArr.push(v.userName)
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
12 //对外暴露的接口 12 //对外暴露的接口
13 exports("workReportIndex", function () { 13 exports("workReportIndex", function () {
14 var accessToken = common.getMjToken(); 14 var accessToken = common.getMjToken();
15 - var createTime = 'today' 15 + var createTime = 'thisWeek'
16 var isRead = '' 16 var isRead = ''
17 var repType = '' 17 var repType = ''
18 18
@@ -15,7 +15,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -15,7 +15,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
15 var companyChart = echarts.init(document.getElementById('chart-company-report')); 15 var companyChart = echarts.init(document.getElementById('chart-company-report'));
16 var noReadChart = echarts.init(document.getElementById('chart-noRead-report')); 16 var noReadChart = echarts.init(document.getElementById('chart-noRead-report'));
17 var dateLimit = "" 17 var dateLimit = ""
18 - var createTime = "today" 18 + var createTime = "thisWeek"
19 var type = '' 19 var type = ''
20 var urlRepType = '' 20 var urlRepType = ''
21 var manufacturerId = '' 21 var manufacturerId = ''
@@ -55,7 +55,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -55,7 +55,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
55 done: function (value) { 55 done: function (value) {
56 dateLimit = value 56 dateLimit = value
57 if (dateLimit == '') { 57 if (dateLimit == '') {
58 - $('[data-period="today"]').click() 58 + $('[data-period="thisWeek"]').click()
59 } else { 59 } else {
60 $.each($("button.date"), function (i, e) { 60 $.each($("button.date"), function (i, e) {
61 var $dom = $(e); 61 var $dom = $(e);
@@ -166,13 +166,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -166,13 +166,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
166 // 加载工作汇报表格 166 // 加载工作汇报表格
167 function loadWorkReportTable() { 167 function loadWorkReportTable() {
168 var conditions = form.val('form-workreport-condition'); 168 var conditions = form.val('form-workreport-condition');
169 - $.each($("button.isRead"), function (i, e) { 169 + $.each($("button.isRead"),function (i,e) {
170 var $dom = $(e); 170 var $dom = $(e);
171 - if ($dom.hasClass("active")) { 171 + if($dom.hasClass("active")){
172 conditions["currIsRead"] = $dom.data("type") 172 conditions["currIsRead"] = $dom.data("type")
173 } 173 }
174 }) 174 })
175 - if (manufacturerId != '') { 175 + if(manufacturerId!=''){
176 conditions.manufacturerName = manufacturerId; 176 conditions.manufacturerName = manufacturerId;
177 } 177 }
178 Object.assign(conditions, { 178 Object.assign(conditions, {
@@ -263,31 +263,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -263,31 +263,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
263 }, { 263 }, {
264 field: 'createUserNickName', title: '汇报人', align: 'center', 264 field: 'createUserNickName', title: '汇报人', align: 'center',
265 }, { 265 }, {
266 - field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {  
267 - var manufacturerName = '';  
268 - if(d.manufacturerName == '0'){  
269 - manufacturerName = d.manufacturerOther;  
270 - }else {  
271 - if(manufactureArr && manufactureArr.length>0){  
272 - $.each(manufactureArr, function (i, v) {  
273 - if(d.manufacturerName==v.id) {  
274 - manufacturerName = v.name;  
275 - }  
276 - })  
277 - }else{  
278 - var url = domainName + '/cmdb-CI/supplier/find/'+d.machineRoomId+'?accessToken='+accessToken  
279 - $.ajax({  
280 - url: url,  
281 - success: function(res){  
282 - if(res.data.cmdbSupplier){  
283 - manufacturerName = res.data.cmdbSupplier.shortName;  
284 - }  
285 - }  
286 - });  
287 - }  
288 - }  
289 - return manufacturerName;  
290 - } 266 + field: 'manufacturerName', title: '厂商', align: 'center'
291 }, { 267 }, {
292 field: 'createTime', title: '上报时间', align: 'center', 268 field: 'createTime', title: '上报时间', align: 'center',
293 }]], 269 }]],
@@ -307,8 +283,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -307,8 +283,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
307 table.on('tool(table-workreport-view)', function (obj) { 283 table.on('tool(table-workreport-view)', function (obj) {
308 var data = obj.data; 284 var data = obj.data;
309 if (obj.event === 'serRead') { 285 if (obj.event === 'serRead') {
310 -  
311 var id = data['id']; 286 var id = data['id'];
  287 + var datas = layui.table.cache["table-workreport-view"];
312 var repType = data['repType']; 288 var repType = data['repType'];
313 admin.req({ 289 admin.req({
314 url: domainName + '/api-web/workreport/setRead', 290 url: domainName + '/api-web/workreport/setRead',
@@ -318,20 +294,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -318,20 +294,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
318 obj.update({ 294 obj.update({
319 currIsRead: "1" 295 currIsRead: "1"
320 }); 296 });
321 - loadReadReport(); 297 + reloadAllChange();
322 } 298 }
323 }); 299 });
324 - common.openWin('workreport/add', '查看', {  
325 - id: id,  
326 - repType: repType,  
327 - viewType: 'view'  
328 - }, ['关闭'], function f() {  
329 - return true;  
330 - }, null, null, {  
331 - success: function () {  
332 - form.render();  
333 - }  
334 - }) 300 + common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() {
  301 + $("#workReport-form-next-id").trigger("click");
  302 + reloadAllChange();
  303 + });
335 } 304 }
336 }); 305 });
337 306
@@ -340,6 +309,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -340,6 +309,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
340 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 309 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
341 $.ajax({ 310 $.ajax({
342 url: url, 311 url: url,
  312 + async: false,
343 success: function (res) { 313 success: function (res) {
344 var options = "<option value=''>=选择厂商=</option>"; 314 var options = "<option value=''>=选择厂商=</option>";
345 $.each(res.data, function (i, v) { 315 $.each(res.data, function (i, v) {
@@ -171,7 +171,7 @@ @@ -171,7 +171,7 @@
171 </div> 171 </div>
172 <div class="layui-form-item"> 172 <div class="layui-form-item">
173 <div class="layui-inline inline-half"> 173 <div class="layui-inline inline-half">
174 - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方(确认签字)</label> 174 + <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方确认签字</label>
175 <div class="layui-input-inline"> 175 <div class="layui-input-inline">
176 <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)"> 176 <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)">
177 </div> 177 </div>
@@ -186,7 +186,7 @@ @@ -186,7 +186,7 @@
186 </div> 186 </div>
187 <div class="layui-form-item"> 187 <div class="layui-form-item">
188 <div class="layui-inline inline-half"> 188 <div class="layui-inline inline-half">
189 - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>运维(确认签字)</label> 189 + <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>乙方确认签字</label>
190 <div class="layui-input-inline"> 190 <div class="layui-input-inline">
191 <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)"> 191 <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)">
192 </div> 192 </div>
@@ -211,46 +211,3 @@ @@ -211,46 +211,3 @@
211 fn({{d}}); 211 fn({{d}});
212 }) 212 })
213 </script> 213 </script>
214 -  
215 -<style>  
216 - #add-emergency-form .layui-form-label {  
217 - width: 120px;  
218 - /* padding: 8px 12px; */  
219 - text-align: left !important;  
220 - }  
221 -  
222 - #add-emergency-form .layui-input-block {  
223 - margin-left: 120px !important;  
224 - }  
225 -  
226 - .tags {  
227 - margin-top: 5px;  
228 - }  
229 -  
230 - .layui-textarea {  
231 - width: 97%;  
232 - }  
233 -  
234 - .tags span {  
235 - height: 20px;  
236 - margin-right: 10px;  
237 - margin-bottom: 3px;  
238 - padding: 5px 10px 5px 10px;  
239 - float: left;  
240 - white-space: nowrap;  
241 - color: #fff;  
242 - background-color: #009688;  
243 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
244 - }  
245 -  
246 - .tagsclose {  
247 - font-weight: bold;  
248 - line-height: 20px;  
249 - margin-left: 10px;  
250 - cursor: pointer;  
251 - text-align: center;  
252 - color: #fff;  
253 - border: 0 none;  
254 - background: transparent none repeat scroll 0 0;  
255 - }  
256 -</style>  
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 {{# var alarmLevelClas = 'warn-normal'}} 89 {{# var alarmLevelClas = 'warn-normal'}}
90 {{# if(item.alarmLevel == 3){ alarmLevelClas = 'warn-worst' } }} 90 {{# if(item.alarmLevel == 3){ alarmLevelClas = 'warn-worst' } }}
91 {{# if(item.alarmLevel == 2){ alarmLevelClas = 'warn-worse' } }} 91 {{# if(item.alarmLevel == 2){ alarmLevelClas = 'warn-worse' } }}
92 - <li data-id="{{item.id}}" title="{{item.alarmContent}}"> 92 + <li style="cursor: pointer;" data-id="{{item.id}}" title="{{item.alarmContent}}" data-batch-no="{{item.batchNo}}">
93 <i class="icon-level {{alarmLevelClas}}">{{index+1}}</i> 93 <i class="icon-level {{alarmLevelClas}}">{{index+1}}</i>
94 <span>{{item.updateTime}}</span> 94 <span>{{item.updateTime}}</span>
95 <p>{{item.alarmContent}}</p> 95 <p>{{item.alarmContent}}</p>
@@ -34,13 +34,19 @@ @@ -34,13 +34,19 @@
34 </div> 34 </div>
35 </div> 35 </div>
36 <div class="layui-form-item"> 36 <div class="layui-form-item">
37 - <div class="layui-inline inline-half"> 37 + <div class="layui-inline inline-onethird">
  38 + <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label>
  39 + <div class="layui-input-inline">
  40 + <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required">
  41 + </div>
  42 + </div>
  43 + <div class="layui-inline inline-onethird">
38 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label> 44 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label>
39 <div class="layui-input-inline"> 45 <div class="layui-input-inline">
40 <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)"> 46 <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)">
41 </div> 47 </div>
42 </div> 48 </div>
43 - <div class="layui-inline inline-half"> 49 + <div class="layui-inline inline-onethird">
44 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> 50 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label>
45 <div class="layui-input-inline"> 51 <div class="layui-input-inline">
46 <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> 52 <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone">
@@ -72,14 +78,8 @@ @@ -72,14 +78,8 @@
72 78
73 </div> 79 </div>
74 <div class="layui-form-item"> 80 <div class="layui-form-item">
75 - <div class="layui-inline inline-half">  
76 - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label>  
77 - <div class="layui-input-inline">  
78 - <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required">  
79 - </div>  
80 - </div>  
81 - <div class="layui-inline inline-half">  
82 - <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>升级时间段</label> 81 + <div class="layui-inline inline-onethird">
  82 + <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>升级时间段</label>
83 <div class="layui-input-inline"> 83 <div class="layui-input-inline">
84 <input type="text" class="layui-input" name="upgradeperiod" id= "upgradeperiod" lay-verify="required" > 84 <input type="text" class="layui-input" name="upgradeperiod" id= "upgradeperiod" lay-verify="required" >
85 </div> 85 </div>
@@ -130,37 +130,3 @@ @@ -130,37 +130,3 @@
130 }) 130 })
131 </script> 131 </script>
132 132
133 -<style>  
134 - #add-bizupgrade-form .layui-form-label {  
135 - width: 120px;  
136 - /* padding: 8px 12px; */  
137 - text-align: left !important;  
138 - }  
139 - #add-bizupgrade-form .layui-input-block{  
140 - margin-left: 120px !important;  
141 - }  
142 - .tags{  
143 - margin-top:5px;  
144 - }  
145 - .tags span {  
146 - height: 20px;  
147 - margin-right: 10px;  
148 - margin-bottom: 3px;  
149 - padding: 5px 10px 5px 10px;  
150 - float: left;  
151 - white-space: nowrap;  
152 - color:#fff;  
153 - background-color:#009688;  
154 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
155 - }  
156 - .tagsclose {  
157 - font-weight: bold;  
158 - line-height: 20px;  
159 - margin-left:10px;  
160 - cursor: pointer;  
161 - text-align: center;  
162 - color: #fff;  
163 - border: 0 none;  
164 - background: transparent none repeat scroll 0 0;  
165 - }  
166 -</style>  
@@ -159,13 +159,13 @@ @@ -159,13 +159,13 @@
159 </div> 159 </div>
160 <div class="layui-form-item"> 160 <div class="layui-form-item">
161 <div class="layui-inline inline-half"> 161 <div class="layui-inline inline-half">
162 - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方(确认签字)</label> 162 + <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方确认签字</label>
163 <div class="layui-input-inline"> 163 <div class="layui-input-inline">
164 <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)"> 164 <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)">
165 </div> 165 </div>
166 </div> 166 </div>
167 <div class="layui-inline inline-half"> 167 <div class="layui-inline inline-half">
168 - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>乙方(确认签字)</label> 168 + <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>乙方确认签字</label>
169 <div class="layui-input-inline"> 169 <div class="layui-input-inline">
170 <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)"> 170 <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)">
171 </div> 171 </div>
@@ -198,37 +198,3 @@ @@ -198,37 +198,3 @@
198 }) 198 })
199 </script> 199 </script>
200 200
201 -<style>  
202 - #add-devicehitch-form .layui-form-label {  
203 - width: 120px;  
204 - /* padding: 8px 12px; */  
205 - text-align: left !important;  
206 - }  
207 - #add-devicehitch-form .layui-input-block{  
208 - margin-left: 120px !important;  
209 - }  
210 - .tags{  
211 - margin-top:5px;  
212 - }  
213 - .tags span {  
214 - height: 20px;  
215 - margin-right: 10px;  
216 - margin-bottom: 3px;  
217 - padding: 5px 10px 5px 10px;  
218 - float: left;  
219 - white-space: nowrap;  
220 - color:#fff;  
221 - background-color:#009688;  
222 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
223 - }  
224 - .tagsclose {  
225 - font-weight: bold;  
226 - line-height: 20px;  
227 - margin-left:10px;  
228 - cursor: pointer;  
229 - text-align: center;  
230 - color: #fff;  
231 - border: 0 none;  
232 - background: transparent none repeat scroll 0 0;  
233 - }  
234 -</style>  
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </div> 53 </div>
54 <div class="layui-form-item"> 54 <div class="layui-form-item">
55 <div class="layui-inline inline-onethird"> 55 <div class="layui-inline inline-onethird">
56 - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>加班时长(小时)</label> 56 + <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>加班时长</label>
57 <div class="layui-input-inline"> 57 <div class="layui-input-inline">
58 <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)"> 58 <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)">
59 </div> 59 </div>
@@ -122,38 +122,3 @@ @@ -122,38 +122,3 @@
122 fn({{d}}) 122 fn({{d}})
123 }) 123 })
124 </script> 124 </script>
125 -  
126 -<style>  
127 - #add-extra-form .layui-form-label {  
128 - width: 120px;  
129 - /* padding: 8px 12px; */  
130 - text-align: left !important;  
131 - }  
132 - #add-extra-form .layui-input-block{  
133 - margin-left: 120px !important;  
134 - }  
135 - .tags{  
136 - margin-top:5px;  
137 - }  
138 - .tags span {  
139 - height: 20px;  
140 - margin-right: 10px;  
141 - margin-bottom: 3px;  
142 - padding: 5px 10px 5px 10px;  
143 - float: left;  
144 - white-space: nowrap;  
145 - color:#fff;  
146 - background-color:#009688;  
147 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
148 - }  
149 - .tagsclose {  
150 - font-weight: bold;  
151 - line-height: 20px;  
152 - margin-left:10px;  
153 - cursor: pointer;  
154 - text-align: center;  
155 - color: #fff;  
156 - border: 0 none;  
157 - background: transparent none repeat scroll 0 0;  
158 - }  
159 -</style>  
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 id="add-meetingApply-form" onsubmit="return false;"> 8 id="add-meetingApply-form" onsubmit="return false;">
9 <input hidden name="id" id="id" lay-verify="checkReportIsExist"> 9 <input hidden name="id" id="id" lay-verify="checkReportIsExist">
10 <div class="layui-form-item"> 10 <div class="layui-form-item">
11 - <div class="layui-inline inline-half"> 11 + <div class="layui-inline inline-onethird">
12 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>主办处室</label> 12 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>主办处室</label>
13 <div class="layui-input-inline"> 13 <div class="layui-input-inline">
14 <select name="orgCode" id="slt-mettingAdd-org" 14 <select name="orgCode" id="slt-mettingAdd-org"
@@ -17,27 +17,20 @@ @@ -17,27 +17,20 @@
17 </select> 17 </select>
18 </div> 18 </div>
19 </div> 19 </div>
20 - <div class="layui-inline inline-half"> 20 + <div class="layui-inline inline-onethird">
21 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>会议室</label> 21 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>会议室</label>
22 <div class="layui-input-inline"> 22 <div class="layui-input-inline">
23 <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)"> 23 <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)">
24 </div> 24 </div>
25 </div> 25 </div>
26 - </div>  
27 - <div class="layui-form-item">  
28 - <div class="layui-inline inline-half">  
29 - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联调时间</label>  
30 - <div class="layui-input-inline">  
31 - <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required">  
32 - </div>  
33 - </div>  
34 - <div class="layui-inline inline-half"> 26 + <div class="layui-inline inline-onethird">
35 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>会议时间</label> 27 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>会议时间</label>
36 <div class="layui-input-inline"> 28 <div class="layui-input-inline">
37 <input type="text" class="layui-input" name="mettingTime" id="mettingTime" lay-verify="required"> 29 <input type="text" class="layui-input" name="mettingTime" id="mettingTime" lay-verify="required">
38 </div> 30 </div>
39 </div> 31 </div>
40 </div> 32 </div>
  33 +
41 <div class="layui-form-item"> 34 <div class="layui-form-item">
42 <div class="layui-inline inline-onethird"> 35 <div class="layui-inline inline-onethird">
43 <label class="layui-form-label">会议编号</label> 36 <label class="layui-form-label">会议编号</label>
@@ -52,20 +45,27 @@ @@ -52,20 +45,27 @@
52 </div> 45 </div>
53 </div> 46 </div>
54 <div class="layui-inline inline-onethird"> 47 <div class="layui-inline inline-onethird">
55 - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label> 48 + <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联调时间</label>
56 <div class="layui-input-inline"> 49 <div class="layui-input-inline">
57 - <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> 50 + <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required">
58 </div> 51 </div>
59 </div> 52 </div>
  53 +
60 </div> 54 </div>
61 <div class="layui-form-item"> 55 <div class="layui-form-item">
62 - <div class="layui-inline inline-half">  
63 - <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>会议主办处室负责人</label> 56 + <div class="layui-inline inline-onethird">
  57 + <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label>
  58 + <div class="layui-input-inline">
  59 + <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required">
  60 + </div>
  61 + </div>
  62 + <div class="layui-inline inline-onethird">
  63 + <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>主办处室负责人</label>
64 <div class="layui-input-inline"> 64 <div class="layui-input-inline">
65 <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)"> 65 <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)">
66 </div> 66 </div>
67 </div> 67 </div>
68 - <div class="layui-inline inline-half"> 68 + <div class="layui-inline inline-onethird">
69 <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>信息中心负责人</label> 69 <label class="layui-form-label" style="width: 165px"><span style="color: red;font-size: 16px">*</span>信息中心负责人</label>
70 <div class="layui-input-inline"> 70 <div class="layui-input-inline">
71 <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)" > 71 <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)" >
@@ -75,13 +75,13 @@ @@ -75,13 +75,13 @@
75 </div> 75 </div>
76 <div class="layui-form-item"> 76 <div class="layui-form-item">
77 77
78 - <div class="layui-inline inline-half"> 78 + <div class="layui-inline inline-onethird">
79 <label class="layui-form-label"><span style="color: red">*</span>经办人</label> 79 <label class="layui-form-label"><span style="color: red">*</span>经办人</label>
80 <div class="layui-input-inline"> 80 <div class="layui-input-inline">
81 <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)"> 81 <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)">
82 </div> 82 </div>
83 </div> 83 </div>
84 - <div class="layui-inline inline-half"> 84 + <div class="layui-inline inline-onethird">
85 <label class="layui-form-label"><span style="color: red">*</span>联系方式</label> 85 <label class="layui-form-label"><span style="color: red">*</span>联系方式</label>
86 <div class="layui-input-inline"> 86 <div class="layui-input-inline">
87 <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> 87 <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone">
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 </div> 115 </div>
116 </div> 116 </div>
117 <div class="layui-form-item"> 117 <div class="layui-form-item">
118 - <label class="layui-form-label textarea-label" style="text-overflow: clip;">主席台就座人员</label> 118 + <label class="layui-form-label textarea-label" style="text-overflow: clip;">主席台人员</label>
119 <div class="layui-input-block"> 119 <div class="layui-input-block">
120 <textarea class="layui-textarea" name="rostrummembers" maxlength="300" placeholder="收看总局会议可不填"></textarea> 120 <textarea class="layui-textarea" name="rostrummembers" maxlength="300" placeholder="收看总局会议可不填"></textarea>
121 </div> 121 </div>
@@ -145,37 +145,3 @@ @@ -145,37 +145,3 @@
145 }) 145 })
146 </script> 146 </script>
147 147
148 -<style>  
149 - #add-meetingApply-form .layui-form-label {  
150 - width: 120px;  
151 - /* padding: 8px 12px; */  
152 - text-align: left !important;  
153 - }  
154 - #add-meetingApply-form .layui-input-block{  
155 - margin-left: 120px !important;  
156 - }  
157 - .tags{  
158 - margin-top:5px;  
159 - }  
160 - .tags span {  
161 - height: 20px;  
162 - margin-right: 10px;  
163 - margin-bottom: 3px;  
164 - padding: 5px 10px 5px 10px;  
165 - float: left;  
166 - white-space: nowrap;  
167 - color:#fff;  
168 - background-color:#009688;  
169 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
170 - }  
171 - .tagsclose {  
172 - font-weight: bold;  
173 - line-height: 20px;  
174 - margin-left:10px;  
175 - cursor: pointer;  
176 - text-align: center;  
177 - color: #fff;  
178 - border: 0 none;  
179 - background: transparent none repeat scroll 0 0;  
180 - }  
181 -</style>  
@@ -75,13 +75,13 @@ @@ -75,13 +75,13 @@
75 </div> 75 </div>
76 </div> 76 </div>
77 <div class="layui-form-item" > 77 <div class="layui-form-item" >
78 - <div class="layui-inline inline-half"> 78 + <div class="layui-inline inline-onethird">
79 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>携带物品</label> 79 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>携带物品</label>
80 <div class="layui-input-inline"> 80 <div class="layui-input-inline">
81 <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)"> 81 <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)">
82 </div> 82 </div>
83 </div> 83 </div>
84 - <div class="layui-inline inline-half"> 84 + <div class="layui-inline inline-onethird">
85 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>值班人</label> 85 <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>值班人</label>
86 <div class="layui-input-inline"> 86 <div class="layui-input-inline">
87 <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)"> 87 <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)">
@@ -128,14 +128,14 @@ @@ -128,14 +128,14 @@
128 </table> 128 </table>
129 </div> 129 </div>
130 <div class="layui-form-item"> 130 <div class="layui-form-item">
131 - <div class="layui-inline inline-half" >  
132 - <label class="layui-form-label" style="width: 160px"><span 131 + <div class="layui-inline inline-onethird" >
  132 + <label class="layui-form-label" ><span
133 style="color: red;font-size: 16px">*</span>恢复方式</label> 133 style="color: red;font-size: 16px">*</span>恢复方式</label>
134 <div class="layui-input-inline"> 134 <div class="layui-input-inline">
135 <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)"/> 135 <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)"/>
136 </div> 136 </div>
137 </div> 137 </div>
138 - <div class="layui-inline inline-half"> 138 + <div class="layui-inline inline-onethird">
139 <label class="layui-form-label"><span 139 <label class="layui-form-label"><span
140 style="color: red;font-size: 16px">*</span>恢复结果：</label> 140 style="color: red;font-size: 16px">*</span>恢复结果：</label>
141 <div class="layui-input-block"> 141 <div class="layui-input-block">
@@ -143,16 +143,15 @@ @@ -143,16 +143,15 @@
143 <input type="radio" name="recoverResult" value="1" title="失败"> 143 <input type="radio" name="recoverResult" value="1" title="失败">
144 </div> 144 </div>
145 </div> 145 </div>
146 - </div>  
147 - <div class="layui-form-item">  
148 - <div class="layui-inline inline-half">  
149 - <label class="layui-form-label" style="width: 160px"><span 146 + <div class="layui-inline inline-onethird">
  147 + <label class="layui-form-label"><span
150 style="color: red;font-size: 16px">*</span>恢复时间段</label> 148 style="color: red;font-size: 16px">*</span>恢复时间段</label>
151 <div class="layui-input-inline"> 149 <div class="layui-input-inline">
152 <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required"> 150 <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required">
153 </div> 151 </div>
154 </div> 152 </div>
155 </div> 153 </div>
  154 +
156 <div class="layui-form-item"> 155 <div class="layui-form-item">
157 <div class="layui-inline" style="width: 90%"> 156 <div class="layui-inline" style="width: 90%">
158 <label class="layui-form-label">选择附件</label> 157 <label class="layui-form-label">选择附件</label>
@@ -174,7 +173,7 @@ @@ -174,7 +173,7 @@
174 </div> 173 </div>
175 174
176 <div class="layui-form-item"> 175 <div class="layui-form-item">
177 - <label class="layui-form-label textarea-label" style="text-overflow: clip;width: 120px"><span 176 + <label class="layui-form-label textarea-label" style="text-overflow: clip"><span
178 style="color: red;font-size: 16px">*</span>恢复验证结果</label> 177 style="color: red;font-size: 16px">*</span>恢复验证结果</label>
179 <div class="layui-input-block"> 178 <div class="layui-input-block">
180 <textarea class="layui-textarea" name="resultDesc" maxlength="500" 179 <textarea class="layui-textarea" name="resultDesc" maxlength="500"
@@ -183,7 +182,7 @@ @@ -183,7 +182,7 @@
183 </div> 182 </div>
184 183
185 <div class="layui-form-item"> 184 <div class="layui-form-item">
186 - <label class="layui-form-label textarea-label" style="text-overflow: clip;width: 120px"><span 185 + <label class="layui-form-label textarea-label" style="text-overflow: clip"><span
187 style="color: red;font-size: 16px">*</span>恢复验证缺陷</label> 186 style="color: red;font-size: 16px">*</span>恢复验证缺陷</label>
188 <div class="layui-input-block"> 187 <div class="layui-input-block">
189 <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea> 188 <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea>
@@ -194,7 +193,7 @@ @@ -194,7 +193,7 @@
194 </fieldset> 193 </fieldset>
195 <div class="layui-form-item"> 194 <div class="layui-form-item">
196 <div class="layui-inline inline-half"> 195 <div class="layui-inline inline-half">
197 - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>运维负责人(确认签字)</label> 196 + <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>运维负责人确认签字</label>
198 <div class="layui-input-inline"> 197 <div class="layui-input-inline">
199 <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)"> 198 <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)">
200 </div> 199 </div>
@@ -209,7 +208,7 @@ @@ -209,7 +208,7 @@
209 </div> 208 </div>
210 <div class="layui-form-item"> 209 <div class="layui-form-item">
211 <div class="layui-inline inline-half"> 210 <div class="layui-inline inline-half">
212 - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>实施人(确认签字)</label> 211 + <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>实施人确认签字</label>
213 <div class="layui-input-inline"> 212 <div class="layui-input-inline">
214 <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)"> 213 <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)">
215 </div> 214 </div>
@@ -224,7 +223,7 @@ @@ -224,7 +223,7 @@
224 </div> 223 </div>
225 <div class="layui-form-item"> 224 <div class="layui-form-item">
226 <div class="layui-inline inline-half"> 225 <div class="layui-inline inline-half">
227 - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>甲方(确认签字)</label> 226 + <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>甲方确认签字</label>
228 <div class="layui-input-inline"> 227 <div class="layui-input-inline">
229 <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)"> 228 <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)">
230 </div> 229 </div>
@@ -250,45 +249,3 @@ @@ -250,45 +249,3 @@
250 }) 249 })
251 </script> 250 </script>
252 251
253 -<style>  
254 - #add-recoveryverify-form .layui-form-label {  
255 - width: 120px;  
256 - /* padding: 8px 12px; */  
257 - text-align: left !important;  
258 - }  
259 -  
260 - #add-recoveryverify-form .layui-input-block {  
261 - margin-left: 120px !important;  
262 - }  
263 -  
264 - .tags {  
265 - margin-top: 5px;  
266 - }  
267 -  
268 - .layui-textarea {  
269 - width: 97%;  
270 - }  
271 -  
272 - .tags span {  
273 - height: 20px;  
274 - margin-right: 10px;  
275 - margin-bottom: 3px;  
276 - padding: 5px 10px 5px 10px;  
277 - float: left;  
278 - white-space: nowrap;  
279 - color: #fff;  
280 - background-color: #009688;  
281 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
282 - }  
283 -  
284 - .tagsclose {  
285 - font-weight: bold;  
286 - line-height: 20px;  
287 - margin-left: 10px;  
288 - cursor: pointer;  
289 - text-align: center;  
290 - color: #fff;  
291 - border: 0 none;  
292 - background: transparent none repeat scroll 0 0;  
293 - }  
294 -</style>  
1 <!--工作汇报表单--> 1 <!--工作汇报表单-->
2 <article> 2 <article>
3 - <div class="layui-card-body"> 3 + <div class="layui-card-body workReport">
4 <fieldset class="layui-elem-field layui-field-title"> 4 <fieldset class="layui-elem-field layui-field-title">
5 <legend>日志信息</legend> 5 <legend>日志信息</legend>
6 </fieldset> 6 </fieldset>
@@ -103,6 +103,9 @@ @@ -103,6 +103,9 @@
103 <button class="layui-btn hide" id="workReport-form-save-id" lay-filter="workReport-form-save-id" lay-submit 103 <button class="layui-btn hide" id="workReport-form-save-id" lay-filter="workReport-form-save-id" lay-submit
104 type="submit">保存 104 type="submit">保存
105 </button> 105 </button>
  106 + <button type="button" lay-filter="workReport-form-next-id" class="layui-btn hide"
  107 + id="workReport-form-next-id">下一条
  108 + </button>
106 <table class="hide" id="table-report-add-attachment"></table> 109 <table class="hide" id="table-report-add-attachment"></table>
107 </form> 110 </form>
108 </div> 111 </div>
@@ -49,13 +49,13 @@ @@ -49,13 +49,13 @@
49 </div> 49 </div>
50 </div> 50 </div>
51 <div class="layui-inline layui-btn-group time-group" id="createTimeBtn"> 51 <div class="layui-inline layui-btn-group time-group" id="createTimeBtn">
52 - <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="today" 52 + <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="today"
53 type="button">今天 53 type="button">今天
54 </button> 54 </button>
55 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastWeek" 55 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastWeek"
56 type="button">上周 56 type="button">上周
57 </button> 57 </button>
58 - <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="thisWeek" 58 + <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="thisWeek"
59 type="button">本周 59 type="button">本周
60 </button> 60 </button>
61 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth" 61 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth"
@@ -59,13 +59,13 @@ @@ -59,13 +59,13 @@
59 </div> 59 </div>
60 </div> 60 </div>
61 <div class="layui-btn-group time-group" id="btns-workreport-time" style="padding: 0"> 61 <div class="layui-btn-group time-group" id="btns-workreport-time" style="padding: 0">
62 - <button class="layui-btn layui-btn-primary layui-btn-xs active date" data-period="today" 62 + <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="today"
63 type="button">今天 63 type="button">今天
64 </button> 64 </button>
65 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastWeek" 65 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastWeek"
66 type="button">上周 66 type="button">上周
67 </button> 67 </button>
68 - <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="thisWeek" 68 + <button class="layui-btn layui-btn-primary layui-btn-xs active date" data-period="thisWeek"
69 type="button">本周 69 type="button">本周
70 </button> 70 </button>
71 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastMonth" 71 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastMonth"