monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 140b685d4f5797b64df62fb4073ab6ecb5fc8d9e 2 parents 7d0ef1d0 cb172c81

Merge branch 'master-mj-yjp' into 'master-mj' 

fix:基础功能编辑框样式与系统统一



See merge request !1185
Inline Side-by-side
Showing 9 changed files with 49 additions and 272 deletions
... ... @@ -127,7 +127,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) {
var manufacturerName = '';
if(d.omanufacturerId == '0'){
manufacturerName = d.manufacturerOther;
manufacturerName = '其他';
}else {
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
... ...
... ... @@ -230,7 +230,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
};
var option = {
color: ['#367bec', '#00cefc'],
color: ['#367bec', '#00cefc','#ff2618'],
title: [{
text: '{val|' + total + '}',
top: 'center',
... ...
... ... @@ -171,7 +171,7 @@
</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>
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
... ... @@ -186,7 +186,7 @@
</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>
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
... ... @@ -211,46 +211,3 @@
fn({{d}});
})
</script>
<style>
#add-emergency-form .layui-form-label {
width: 120px;
/* padding: 8px 12px; */
text-align: left !important;
}
#add-emergency-form .layui-input-block {
margin-left: 120px !important;
}
.tags {
margin-top: 5px;
}
.layui-textarea {
width: 97%;
}
.tags span {
height: 20px;
margin-right: 10px;
margin-bottom: 3px;
padding: 5px 10px 5px 10px;
float: left;
white-space: nowrap;
color: #fff;
background-color: #009688;
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left: 10px;
cursor: pointer;
text-align: center;
color: #fff;
border: 0 none;
background: transparent none repeat scroll 0 0;
}
</style>
... ...
... ... @@ -34,13 +34,19 @@
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<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="applyTime" id="applyTime" lay-verify="required">
</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="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">
<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="phone" id="phone" lay-verify="required|phone">
... ... @@ -72,14 +78,8 @@
</div>
<div class="layui-form-item">
<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="applyTime" id="applyTime" lay-verify="required">
</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-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="upgradeperiod" id= "upgradeperiod" lay-verify="required" >
</div>
... ... @@ -130,37 +130,3 @@
})
</script>
<style>
#add-bizupgrade-form .layui-form-label {
width: 120px;
/* padding: 8px 12px; */
text-align: left !important;
}
#add-bizupgrade-form .layui-input-block{
margin-left: 120px !important;
}
.tags{
margin-top:5px;
}
.tags span {
height: 20px;
margin-right: 10px;
margin-bottom: 3px;
padding: 5px 10px 5px 10px;
float: left;
white-space: nowrap;
color:#fff;
background-color:#009688;
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left:10px;
cursor: pointer;
text-align: center;
color: #fff;
border: 0 none;
background: transparent none repeat scroll 0 0;
}
</style>
... ...
... ... @@ -159,13 +159,13 @@
</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>
<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|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>
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
... ... @@ -198,37 +198,3 @@
})
</script>
<style>
#add-devicehitch-form .layui-form-label {
width: 120px;
/* padding: 8px 12px; */
text-align: left !important;
}
#add-devicehitch-form .layui-input-block{
margin-left: 120px !important;
}
.tags{
margin-top:5px;
}
.tags span {
height: 20px;
margin-right: 10px;
margin-bottom: 3px;
padding: 5px 10px 5px 10px;
float: left;
white-space: nowrap;
color:#fff;
background-color:#009688;
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left:10px;
cursor: pointer;
text-align: center;
color: #fff;
border: 0 none;
background: transparent none repeat scroll 0 0;
}
</style>
... ...
... ... @@ -53,7 +53,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>加班时长(小时)</label>
<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|account" maxlength="3" onkeyup="if(this.value.length>5) this.value=this.value.substr(0,3)">
</div>
... ... @@ -122,38 +122,3 @@
fn({{d}})
})
</script>
<style>
#add-extra-form .layui-form-label {
width: 120px;
/* padding: 8px 12px; */
text-align: left !important;
}
#add-extra-form .layui-input-block{
margin-left: 120px !important;
}
.tags{
margin-top:5px;
}
.tags span {
height: 20px;
margin-right: 10px;
margin-bottom: 3px;
padding: 5px 10px 5px 10px;
float: left;
white-space: nowrap;
color:#fff;
background-color:#009688;
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left:10px;
cursor: pointer;
text-align: center;
color: #fff;
border: 0 none;
background: transparent none repeat scroll 0 0;
}
</style>
... ...
... ... @@ -8,7 +8,7 @@
id="add-meetingApply-form" onsubmit="return false;">
<input hidden name="id" id="id" lay-verify="checkReportIsExist">
<div class="layui-form-item">
<div class="layui-inline inline-half">
<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">
<select name="orgCode" id="slt-mettingAdd-org"
... ... @@ -17,27 +17,20 @@
</select>
</div>
</div>
<div class="layui-inline inline-half">
<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="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>
<div class="layui-form-item">
<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="unitadjustperiod" id="unitadjustperiod" lay-verify="required">
</div>
</div>
<div class="layui-inline inline-half">
<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="mettingTime" id="mettingTime" lay-verify="required">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">会议编号</label>
... ... @@ -52,20 +45,27 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label>
<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="applyTime" id="applyTime" lay-verify="required">
<input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required">
</div>
</div>
</div>
<div class="layui-form-item">
<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-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="applyTime" id="applyTime" lay-verify="required">
</div>
</div>
<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="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">
<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="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 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<div class="layui-inline inline-onethird">
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
</div>
<div class="layui-inline inline-half">
<div class="layui-inline inline-onethird">
<label class="layui-form-label"><span style="color: red">*</span>联系方式</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone">
... ... @@ -115,7 +115,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label" style="text-overflow: clip;">主席台就座人员</label>
<label class="layui-form-label textarea-label" style="text-overflow: clip;">主席台人员</label>
<div class="layui-input-block">
<textarea class="layui-textarea" name="rostrummembers" maxlength="300" placeholder="收看总局会议可不填"></textarea>
</div>
... ... @@ -145,37 +145,3 @@
})
</script>
<style>
#add-meetingApply-form .layui-form-label {
width: 120px;
/* padding: 8px 12px; */
text-align: left !important;
}
#add-meetingApply-form .layui-input-block{
margin-left: 120px !important;
}
.tags{
margin-top:5px;
}
.tags span {
height: 20px;
margin-right: 10px;
margin-bottom: 3px;
padding: 5px 10px 5px 10px;
float: left;
white-space: nowrap;
color:#fff;
background-color:#009688;
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left:10px;
cursor: pointer;
text-align: center;
color: #fff;
border: 0 none;
background: transparent none repeat scroll 0 0;
}
</style>
... ...
... ... @@ -75,13 +75,13 @@
</div>
</div>
<div class="layui-form-item" >
<div class="layui-inline inline-half">
<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="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">
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
... ...
... ... @@ -128,14 +128,14 @@
</table>
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half" >
<label class="layui-form-label" style="width: 160px"><span
<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="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">
<div class="layui-inline inline-onethird">
<label class="layui-form-label"><span
style="color: red;font-size: 16px">*</span>恢复结果：</label>
<div class="layui-input-block">
... ... @@ -143,16 +143,15 @@
<input type="radio" name="recoverResult" value="1" title="失败">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label" style="width: 160px"><span
<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="unitadjustperiod" id="unitadjustperiod" lay-verify="required">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline" style="width: 90%">
<label class="layui-form-label">选择附件</label>
... ... @@ -174,7 +173,7 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label" style="text-overflow: clip;width: 120px"><span
<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="resultDesc" maxlength="500"
... ... @@ -183,7 +182,7 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label" style="text-overflow: clip;width: 120px"><span
<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="300" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea>
... ... @@ -194,7 +193,7 @@
</fieldset>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>运维负责人(确认签字)</label>
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
... ... @@ -209,7 +208,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>实施人(确认签字)</label>
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
... ... @@ -224,7 +223,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>甲方(确认签字)</label>
<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|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)">
</div>
... ... @@ -250,45 +249,3 @@
})
</script>
<style>
#add-recoveryverify-form .layui-form-label {
width: 120px;
/* padding: 8px 12px; */
text-align: left !important;
}
#add-recoveryverify-form .layui-input-block {
margin-left: 120px !important;
}
.tags {
margin-top: 5px;
}
.layui-textarea {
width: 97%;
}
.tags span {
height: 20px;
margin-right: 10px;
margin-bottom: 3px;
padding: 5px 10px 5px 10px;
float: left;
white-space: nowrap;
color: #fff;
background-color: #009688;
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left: 10px;
cursor: pointer;
text-align: center;
color: #fff;
border: 0 none;
background: transparent none repeat scroll 0 0;
}
</style>
... ...