|
@@ -56,7 +56,7 @@
|
|
|
}
|
|
|
|
|
|
.point-blue {
|
|
|
- background-color: #1c87bf;
|
|
|
+ background-color: #1c87bf !important;
|
|
|
}
|
|
|
|
|
|
.point-green {
|
|
@@ -79,10 +79,12 @@
|
|
|
width: 90% !important;
|
|
|
margin: 0 auto;
|
|
|
border: 1px solid rgba(0,0,0,.1);
|
|
|
- padding-bottom: 20px;
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
.content article {
|
|
|
position: relative;
|
|
|
+ padding-bottom: 20px;
|
|
|
}
|
|
|
.content article > h3 {
|
|
|
width: 100%;
|
|
@@ -90,12 +92,13 @@
|
|
|
font-size: 1.4em;
|
|
|
color: #fff;
|
|
|
padding: 10px 0 20px;
|
|
|
- background-color: #32a3d8;
|
|
|
+ background-color: #32a3d8 !important;
|
|
|
margin: 0 0 10px 0;
|
|
|
}
|
|
|
.content article section {
|
|
|
padding: 10px 0 10px;
|
|
|
position: relative;
|
|
|
+ background-color: transparent !important;
|
|
|
}
|
|
|
.content article section:before {
|
|
|
content: "";
|
|
@@ -115,6 +118,7 @@
|
|
|
position: absolute;
|
|
|
text-align: right;
|
|
|
padding-left: 10px;
|
|
|
+ background-color: transparent !important;
|
|
|
}
|
|
|
.content article section time > span {
|
|
|
display: block;margin-right: 10px;
|
|
@@ -123,6 +127,7 @@
|
|
|
color: #3a3a38;
|
|
|
margin-left: 55%;
|
|
|
min-height: 50px;
|
|
|
+ background-color: transparent;
|
|
|
}
|
|
|
.content article section aside > span{
|
|
|
display: block;
|
|
@@ -136,12 +141,15 @@
|
|
|
}
|
|
|
|
|
|
/*设置Select样式*/
|
|
|
- select{border: 1px solid rgba(0,0,0,.1);padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;margin-right: 10px;width: 85px;}
|
|
|
+ select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
|
|
|
.add-title-left{position: absolute;right: 0;top: 15%;}
|
|
|
.add-title-right{position: absolute;left: 55%;top:33%;}
|
|
|
.my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}
|
|
|
.list-main{list-style-type: none;margin: 0;padding: 10px;overflow-x: scroll;white-space: nowrap;}
|
|
|
.list-main>li{display: table-cell;min-width: 500px;position: relative;width: 500px;margin-right: 20px;}
|
|
|
+ .list-main >li :hover{
|
|
|
+ background: #f0f0f0;
|
|
|
+ }
|
|
|
</style>
|
|
|
<#include "/base/list_base.ftl">
|
|
|
</head>
|
|
@@ -149,7 +157,7 @@
|
|
|
<nav class="breadcrumb"><i class="Hui-iconfont"></i> 首页
|
|
|
<span class="c-gray en">></span> PST管理
|
|
|
<span class="c-gray en">></span> 设备列表
|
|
|
- <span class="c-gray en">></span> 查看作用流程岗位
|
|
|
+ <span class="c-gray en">></span> 作用生产流程
|
|
|
<a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont"></i></a>
|
|
|
</nav>
|
|
|
<div><input type="hidden" value="${deviceId!}" id="deviceId"></div>
|
|
@@ -356,6 +364,8 @@
|
|
|
</div>
|
|
|
</li>-->
|
|
|
</ul>
|
|
|
+
|
|
|
+<div id="produceData"></div>
|
|
|
<script type="text/javascript">
|
|
|
|
|
|
$(function(){
|
|
@@ -399,19 +409,21 @@
|
|
|
var employee_list = this;
|
|
|
employee_option += '<option value="' + employee_list.employeeId + '">' + employee_list.employeeName + '</option>';
|
|
|
});
|
|
|
- tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,1)">' + employee_option + '</select> ';
|
|
|
+ tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" preVal="" onchange="update_process(this,1)">' + employee_option + '</select> ';
|
|
|
} else {
|
|
|
var employee_option = '';
|
|
|
+ var preVal = "";
|
|
|
$.each(employeeList, function(n,nobj){
|
|
|
var employee_list = this;
|
|
|
if (employee_list.employeeId == this_process.employeeId) {
|
|
|
+ preVal = employee_list.employeeId;
|
|
|
employee_option += '<option value="' + employee_list.employeeId + '" selected>' + employee_list.employeeName + '</option>';
|
|
|
} else {
|
|
|
employee_option += '<option value="' + employee_list.employeeId + '">' + employee_list.employeeName + '</option>';
|
|
|
}
|
|
|
|
|
|
});
|
|
|
- tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,1)">' + employee_option + '</select>';
|
|
|
+ tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" preVal="'+ preVal +'" onchange="update_process(this,1)">' + employee_option + '</select>';
|
|
|
}
|
|
|
if (this_process.deviceName == null || this_process.deviceName == undefined) {
|
|
|
var device_option = '<option value="">添加打卡设备</option>';
|
|
@@ -419,18 +431,20 @@
|
|
|
var device_list = this;
|
|
|
device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
|
|
|
});
|
|
|
- tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>';
|
|
|
+ tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" preVal="" onchange="update_process(this,2)">' + device_option + '</select>';
|
|
|
} else {
|
|
|
var device_option = '';
|
|
|
+ var preVal = "";
|
|
|
$.each(deviceList, function(n,nobj){
|
|
|
var device_list = this;
|
|
|
if (this_process.driveId == device_list.deviceId) {
|
|
|
+ preVal = device_list.deviceId
|
|
|
device_option += '<option value="' + device_list.deviceId + '" selected>' + device_list.deviceName + '</option>';
|
|
|
} else {
|
|
|
device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
|
|
|
}
|
|
|
});
|
|
|
- tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>';
|
|
|
+ tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" preVal="'+ preVal +'" onchange="update_process(this,2)">' + device_option + '</select>';
|
|
|
}
|
|
|
if (j % 2 == 0) {
|
|
|
process += '<section>'
|
|
@@ -474,6 +488,12 @@
|
|
|
});
|
|
|
});
|
|
|
|
|
|
+ $(function () {
|
|
|
+ $(".produceData").change(function(){
|
|
|
+ alert($(this).val());
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
function update_process(obj,num) {
|
|
|
var processId = obj.getAttribute("process");
|
|
|
var id = obj.getAttribute("id");
|
|
@@ -501,13 +521,18 @@
|
|
|
success: function(dt){
|
|
|
if (dt.returnCode == 200) {
|
|
|
layer.msg('恭喜您,修改成功!',{icon: 1,time:1000});
|
|
|
+ var preVal = $(obj).val();
|
|
|
+ $(obj).attr("preVal",preVal);
|
|
|
} else {
|
|
|
layer.msg('对不起,修改失败!',{icon: 5,time:1000});
|
|
|
+ var preVal = $(obj).attr("preVal");
|
|
|
+ $(obj).val(preVal);
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
}, function() {
|
|
|
- location.reload();
|
|
|
+ var preVal = $(obj).attr("preVal");
|
|
|
+ $(obj).val(preVal);
|
|
|
}
|
|
|
);
|
|
|
}
|