monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit f165c37bd0f7b08ed3f15e7e49a46553be5a7f1f 1 parent a899e6e8

fix:基础功能根据何瑞测出的bug优化

Inline Side-by-side
Showing 18 changed files with 104 additions and 113 deletions
@@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
241 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { 241 field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
242 var manufacturerName = ''; 242 var manufacturerName = '';
243 if(d.manufacturerId == '0'){ 243 if(d.manufacturerId == '0'){
244 - manufacturerName = d.manufacturerOther; 244 + manufacturerName = '其他';
245 }else { 245 }else {
246 if(manufactureArr && manufactureArr.length>0){ 246 if(manufactureArr && manufactureArr.length>0){
247 $.each(manufactureArr, function (i, v) { 247 $.each(manufactureArr, function (i, v) {
@@ -298,7 +298,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -298,7 +298,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
298 common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { 298 common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() {
299 $("#bizupgrade-form-save-id").trigger("click"); 299 $("#bizupgrade-form-save-id").trigger("click");
300 reloadAllChange(); 300 reloadAllChange();
301 - },null,null,null,{end: reloadAllChange()}) 301 + },null,null,null,{end: function () {
  302 + reloadAllChange();
  303 + }})
302 } 304 }
303 305
304 //查看附件/调整信息列表 306 //查看附件/调整信息列表
@@ -110,6 +110,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -110,6 +110,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
110 time: 1000, 110 time: 1000,
111 }, function () { 111 }, function () {
112 layer.closeAll() 112 layer.closeAll()
  113 + table.reload('enterdevice_table_id', {
  114 + where: {
  115 + accessToken: accessToken,
  116 + createtime: "month",
  117 + viewMode: 'true',
  118 + dateLimit: ""
  119 + },
  120 + });
  121 + table.reload('fitting-table', {
  122 + where: {
  123 + accessToken: accessToken,
  124 + createtime: "month",
  125 + viewMode: 'true',
  126 + dateLimit: ""
  127 + },
  128 + });
113 }) 129 })
114 } else { 130 } else {
115 layer.msg(res.msg, { 131 layer.msg(res.msg, {
@@ -207,7 +207,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -207,7 +207,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
207 common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ 207 common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){
208 $("#devicehitch-form-save-id").trigger("click"); 208 $("#devicehitch-form-save-id").trigger("click");
209 reloadAllChange(); 209 reloadAllChange();
210 - },null,null,null,{end: reloadAllChange()}) 210 + },null,null,null,{end: function () {
  211 + reloadAllChange();
  212 + }})
211 } 213 }
212 214
213 //查看附件/调整信息列表 215 //查看附件/调整信息列表
@@ -334,7 +334,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -334,7 +334,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
334 common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { 334 common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() {
335 $("#emergency-form-save-id").trigger("click"); 335 $("#emergency-form-save-id").trigger("click");
336 reloadAllChange(); 336 reloadAllChange();
337 - },null,null,null,{end: reloadAllChange()}) 337 + },null,null,null,{end: function () {
  338 + reloadAllChange();
  339 + }})
338 } 340 }
339 341
340 //查看附件/调整信息列表 342 //查看附件/调整信息列表
@@ -375,7 +375,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -375,7 +375,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
375 common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() { 375 common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() {
376 $("#device-form-save-id").trigger("click"); 376 $("#device-form-save-id").trigger("click");
377 reloadAllChange(); 377 reloadAllChange();
378 - }, null, null, null, {end: reloadAllChange()}) 378 + }, null, null, null, {end: function () {
  379 + reloadAllChange();
  380 + }})
379 } 381 }
380 382
381 //查看更换配件列表 383 //查看更换配件列表
@@ -227,8 +227,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -227,8 +227,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
227 var title = id ? '编辑' : '新增' 227 var title = id ? '编辑' : '新增'
228 common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { 228 common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() {
229 $("#staff-form-save-id").trigger("click"); 229 $("#staff-form-save-id").trigger("click");
230 - reloadAllChange();  
231 - },null,null,null,{end: reloadAllChange()}) 230 + },null,['90%', '90%'],null,{end: function () {
  231 + reloadAllChange();
  232 + }})
232 } 233 }
233 234
234 //查看附件/接收人列表 235 //查看附件/接收人列表
@@ -195,7 +195,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -195,7 +195,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
195 common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ 195 common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){
196 $("#extra-form-save-id").trigger("click"); 196 $("#extra-form-save-id").trigger("click");
197 reloadAllChange(); 197 reloadAllChange();
198 - },null,null,null,{end: reloadAllChange()}) 198 + },null,null,null,{end: function () {
  199 + reloadAllChange();
  200 + }})
199 } 201 }
200 202
201 //查看附件/调整信息列表 203 //查看附件/调整信息列表
@@ -161,8 +161,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -161,8 +161,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
161 common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ 161 common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){
162 $("#meetingApply-form-save-id").trigger("click"); 162 $("#meetingApply-form-save-id").trigger("click");
163 form.render(); 163 form.render();
164 - reloadAllChange();  
165 - },null,null,null,{end: reloadAllChange()}) 164 + },null,null,null,{end: function () {
  165 + reloadAllChange();
  166 + }})
166 } 167 }
167 168
168 //查看附件/调整信息列表 169 //查看附件/调整信息列表
@@ -211,7 +211,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -211,7 +211,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
211 common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { 211 common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() {
212 $("#recoveryverify-form-save-id").trigger("click"); 212 $("#recoveryverify-form-save-id").trigger("click");
213 reloadAllChange(); 213 reloadAllChange();
214 - },null,null,null,{end: reloadAllChange()}) 214 + },null,null,null,{end: function () {
  215 + reloadAllChange();
  216 + }})
215 } 217 }
216 218
217 //查看附件/调整信息列表 219 //查看附件/调整信息列表
@@ -481,7 +481,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -481,7 +481,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
481 '<td>' + v.databaseVersion + '</td>' + 481 '<td>' + v.databaseVersion + '</td>' +
482 '<td><input type="button" value="修改" class="update" style="background-color: #af5f00;line-height: 18px"/></td>' + 482 '<td><input type="button" value="修改" class="update" style="background-color: #af5f00;line-height: 18px"/></td>' +
483 '</tr>' 483 '</tr>'
484 - }) 484 + });
485 $("#device-table").append(tr); 485 $("#device-table").append(tr);
486 $("#table-device :button.update").click(function () { 486 $("#table-device :button.update").click(function () {
487 var toEdit = this.value == '修改'; 487 var toEdit = this.value == '修改';
@@ -166,7 +166,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -166,7 +166,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
166 common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { 166 common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() {
167 $("#routeAdjust-form-save-id").trigger("click"); 167 $("#routeAdjust-form-save-id").trigger("click");
168 reloadAllChange(); 168 reloadAllChange();
169 - },null,null,null,{end: reloadAllChange()}) 169 + },null,null,null,{end: function () {
  170 + reloadAllChange();
  171 + }})
170 } 172 }
171 173
172 //查看附件/调整信息列表 174 //查看附件/调整信息列表
@@ -62,12 +62,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -62,12 +62,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
62 contentType: "application/json; charset=utf-8", 62 contentType: "application/json; charset=utf-8",
63 done: function (res) { 63 done: function (res) {
64 if (res.success) { 64 if (res.success) {
65 - layer.msg("操作成功", { 65 + layer.msg(res.msg, {
66 offset: '15px', 66 offset: '15px',
67 icon: 1, 67 icon: 1,
68 time: 1000, 68 time: 1000,
69 }, function () { 69 }, function () {
70 layer.closeAll() 70 layer.closeAll()
  71 + table.reload('table-staff-view', {
  72 + where: {
  73 + accessToken: accessToken,
  74 + createtime: "month",
  75 + viewMode: 'true',
  76 + dateLimit: ""
  77 + },
  78 + });
71 }) 79 })
72 } else { 80 } else {
73 layer.msg(res.msg, { 81 layer.msg(res.msg, {
@@ -94,28 +102,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -94,28 +102,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
94 102
95 $("#table-identifying :button.edit").click(function () { 103 $("#table-identifying :button.edit").click(function () {
96 var toEdit = this.value == '保存'; 104 var toEdit = this.value == '保存';
97 - this.value = toEdit ? '删除' : '保存';  
98 - var tdArr = [] 105 + var tdArr = [];
99 var tr = $(this).closest('tr'); 106 var tr = $(this).closest('tr');
100 $(this).closest('tr').find('td').not(':last').each(function (t, index) { 107 $(this).closest('tr').find('td').not(':last').each(function (t, index) {
101 if (toEdit) { 108 if (toEdit) {
102 - this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');  
103 - if(this.innerHTML=='' || this.innerHTML == undefined){  
104 - layer.msg('请填写完整', {  
105 - icon: 7, time: 3000  
106 - });  
107 - tdArr = [];  
108 - saveCount-=1;  
109 - $(this).closest('tr').remove();  
110 - return;  
111 - }  
112 - tdArr.push(this.innerHTML); 109 + if($(this).find('input').eq(0).val()!='' && $(this).find('input').eq(0).val()!=undefined ) {
  110 + this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
  111 + if (this.innerHTML == '' || this.innerHTML == undefined) {
  112 + layer.msg('请填写完整', {
  113 + icon: 7, time: 3000
  114 + });
  115 + //tdArr = [];
  116 + //saveCount-=1;
  117 + //$(this).closest('tr').remove();
  118 + //return;
  119 + } else {
  120 + tdArr.push(this.innerHTML);
  121 + }
  122 + }else {
  123 + tdArr.push('');
  124 + toEdit = '保存';
  125 + }
113 } 126 }
114 }) 127 })
115 if(!toEdit){ 128 if(!toEdit){
116 layer.confirm('确认要删除吗？', {icon: 3,yes: function (index, layero) { 129 layer.confirm('确认要删除吗？', {icon: 3,yes: function (index, layero) {
117 var name = tr.find('td')[0].innerHTML; 130 var name = tr.find('td')[0].innerHTML;
118 - console.log(name);  
119 if (name != '' && name != undefined) { 131 if (name != '' && name != undefined) {
120 for (let i = 0; i < staffsBak.length; i++) { 132 for (let i = 0; i < staffsBak.length; i++) {
121 if (staffsBak[i].userName == name) { 133 if (staffsBak[i].userName == name) {
@@ -139,21 +151,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -139,21 +151,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
139 if(tdArr[1]!=''&& tdArr[1]!=undefined){ 151 if(tdArr[1]!=''&& tdArr[1]!=undefined){
140 var resdata = commonDetail.validatorPhone(tdArr[1]); 152 var resdata = commonDetail.validatorPhone(tdArr[1]);
141 if(resdata.code==-1){ 153 if(resdata.code==-1){
142 - layer.confirm(resdata.msg+'确认要删除吗？', {  
143 - icon: 3, yes: function (index, layero) {  
144 - layer.load(2);  
145 - tdArr = [];  
146 - staffObj ={};  
147 - tr.remove();  
148 - layer.closeAll('loading');  
149 - layer.close(index)  
150 -  
151 - return  
152 - }, cancel: function (index, layero) {  
153 - staffObj.phone = tdArr[1]  
154 - layer.close(index);  
155 - } 154 + layer.msg(resdata.msg+'请重新核对填写', {
  155 + icon: 3
156 }); 156 });
  157 + var html = '<input class="layui-input" type="text" value="' + tr.find('td').eq(1).text().replace(/"/g, '&quot;').replace(/<\/?.+?>/g, '').replace(/ /g, '') + '"/>';
  158 + tr.find('td').eq(1).html(html);
  159 + toEdit = '保存';
  160 + staffObj.phone =undefined;
157 }else { 161 }else {
158 staffObj.phone = tdArr[1] 162 staffObj.phone = tdArr[1]
159 } 163 }
@@ -161,27 +165,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -161,27 +165,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
161 if(tdArr[2]!=''&& tdArr[2]!=undefined){ 165 if(tdArr[2]!=''&& tdArr[2]!=undefined){
162 var res = commonDetail.validatorIDCard(tdArr[2]); 166 var res = commonDetail.validatorIDCard(tdArr[2]);
163 if(res.code==-1){ 167 if(res.code==-1){
164 - layer.confirm(res.msg+'确认要删除吗？', {icon: 3,yes: function (index, layero) {  
165 - layer.load(2);  
166 - tdArr = [];  
167 - staffObj={};  
168 - tr.remove();  
169 - layer.closeAll('loading');  
170 - layer.close(index);  
171 -  
172 - return  
173 - },cancel: function (index, layero) {  
174 - staffObj.idCard = tdArr[2]  
175 - layer.close(index);  
176 - } 168 + layer.msg(res.msg+'请重新核对填写', {icon: 3,
177 }); 169 });
  170 + var html = '<input class="layui-input" type="text" value="' + tr.find('td').eq(2).text().replace(/"/g, '&quot;').replace(/<\/?.+?>/g, '').replace(/ /g, '') + '"/>';
  171 + tr.find('td').eq(2).html(html);
  172 + toEdit = '保存';
  173 + staffObj.idCard = undefined;
178 }else { 174 }else {
179 staffObj.idCard = tdArr[2] 175 staffObj.idCard = tdArr[2]
180 } 176 }
181 } 177 }
182 saveCount-=1; 178 saveCount-=1;
183 if(staffObj.phone && staffObj.idCard) { 179 if(staffObj.phone && staffObj.idCard) {
184 - staffsBak.push(staffObj) 180 + staffsBak.push(staffObj);
  181 + this.value = toEdit ? '删除' : '保存';
185 } 182 }
186 183
187 } 184 }
@@ -41,7 +41,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -41,7 +41,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
41 $("#createTimeBtn button").removeClass("active"); 41 $("#createTimeBtn button").removeClass("active");
42 $(this).addClass("active"); 42 $(this).addClass("active");
43 createTime = ($(this).data("period")) 43 createTime = ($(this).data("period"))
44 - //reloadWorkReportTable(); 44 + reloadWorkReportTable();
45 }); 45 });
46 46
47 //渲染表单元素 47 //渲染表单元素
@@ -91,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -91,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
91 cols: [[ 91 cols: [[
92 {type: 'checkbox'}, 92 {type: 'checkbox'},
93 { 93 {
94 - field: 'repType', title: '汇报类型', align: 'center', width: 150, 94 + field: 'repType', title: '汇报类型', align: 'center',
95 templet: function (d) { 95 templet: function (d) {
96 var typeName = '' 96 var typeName = ''
97 switch (d.repType) { 97 switch (d.repType) {
@@ -109,15 +109,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -109,15 +109,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
109 } 109 }
110 }, 110 },
111 { 111 {
112 - field: 'repTitle', title: '标题', align: 'center', minWith: 300, 112 + field: 'repTitle', title: '标题', align: 'center',
113 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title">{{d.repTitle}}</span></div>' 113 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title">{{d.repTitle}}</span></div>'
114 }, 114 },
115 { 115 {
116 - field: 'attachmentList', title: '附件数量', align: 'center', width: 120, 116 + field: 'attachmentList', title: '附件数量', align: 'center',
117 templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-workReport-attachment">{{d.attachmentList.length}}</span></div>' 117 templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-workReport-attachment">{{d.attachmentList.length}}</span></div>'
118 }, 118 },
119 { 119 {
120 - field: 'reportUserList', title: '已读/接收人数', align: 'center', minWith: 150, 120 + field: 'reportUserList', title: '已读/接收人数', align: 'center',
121 templet: function (d) { 121 templet: function (d) {
122 var str = '' 122 var str = ''
123 var count = 0 123 var count = 0
@@ -131,7 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -131,7 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
131 } 131 }
132 }, 132 },
133 { 133 {
134 - field: 'reportUserList', title: '已读人员', align: 'center', minWith: 400, 134 + field: 'reportUserList', title: '已读人员', align: 'center',
135 templet: function (d) { 135 templet: function (d) {
136 var userName = [] 136 var userName = []
137 var str = '' 137 var str = ''
@@ -147,13 +147,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -147,13 +147,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
147 } 147 }
148 }, 148 },
149 { 149 {
150 - field: 'createUserNickName', title: '创建人', align: 'center', minWith: 150, 150 + field: 'createUserNickName', title: '创建人', align: 'center',
151 }, 151 },
152 { 152 {
153 - field: 'createTime', title: '上报时间', align: 'center', minWith: 150, 153 + field: 'createTime', title: '上报时间', align: 'center',
154 }, 154 },
155 { 155 {
156 - title: '操作', align: "center", width: 120, 156 + title: '操作', align: "center",
157 templet: '<div><span data-id="{{d.id}}" class="layui-table-link delete-workReport-btn">删除</span></div>' 157 templet: '<div><span data-id="{{d.id}}" class="layui-table-link delete-workReport-btn">删除</span></div>'
158 } 158 }
159 ]], 159 ]],
@@ -218,7 +218,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -218,7 +218,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
218 return typeName 218 return typeName
219 } 219 }
220 }, { 220 }, {
221 - field: 'repTitle', title: '标题', align: 'center', minWidth: 200, event: 'serRead', 221 + field: 'repTitle', title: '标题', align: 'center', event: 'serRead',
222 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>' 222 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>'
223 }, { 223 }, {
224 field: 'attachmentList', title: '附件数量', align: 'center', 224 field: 'attachmentList', title: '附件数量', align: 'center',
@@ -233,7 +233,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -233,7 +233,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
233 } 233 }
234 } 234 }
235 }, { 235 }, {
236 - field: 'reportUserList', title: '未读人员', align: 'center', minWidth: '200', 236 + field: 'reportUserList', title: '未读人员', align: 'center',
237 templet: function (d) { 237 templet: function (d) {
238 var userName = []; 238 var userName = [];
239 $.each(d.reportUserList, function (i, v) { 239 $.each(d.reportUserList, function (i, v) {
@@ -247,7 +247,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -247,7 +247,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
247 return userName.toString(); 247 return userName.toString();
248 } 248 }
249 }, { 249 }, {
250 - field: 'reportUserList', title: '已读人员', align: 'center', minWidth: '200', 250 + field: 'reportUserList', title: '已读人员', align: 'center',
251 templet: function (d) { 251 templet: function (d) {
252 var userName = []; 252 var userName = [];
253 $.each(d.reportUserList, function (i, v) { 253 $.each(d.reportUserList, function (i, v) {
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="layui-inline inline-onethird"> 29 <div class="layui-inline inline-onethird">
30 - <label class="layui-form-label"><span>*</span>升级文件/补丁版本</label> 30 + <label class="layui-form-label" style="padding-left: 0"><span>*</span>升级文件/补丁版本</label>
31 <div class="layui-input-inline"> 31 <div class="layui-input-inline">
32 <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)"> 32 <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)">
33 </div> 33 </div>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 lay-filter="slt-staffadd-group" lay-verify="required"> 53 lay-filter="slt-staffadd-group" lay-verify="required">
54 <option value="">工作单位</option> 54 <option value="">工作单位</option>
55 </select> 55 </select>
56 - <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none"> 56 + <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" style="display: none">
57 </div> 57 </div>
58 </div> 58 </div>
59 <div class="layui-inline inline-onethird"> 59 <div class="layui-inline inline-onethird">
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 lay-filter="slt-staffadd-group" lay-verify="required"> 24 lay-filter="slt-staffadd-group" lay-verify="required">
25 <option value="">工作单位</option> 25 <option value="">工作单位</option>
26 </select> 26 </select>
27 - <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"> 27 + <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" class="layui-input" style="display: none">
28 </div> 28 </div>
29 </div> 29 </div>
30 <div class="layui-inline inline-onethird"> 30 <div class="layui-inline inline-onethird">
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 </div> 19 </div>
20 </div> 20 </div>
21 <div class="layui-inline inline-half"> 21 <div class="layui-inline inline-half">
22 - <label class="layui-form-label">日期<span style="color: red">*</span></label> 22 + <label class="layui-form-label">日期<span>*</span></label>
23 <div class="layui-input-inline"> 23 <div class="layui-input-inline">
24 <input class="layui-input" lay-verify="required" id="createTime" name="createTime" type="text"> 24 <input class="layui-input" lay-verify="required" id="createTime" name="createTime" type="text">
25 </div> 25 </div>
@@ -46,10 +46,10 @@ @@ -46,10 +46,10 @@
46 </div> 46 </div>
47 </div> 47 </div>
48 <div class="layui-form-item"> 48 <div class="layui-form-item">
49 - <label class="layui-form-label textarea-label work_finish" style="height: 400px"></label> 49 + <label class="layui-form-label textarea-label work_finish" ></label>
50 <div class="layui-input-block"> 50 <div class="layui-input-block">
51 <textarea class="layui-textarea" cols="30" lay-verify="required" 51 <textarea class="layui-textarea" cols="30" lay-verify="required"
52 - name="workAccomplish" rows="20" style="height: 400px"></textarea> 52 + name="workAccomplish" rows="20" ></textarea>
53 </div> 53 </div>
54 </div> 54 </div>
55 <div class="layui-form-item"> 55 <div class="layui-form-item">
@@ -118,45 +118,7 @@ @@ -118,45 +118,7 @@
118 </article> 118 </article>
119 <script> 119 <script>
120 layui.use('workReportAdd', function (fn) { 120 layui.use('workReportAdd', function (fn) {
121 - fn({{ d }}); 121 + fn({{d}});
122 }) 122 })
123 </script> 123 </script>
124 124
125 -<style>  
126 - #add-workReport-form .layui-form-label {  
127 - width: 130px;  
128 - /* padding: 8px 12px; */  
129 - text-align: left !important;  
130 - }  
131 -  
132 - #add-workReport-form .layui-input-block {  
133 - margin-left: 130px !important;  
134 - }  
135 -  
136 - .tags {  
137 - margin-top: 5px;  
138 - }  
139 -  
140 - .tags span {  
141 - height: 20px;  
142 - margin-right: 10px;  
143 - margin-bottom: 3px;  
144 - padding: 5px 10px 5px 10px;  
145 - float: left;  
146 - white-space: nowrap;  
147 - color: #fff;  
148 - background-color: #009688;  
149 - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);  
150 - }  
151 -  
152 - .tags .close {  
153 - font-weight: bold;  
154 - line-height: 20px;  
155 - margin-left: 10px;  
156 - cursor: pointer;  
157 - text-align: center;  
158 - color: #fff;  
159 - border: 0 none;  
160 - background: transparent none repeat scroll 0 0;  
161 - }  
162 -</style>