Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
Showing
65 changed files
with
820 additions
and
786 deletions
| @@ -1181,34 +1181,40 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -1181,34 +1181,40 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 1181 | }); | 1181 | }); |
| 1182 | //用户 | 1182 | //用户 |
| 1183 | $.ajax({ | 1183 | $.ajax({ |
| 1184 | - url: domainName + '/api-user/users/getAll', | 1184 | + url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1', |
| 1185 | data: { | 1185 | data: { |
| 1186 | accessToken: accessToken | 1186 | accessToken: accessToken |
| 1187 | }, | 1187 | }, |
| 1188 | success: function (response) { | 1188 | success: function (response) { |
| 1189 | if (response) { | 1189 | if (response) { |
| 1190 | - var busTypeList = response; | ||
| 1191 | - var bizList = response.map(item => { | ||
| 1192 | - return { | ||
| 1193 | - name: item.nickname, | ||
| 1194 | - value: item.username, | ||
| 1195 | - parentId: item.parentId | ||
| 1196 | - } | ||
| 1197 | - }); | ||
| 1198 | - var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); | 1190 | + // var busTypeList = response; |
| 1191 | + // var bizList = response.map(item => { | ||
| 1192 | + // return { | ||
| 1193 | + // name: item.nickname, | ||
| 1194 | + // value: item.username, | ||
| 1195 | + // parentId: item.parentId | ||
| 1196 | + // } | ||
| 1197 | + // }); | ||
| 1198 | + // var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); | ||
| 1199 | 1199 | ||
| 1200 | // 影响业务下拉框 | 1200 | // 影响业务下拉框 |
| 1201 | xmSelect.render({ | 1201 | xmSelect.render({ |
| 1202 | el: '#alarmsubscribe_user', | 1202 | el: '#alarmsubscribe_user', |
| 1203 | name: 'bizId', | 1203 | name: 'bizId', |
| 1204 | - tips: '=订阅用户=', | 1204 | + tips: '订阅用户', |
| 1205 | toolbar: { | 1205 | toolbar: { |
| 1206 | show: true, | 1206 | show: true, |
| 1207 | list: ['ALL', 'CLEAR'] | 1207 | list: ['ALL', 'CLEAR'] |
| 1208 | }, | 1208 | }, |
| 1209 | + prop: { | ||
| 1210 | + name: 'nickname', | ||
| 1211 | + value: 'username' | ||
| 1212 | + }, | ||
| 1213 | + layVerify: 'required', | ||
| 1214 | + data: response.data.rows, | ||
| 1209 | filterable: true, | 1215 | filterable: true, |
| 1210 | layVerType: 'msg', | 1216 | layVerType: 'msg', |
| 1211 | - data: bizTree, | 1217 | + // data: bizTree, |
| 1212 | on: function (data) { | 1218 | on: function (data) { |
| 1213 | if (data.arr.length > 0) { | 1219 | if (data.arr.length > 0) { |
| 1214 | userName = data.arr.map(t=>t.value).join(','); | 1220 | userName = data.arr.map(t=>t.value).join(','); |
| @@ -10,7 +10,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -10,7 +10,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
| 10 | //对外暴露的接口 | 10 | //对外暴露的接口 |
| 11 | var accessToken; | 11 | var accessToken; |
| 12 | exports('backupCount', function () { | 12 | exports('backupCount', function () { |
| 13 | - var accessToken = common.getMjToken(); | 13 | + accessToken = common.getMjToken(); |
| 14 | var period = 'thisMonth'; | 14 | var period = 'thisMonth'; |
| 15 | initTable(); | 15 | initTable(); |
| 16 | initStatusTable() | 16 | initStatusTable() |
| @@ -140,17 +140,22 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -140,17 +140,22 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
| 140 | $.each(e.backlist[j], function (h, n) { | 140 | $.each(e.backlist[j], function (h, n) { |
| 141 | if (h != "resId") { | 141 | if (h != "resId") { |
| 142 | if (/失败/.test(n)) { | 142 | if (/失败/.test(n)) { |
| 143 | - tr += '<td><i class="layui-icon layui-icon-close" style="font-size: 30px; color: #ff252c;"></i></td>' | 143 | + tr += '<td style="text-align: center"><i class="layui-icon layui-icon-close" style="font-size: 20px; color: #ff252c;"></i></td>' |
| 144 | } else if (/成功/.test(n)) { | 144 | } else if (/成功/.test(n)) { |
| 145 | - tr += '<td><i class="layui-icon layui-icon-ok" style="font-size: 30px; color: #1dff1c;"></i></td>' | 145 | + tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-ok" style="font-size: 20px; color: #1dff1c;"></i></p><p style="margin-top: 8px;text-align: center">主楼+综改</p></td>' |
| 146 | } else if (/备份中/.test(n)) { | 146 | } else if (/备份中/.test(n)) { |
| 147 | - tr += '<td><span style="color:#ffe40e">' + n + '</span></td>' | 147 | + tr += '<td style="text-align: center"><span style="color:#ffe40e">' + n + '</span></td>' |
| 148 | } else if (/未备份/.test(n)) { | 148 | } else if (/未备份/.test(n)) { |
| 149 | - tr += '<td><span style="color:magenta">' + n + '</span></td>' | ||
| 150 | - } else if (/已失效/.test(n)) { | ||
| 151 | - tr += '<td><span style="color:rgba(72,72,72,0.77)">' + n + '</span></td>' | ||
| 152 | - } else { | ||
| 153 | - tr += '<td>' + n + '</td>' | 149 | + tr += '<td style="text-align: center"><span style="color:magenta">' + n + '</span></td>' |
| 150 | + } else if (/历史存放/.test(n)) { | ||
| 151 | + tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-log" style="font-size: 20px; color: #1e9fff;"></i></p><p style="margin-top: 8px;text-align: center">综改</p></td>' | ||
| 152 | + } else if (/全备/.test(n)) { | ||
| 153 | + tr += '<td style="text-align: center"><span style="color:#1DFF1C">' + n + '</span></td>' | ||
| 154 | + } else if (/已失效/.test(n)){ | ||
| 155 | + tr += '<td style="text-align: center"><span style="color:#FF252C">' + n + '</span></td>' | ||
| 156 | + }else { | ||
| 157 | + tr += '<td style="text-align: center">' + n + '</td>' | ||
| 158 | + | ||
| 154 | } | 159 | } |
| 155 | 160 | ||
| 156 | } | 161 | } |
| @@ -12,9 +12,11 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -12,9 +12,11 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 12 | renderBackupDingjiaListTable(); | 12 | renderBackupDingjiaListTable(); |
| 13 | //发送状态 | 13 | //发送状态 |
| 14 | // 下拉框改变搜索 | 14 | // 下拉框改变搜索 |
| 15 | - form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable); | 15 | + //form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable); |
| 16 | $('#dingjia_table_id thead tr th').css({'font-weight':'bold'}) | 16 | $('#dingjia_table_id thead tr th').css({'font-weight':'bold'}) |
| 17 | - | 17 | + $("#orgSearchBtn").on("click",function () { |
| 18 | + renderBackupDingjiaListTable(); | ||
| 19 | + }); | ||
| 18 | // 加载查询条件下拉框 | 20 | // 加载查询条件下拉框 |
| 19 | function loadConditionSelect() { | 21 | function loadConditionSelect() { |
| 20 | //绑定业务下拉选择数据 | 22 | //绑定业务下拉选择数据 |
| @@ -18,26 +18,27 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -18,26 +18,27 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 18 | var currSelect = 0; | 18 | var currSelect = 0; |
| 19 | var period = 'today'; | 19 | var period = 'today'; |
| 20 | var tip_index; | 20 | var tip_index; |
| 21 | - $("#probutton").mouseover(function () { | ||
| 22 | - tips_index = layer.tips('查询昨天8时到今天8时的备份', this, {time: 0}); | ||
| 23 | - }); | ||
| 24 | - $("#probutton").mouseout(function () { | ||
| 25 | - layer.close(tips_index); //关闭弹出层索引 | ||
| 26 | - }); | 21 | + /* $("#probutton").mouseover(function () { |
| 22 | + tips_index = layer.tips('查询昨天8时到今天8时的备份', this, {time: 0}); | ||
| 23 | + }); | ||
| 24 | + $("#probutton").mouseout(function () { | ||
| 25 | + layer.close(tips_index); //关闭弹出层索引 | ||
| 26 | + });*/ | ||
| 27 | form.render(); | 27 | form.render(); |
| 28 | var inspectioncountListTable = ''; | 28 | var inspectioncountListTable = ''; |
| 29 | - searchEvent();//检索条件事件 | 29 | + //searchEvent();//检索条件事件 |
| 30 | //加载文档表格数据 | 30 | //加载文档表格数据 |
| 31 | renderinspectioncountListTable(); | 31 | renderinspectioncountListTable(); |
| 32 | 32 | ||
| 33 | - //检索事件 | 33 | + /* //检索事件 |
| 34 | function searchEvent() { | 34 | function searchEvent() { |
| 35 | //发送状态 | 35 | //发送状态 |
| 36 | form.on('select(inspectioncount_date)', function (data) { | 36 | form.on('select(inspectioncount_date)', function (data) { |
| 37 | renderinspectioncountListTable(); | 37 | renderinspectioncountListTable(); |
| 38 | }); | 38 | }); |
| 39 | - } | ||
| 40 | - $('#inspectioncount_table_id thead tr th').css({'font-weight':'bold'}) | 39 | + }*/ |
| 40 | + | ||
| 41 | + $('#inspectioncount_table_id thead tr th').css({'font-weight': 'bold'}) | ||
| 41 | 42 | ||
| 42 | //日期范围选择 | 43 | //日期范围选择 |
| 43 | laydate.render({ | 44 | laydate.render({ |
| @@ -53,47 +54,47 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -53,47 +54,47 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 53 | $dom.removeClass("active") | 54 | $dom.removeClass("active") |
| 54 | } | 55 | } |
| 55 | }) | 56 | }) |
| 56 | - refreshPage() | 57 | + //refreshPage() |
| 57 | } | 58 | } |
| 58 | }); | 59 | }); |
| 59 | - | ||
| 60 | - // 日期方式选择 | ||
| 61 | - $('#btns-insp-time button').click(function () { | ||
| 62 | - $.each($("button.date"), function (i, e) { | ||
| 63 | - var $dom = $(e); | ||
| 64 | - if ($dom.hasClass("active")) { | ||
| 65 | - $dom.removeClass("active") | ||
| 66 | - } | ||
| 67 | - }) | ||
| 68 | - $("#backTime").val('') | ||
| 69 | - backTime = '' | ||
| 70 | - $("#btns-insp-time button").removeClass("active"); | ||
| 71 | - $(this).addClass("active"); | ||
| 72 | - period = ($(this).data("period")) | ||
| 73 | - // if (period == 'today') { | ||
| 74 | - var today = new Date() | ||
| 75 | - today = today.getFullYear() + "-" + (today.getMonth() >= 9 ? (today.getMonth() + 1) : "0" + (today.getMonth() + 1)) + "-" + (today.getDate() > 9 ? (today.getDate()) : "0" + (today.getDate())); | ||
| 76 | - backTime = today | ||
| 77 | - // } else if (period == 'yestoday') { | ||
| 78 | - // var time = (new Date).getTime() - 24 * 60 * 60 * 1000; | ||
| 79 | - // var yesday = new Date(time); // 获取的是前一天日期 | ||
| 80 | - // yesday = yesday.getFullYear() + "-" + (yesday.getMonth() > 9 ? (yesday.getMonth() + 1) : "0" + (yesday.getMonth() + 1)) + "-" + (yesday.getDate() > 9 ? (yesday.getDate()) : "0" + (yesday.getDate())); | ||
| 81 | - // backTime = yesday | ||
| 82 | - // } | ||
| 83 | - refreshPage() | 60 | + $("#orgSearchBtn").on("click",function () { |
| 61 | + renderinspectioncountListTable(); | ||
| 84 | }); | 62 | }); |
| 63 | + // 日期方式选择 | ||
| 64 | + /* $('#btns-insp-time button').click(function () { | ||
| 65 | + $.each($("button.date"), function (i, e) { | ||
| 66 | + var $dom = $(e); | ||
| 67 | + if ($dom.hasClass("active")) { | ||
| 68 | + $dom.removeClass("active") | ||
| 69 | + } | ||
| 70 | + }) | ||
| 71 | + $("#backTime").val('') | ||
| 72 | + backTime = '' | ||
| 73 | + $("#btns-insp-time button").removeClass("active"); | ||
| 74 | + $(this).addClass("active"); | ||
| 75 | + period = ($(this).data("period")) | ||
| 76 | + // if (period == 'today') { | ||
| 77 | + var today = new Date() | ||
| 78 | + today = today.getFullYear() + "-" + (today.getMonth() >= 9 ? (today.getMonth() + 1) : "0" + (today.getMonth() + 1)) + "-" + (today.getDate() > 9 ? (today.getDate()) : "0" + (today.getDate())); | ||
| 79 | + backTime = today | ||
| 80 | + // } else if (period == 'yestoday') { | ||
| 81 | + // var time = (new Date).getTime() - 24 * 60 * 60 * 1000; | ||
| 82 | + // var yesday = new Date(time); // 获取的是前一天日期 | ||
| 83 | + // yesday = yesday.getFullYear() + "-" + (yesday.getMonth() > 9 ? (yesday.getMonth() + 1) : "0" + (yesday.getMonth() + 1)) + "-" + (yesday.getDate() > 9 ? (yesday.getDate()) : "0" + (yesday.getDate())); | ||
| 84 | + // backTime = yesday | ||
| 85 | + // } | ||
| 86 | + refreshPage() | ||
| 87 | + });*/ | ||
| 85 | 88 | ||
| 86 | //根据tab页刷新页面数据 | 89 | //根据tab页刷新页面数据 |
| 87 | - function refreshPage() { | ||
| 88 | - if (currSelect == 0) { | ||
| 89 | - renderinspectioncountListTable(); | ||
| 90 | - } else if (currSelect == 1) { | ||
| 91 | - renderinspectionBusTable(); | ||
| 92 | - } | ||
| 93 | - } | 90 | + /* function refreshPage() { |
| 91 | + | ||
| 92 | + | ||
| 93 | + | ||
| 94 | + }*/ | ||
| 94 | 95 | ||
| 95 | // tab页切换事件 | 96 | // tab页切换事件 |
| 96 | - element.on('tab(insp-tab)', function (data) { | 97 | +/* element.on('tab(insp-tab)', function (data) { |
| 97 | if (data.index == 0) { | 98 | if (data.index == 0) { |
| 98 | if (!inspIsLoad) { | 99 | if (!inspIsLoad) { |
| 99 | renderinspectioncountListTable(); | 100 | renderinspectioncountListTable(); |
| @@ -106,14 +107,12 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -106,14 +107,12 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 106 | } | 107 | } |
| 107 | } | 108 | } |
| 108 | currSelect = data.index; | 109 | currSelect = data.index; |
| 109 | - }); | 110 | + });*/ |
| 110 | 111 | ||
| 111 | $("#btn-inspStatistics-export-excel").on('click', function () { | 112 | $("#btn-inspStatistics-export-excel").on('click', function () { |
| 112 | - if (currSelect == 0) { | ||
| 113 | - var href = common.domainName + '/api-web/backupview/export?accessToken=' + accessToken + "&backTime=" + backTime; | ||
| 114 | - } else if (currSelect == 1) { | ||
| 115 | - var href = common.domainName + '/inspection-report/report/record/inspectionBusListExport?accessToken=' + accessToken + "&createTime=" + createTime + '&dateLimit=' + dateLimit + '&limit=-1'; | ||
| 116 | - } | 113 | + |
| 114 | + var href = common.domainName + '/api-web/backupview/export?accessToken=' + accessToken + "&backTime=" + backTime; | ||
| 115 | + | ||
| 117 | window.open(href) | 116 | window.open(href) |
| 118 | }) | 117 | }) |
| 119 | 118 | ||
| @@ -129,22 +128,22 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -129,22 +128,22 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 129 | layer.close(loading); | 128 | layer.close(loading); |
| 130 | var data = res.data; | 129 | var data = res.data; |
| 131 | var tr = '<div style="line-height: 26px;padding: 15px;text-align:center;color: #999;">暂无数据</div>'; | 130 | var tr = '<div style="line-height: 26px;padding: 15px;text-align:center;color: #999;">暂无数据</div>'; |
| 132 | - if(data.length==0){ | 131 | + if (data.length == 0) { |
| 133 | /*$(".layui-show").append(tr); | 132 | /*$(".layui-show").append(tr); |
| 134 | $("#inspectioncount_table_id").find("tbody").empty(); | 133 | $("#inspectioncount_table_id").find("tbody").empty(); |
| 135 | $("#inspectioncount_table_id").append(tr);*/ | 134 | $("#inspectioncount_table_id").append(tr);*/ |
| 136 | - }else { | 135 | + } else { |
| 137 | $("#inspectioncount_table_id").find("tbody").empty(); | 136 | $("#inspectioncount_table_id").find("tbody").empty(); |
| 138 | } | 137 | } |
| 139 | $.each(data, function (i, e) { | 138 | $.each(data, function (i, e) { |
| 140 | var evaluationLevel = ''; | 139 | var evaluationLevel = ''; |
| 141 | var tr = ''; | 140 | var tr = ''; |
| 142 | var str = ''; | 141 | var str = ''; |
| 143 | - if(e.businfo.evaluationLevel == 'one-level'){ | 142 | + if (e.businfo.evaluationLevel == 'one-level') { |
| 144 | evaluationLevel = '一级'; | 143 | evaluationLevel = '一级'; |
| 145 | - }else if(e.businfo.evaluationLevel == 'two-level'){ | 144 | + } else if (e.businfo.evaluationLevel == 'two-level') { |
| 146 | evaluationLevel = '二级'; | 145 | evaluationLevel = '二级'; |
| 147 | - }else if(e.businfo.evaluationLevel == 'three-level'){ | 146 | + } else if (e.businfo.evaluationLevel == 'three-level') { |
| 148 | evaluationLevel = '三级'; | 147 | evaluationLevel = '三级'; |
| 149 | } | 148 | } |
| 150 | if (e.rowspan == 0) { | 149 | if (e.rowspan == 0) { |
| @@ -185,7 +184,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -185,7 +184,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 185 | backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: green;font-size: 14px">成功</span></div>'; | 184 | backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: green;font-size: 14px">成功</span></div>'; |
| 186 | if (/失败/.test(backStatus)) { | 185 | if (/失败/.test(backStatus)) { |
| 187 | backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: red;font-size: 14px">失败</span></div>'; | 186 | backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: red;font-size: 14px">失败</span></div>'; |
| 188 | - }else if(/备份中/.test(backStatus)){ | 187 | + } else if (/备份中/.test(backStatus)) { |
| 189 | backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" style="color: #ffe40e;font-size: 14px">备份中</span></div>'; | 188 | backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" style="color: #ffe40e;font-size: 14px">备份中</span></div>'; |
| 190 | } | 189 | } |
| 191 | } | 190 | } |
| @@ -227,7 +226,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -227,7 +226,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 227 | id = f.id | 226 | id = f.id |
| 228 | } | 227 | } |
| 229 | if (f.backLevel != null) { | 228 | if (f.backLevel != null) { |
| 230 | - tr += '<td style="display: none" class="bizid" data-bizId = "'+e.businfo.busId+'" data-bizName = "'+ e.businfo.busTypeName+'">' + id + '</td>' + | 229 | + tr += '<td style="display: none" class="bizid" data-bizId = "' + e.businfo.busId + '" data-bizName = "' + e.businfo.busTypeName + '">' + id + '</td>' + |
| 231 | '<td style="display: none">' + f.resId + '</td>' + | 230 | '<td style="display: none">' + f.resId + '</td>' + |
| 232 | '<td>' + f.resName + '</td>' + | 231 | '<td>' + f.resName + '</td>' + |
| 233 | '<td>' + f.ip + '</td>' + | 232 | '<td>' + f.ip + '</td>' + |
| @@ -244,7 +243,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -244,7 +243,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 244 | '<td><input type="button" value="编辑" class="edit" style="background-color: #1E9FFF;"/></td>' + | 243 | '<td><input type="button" value="编辑" class="edit" style="background-color: #1E9FFF;"/></td>' + |
| 245 | '</tr>' | 244 | '</tr>' |
| 246 | } else { | 245 | } else { |
| 247 | - tr += '<td style="display: none" class="bizid" data-bizId = "'+e.businfo.busId+'" data-bizName = "'+ e.businfo.busTypeName+'">' + id + '</td>' + | 246 | + tr += '<td style="display: none" class="bizid" data-bizId = "' + e.businfo.busId + '" data-bizName = "' + e.businfo.busTypeName + '">' + id + '</td>' + |
| 248 | '<td style="display: none">' + f.resId + '</td>' + | 247 | '<td style="display: none">' + f.resId + '</td>' + |
| 249 | '<td>' + f.resName + '</td>' + | 248 | '<td>' + f.resName + '</td>' + |
| 250 | '<td>' + f.ip + '</td>' + | 249 | '<td>' + f.ip + '</td>' + |
| @@ -327,12 +326,10 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -327,12 +326,10 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 327 | if (param.resName == '') { | 326 | if (param.resName == '') { |
| 328 | layer.msg('数据库名称不能为空!', {icon: 1}); | 327 | layer.msg('数据库名称不能为空!', {icon: 1}); |
| 329 | return; | 328 | return; |
| 330 | - } | ||
| 331 | - else if (param.startTime == '') { | 329 | + } else if (param.startTime == '') { |
| 332 | layer.msg('开始时间不能为空!', {icon: 1}); | 330 | layer.msg('开始时间不能为空!', {icon: 1}); |
| 333 | return; | 331 | return; |
| 334 | - } | ||
| 335 | - else if (param.endTime == '') { | 332 | + } else if (param.endTime == '') { |
| 336 | layer.msg('结束时间不能为空!', {icon: 1}); | 333 | layer.msg('结束时间不能为空!', {icon: 1}); |
| 337 | return; | 334 | return; |
| 338 | } else { | 335 | } else { |
| @@ -428,12 +425,10 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -428,12 +425,10 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 428 | if (param.resName == '') { | 425 | if (param.resName == '') { |
| 429 | layer.msg('数据库名称不能为空!', {icon: 2}); | 426 | layer.msg('数据库名称不能为空!', {icon: 2}); |
| 430 | return; | 427 | return; |
| 431 | - } | ||
| 432 | - else if (param.startTime == '') { | 428 | + } else if (param.startTime == '') { |
| 433 | layer.msg('开始时间不能为空!', {icon: 2}); | 429 | layer.msg('开始时间不能为空!', {icon: 2}); |
| 434 | return; | 430 | return; |
| 435 | - } | ||
| 436 | - else if (param.endTime == '') { | 431 | + } else if (param.endTime == '') { |
| 437 | layer.msg('结束时间不能为空!', {icon: 2}); | 432 | layer.msg('结束时间不能为空!', {icon: 2}); |
| 438 | return; | 433 | return; |
| 439 | 434 | ||
| @@ -493,10 +488,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -493,10 +488,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
| 493 | return this.getFullYear() + "-" + (this.getMonth() >= 9 ? (this.getMonth() + 1) : "0" + (this.getMonth() + 1)) + "-" + (this.getDate() > 9 ? (this.getDate()) : "0" + (this.getDate())) + " " + (this.getHours() > 9 ? this.getHours() : "0" + this.getHours()) + ":" + (this.getMinutes() > 9 ? this.getMinutes() : "0" + this.getMinutes()) + ":" + (this.getSeconds() > 9 ? this.getSeconds() : "0" + this.getSeconds()); | 488 | return this.getFullYear() + "-" + (this.getMonth() >= 9 ? (this.getMonth() + 1) : "0" + (this.getMonth() + 1)) + "-" + (this.getDate() > 9 ? (this.getDate()) : "0" + (this.getDate())) + " " + (this.getHours() > 9 ? this.getHours() : "0" + this.getHours()) + ":" + (this.getMinutes() > 9 ? this.getMinutes() : "0" + this.getMinutes()) + ":" + (this.getSeconds() > 9 ? this.getSeconds() : "0" + this.getSeconds()); |
| 494 | }; | 489 | }; |
| 495 | 490 | ||
| 496 | - //业务报表统计数据列表 | ||
| 497 | - function renderinspectionBusTable() { | ||
| 498 | - | ||
| 499 | - } | ||
| 500 | 491 | ||
| 501 | }); | 492 | }); |
| 502 | 493 |
| @@ -39,7 +39,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -39,7 +39,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 39 | $dom.removeClass("active") | 39 | $dom.removeClass("active") |
| 40 | } | 40 | } |
| 41 | }) | 41 | }) |
| 42 | - reloadAllChange() | 42 | + //reloadAllChange() |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | }); | 45 | }); |
| @@ -76,16 +76,16 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -76,16 +76,16 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 76 | }); | 76 | }); |
| 77 | 77 | ||
| 78 | // 回车搜索 | 78 | // 回车搜索 |
| 79 | - $('[lay-filter="form-bizupgrade-condition"] input').keydown(function (e) { | 79 | + /* $('[lay-filter="form-bizupgrade-condition"] input').keydown(function (e) { |
| 80 | if (e.keyCode === 13) { | 80 | if (e.keyCode === 13) { |
| 81 | reloadAllChange(); | 81 | reloadAllChange(); |
| 82 | } | 82 | } |
| 83 | - }); | 83 | + });*/ |
| 84 | 84 | ||
| 85 | // 下拉框改变搜索 | 85 | // 下拉框改变搜索 |
| 86 | - form.on('select(slt-bizupgrade-group)', reloadAllChange); | 86 | + //form.on('select(slt-bizupgrade-group)', reloadAllChange); |
| 87 | // 下拉框改变搜索 | 87 | // 下拉框改变搜索 |
| 88 | - form.on('select(slt-bizupgrade-biz)', reloadAllChange); | 88 | + //form.on('select(slt-bizupgrade-biz)', reloadAllChange); |
| 89 | 89 | ||
| 90 | // tab页切换事件 | 90 | // tab页切换事件 |
| 91 | element.on('tab(bizupgrade-tab)', function (data) { | 91 | element.on('tab(bizupgrade-tab)', function (data) { |
| @@ -102,6 +102,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -102,6 +102,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 102 | } | 102 | } |
| 103 | currSelect = data.index; | 103 | currSelect = data.index; |
| 104 | }); | 104 | }); |
| 105 | + $("#orgSearchBtn").on("click",function () { | ||
| 106 | + renderFileupgradeListTable(); | ||
| 107 | + renderPatchupgradeListTable(); | ||
| 108 | + }); | ||
| 105 | // 加载配件更换表格 | 109 | // 加载配件更换表格 |
| 106 | function renderFileupgradeListTable() { | 110 | function renderFileupgradeListTable() { |
| 107 | var conditions = form.val('form-bizupgrade-condition'); | 111 | var conditions = form.val('form-bizupgrade-condition'); |
| @@ -237,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -237,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 237 | field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { | 241 | field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { |
| 238 | var manufacturerName = ''; | 242 | var manufacturerName = ''; |
| 239 | if(d.manufacturerId == '0'){ | 243 | if(d.manufacturerId == '0'){ |
| 240 | - manufacturerName = d.manufacturerOther; | 244 | + manufacturerName = '其他'; |
| 241 | }else { | 245 | }else { |
| 242 | if(manufactureArr && manufactureArr.length>0){ | 246 | if(manufactureArr && manufactureArr.length>0){ |
| 243 | $.each(manufactureArr, function (i, v) { | 247 | $.each(manufactureArr, function (i, v) { |
| @@ -294,7 +298,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -294,7 +298,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 294 | common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { | 298 | common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { |
| 295 | $("#bizupgrade-form-save-id").trigger("click"); | 299 | $("#bizupgrade-form-save-id").trigger("click"); |
| 296 | reloadAllChange(); | 300 | reloadAllChange(); |
| 297 | - },null,null,null,{end: reloadAllChange()}) | 301 | + },null,null,null,{end: function () { |
| 302 | + reloadAllChange(); | ||
| 303 | + }}) | ||
| 298 | } | 304 | } |
| 299 | 305 | ||
| 300 | //查看附件/调整信息列表 | 306 | //查看附件/调整信息列表 |
| @@ -314,7 +320,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -314,7 +320,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 314 | url: url, | 320 | url: url, |
| 315 | async: false, | 321 | async: false, |
| 316 | success: function (res) { | 322 | success: function (res) { |
| 317 | - var options = "<option value=''>=工作单位=</option>"; | 323 | + var options = "<option value=''>工作单位</option>"; |
| 318 | $.each(res.data, function (i, v) { | 324 | $.each(res.data, function (i, v) { |
| 319 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 325 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 320 | var obj = {}; | 326 | var obj = {}; |
| @@ -403,11 +409,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -403,11 +409,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 403 | */ | 409 | */ |
| 404 | var option = { | 410 | var option = { |
| 405 | title: { | 411 | title: { |
| 406 | - text: '系统升级和补丁升级图示', | 412 | + /* text: '系统升级和补丁升级图示', |
| 407 | textStyle: { | 413 | textStyle: { |
| 408 | color: '#a3a3a4', | 414 | color: '#a3a3a4', |
| 409 | fontSize: 12 | 415 | fontSize: 12 |
| 410 | - } | 416 | + }*/ |
| 411 | }, | 417 | }, |
| 412 | tooltip: { | 418 | tooltip: { |
| 413 | trigger: 'axis', | 419 | trigger: 'axis', |
| @@ -119,7 +119,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -119,7 +119,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 119 | $.ajax({ | 119 | $.ajax({ |
| 120 | url: url, | 120 | url: url, |
| 121 | success: function (res) { | 121 | success: function (res) { |
| 122 | - var options = "<option value=''>=工作单位=</option>"; | 122 | + var options = "<option value=''>工作单位</option>"; |
| 123 | $.each(res.data, function (i, v) { | 123 | $.each(res.data, function (i, v) { |
| 124 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 124 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 125 | }); | 125 | }); |
| @@ -150,14 +150,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se | @@ -150,14 +150,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se | ||
| 150 | return '' + | 150 | return '' + |
| 151 | '<div>' + | 151 | '<div>' + |
| 152 | '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' + | 152 | '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' + |
| 153 | - '<a data-id="' + d.busId + '" lay-tips="资源分配" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-res-config">资源分配</a>' + | ||
| 154 | - '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' + | 153 | + // '<a data-id="' + d.busId + '" lay-tips="资源分配" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-res-config">资源分配</a>' + |
| 154 | + // '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' + | ||
| 155 | '</div>' | 155 | '</div>' |
| 156 | } else { | 156 | } else { |
| 157 | return '' + | 157 | return '' + |
| 158 | '<div class="layui-row">' + | 158 | '<div class="layui-row">' + |
| 159 | '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' + | 159 | '<a data-id="' + d.busId + '" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-delete">删除</a>' + |
| 160 | - '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' + | 160 | + // '<a data-id="' + d.busId + '" lay-tips="授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal btn-bustype-authorize">授权</a>' + |
| 161 | '</div>' | 161 | '</div>' |
| 162 | } | 162 | } |
| 163 | } | 163 | } |
| @@ -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, { |
| @@ -256,7 +272,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -256,7 +272,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 256 | $.ajax({ | 272 | $.ajax({ |
| 257 | url: url, | 273 | url: url, |
| 258 | success: function(res) { | 274 | success: function(res) { |
| 259 | - var options = "<option value=''>=归属机房=</option>"; | 275 | + var options = "<option value=''>归属机房</option>"; |
| 260 | $.each(res.data, function (i, v) { | 276 | $.each(res.data, function (i, v) { |
| 261 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 277 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 262 | }); | 278 | }); |
| @@ -268,7 +284,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -268,7 +284,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 268 | $.ajax({ | 284 | $.ajax({ |
| 269 | url: url, | 285 | url: url, |
| 270 | success: function (res) { | 286 | success: function (res) { |
| 271 | - var options = "<option value=''>=工作单位=</option>"; | 287 | + var options = "<option value=''>工作单位</option>"; |
| 272 | $.each(res.data, function (i, v) { | 288 | $.each(res.data, function (i, v) { |
| 273 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 289 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 274 | }); | 290 | }); |
| @@ -37,7 +37,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -37,7 +37,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 37 | $dom.removeClass("active") | 37 | $dom.removeClass("active") |
| 38 | } | 38 | } |
| 39 | }) | 39 | }) |
| 40 | - reloadAllChange() | 40 | + //reloadAllChange() |
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | }); | 43 | }); |
| @@ -73,17 +73,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -73,17 +73,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 73 | }); | 73 | }); |
| 74 | 74 | ||
| 75 | // 回车搜索 | 75 | // 回车搜索 |
| 76 | - $('[lay-filter="form-devicehitch-condition"] input').keydown(function (e) { | 76 | + /* $('[lay-filter="form-devicehitch-condition"] input').keydown(function (e) { |
| 77 | if (e.keyCode === 13) { | 77 | if (e.keyCode === 13) { |
| 78 | reloadAllChange(); | 78 | reloadAllChange(); |
| 79 | } | 79 | } |
| 80 | - }); | 80 | + });*/ |
| 81 | 81 | ||
| 82 | // 下拉框改变搜索 | 82 | // 下拉框改变搜索 |
| 83 | - form.on('select(slt-devicehitch-org)', reloadAllChange); | 83 | + //form.on('select(slt-devicehitch-org)', reloadAllChange); |
| 84 | // 下拉框改变搜索 | 84 | // 下拉框改变搜索 |
| 85 | - form.on('select(slt-devicehitch-repairStatus)', reloadAllChange); | ||
| 86 | - | 85 | + //form.on('select(slt-devicehitch-repairStatus)', reloadAllChange); |
| 86 | + $("#orgSearchBtn").on("click",function () { | ||
| 87 | + loaddevicehitchTable(); | ||
| 88 | + }); | ||
| 87 | // 加载表格 | 89 | // 加载表格 |
| 88 | function loaddevicehitchTable() { | 90 | function loaddevicehitchTable() { |
| 89 | var conditions = form.val('form-devicehitch-condition'); | 91 | var conditions = form.val('form-devicehitch-condition'); |
| @@ -205,7 +207,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -205,7 +207,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 205 | common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ | 207 | common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ |
| 206 | $("#devicehitch-form-save-id").trigger("click"); | 208 | $("#devicehitch-form-save-id").trigger("click"); |
| 207 | reloadAllChange(); | 209 | reloadAllChange(); |
| 208 | - },null,null,null,{end: reloadAllChange()}) | 210 | + },null,null,null,{end: function () { |
| 211 | + reloadAllChange(); | ||
| 212 | + }}) | ||
| 209 | } | 213 | } |
| 210 | 214 | ||
| 211 | //查看附件/调整信息列表 | 215 | //查看附件/调整信息列表 |
| @@ -221,7 +225,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -221,7 +225,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 221 | url: url, | 225 | url: url, |
| 222 | async: false, | 226 | async: false, |
| 223 | success: function(res){ | 227 | success: function(res){ |
| 224 | - var options = "<option value=''>=归属机房=</option>"; | 228 | + var options = "<option value=''>归属机房</option>"; |
| 225 | $.each(res.data, function (i, v) { | 229 | $.each(res.data, function (i, v) { |
| 226 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 230 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 227 | var obj = {}; | 231 | var obj = {}; |
| @@ -234,7 +238,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -234,7 +238,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 234 | admin.req({ | 238 | admin.req({ |
| 235 | url: domainName + '/api-web/bResource/getInfoByAssetsType', | 239 | url: domainName + '/api-web/bResource/getInfoByAssetsType', |
| 236 | }).done(function (response) { | 240 | }).done(function (response) { |
| 237 | - var options = "<option value=''>=设备类型=</option>"; | 241 | + var options = "<option value=''>设备类型</option>"; |
| 238 | $.each(response.data, function (i, v) { | 242 | $.each(response.data, function (i, v) { |
| 239 | options += "<option value='" + v.resTypeCode + "'>" + v.resTypeName + "</option>" | 243 | options += "<option value='" + v.resTypeCode + "'>" + v.resTypeName + "</option>" |
| 240 | }); | 244 | }); |
| @@ -309,11 +313,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -309,11 +313,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 309 | */ | 313 | */ |
| 310 | var option = { | 314 | var option = { |
| 311 | title: { | 315 | title: { |
| 312 | - text: '设备维修统计图示', | 316 | + /* text: '设备维修统计图示', |
| 313 | textStyle: { | 317 | textStyle: { |
| 314 | color: '#a3a3a4', | 318 | color: '#a3a3a4', |
| 315 | fontSize: 12 | 319 | fontSize: 12 |
| 316 | - } | 320 | + }*/ |
| 317 | }, | 321 | }, |
| 318 | tooltip: { | 322 | tooltip: { |
| 319 | trigger: 'axis', | 323 | trigger: 'axis', |
| @@ -133,7 +133,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -133,7 +133,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 133 | $.ajax({ | 133 | $.ajax({ |
| 134 | url: url, | 134 | url: url, |
| 135 | success: function(res) { | 135 | success: function(res) { |
| 136 | - var options = "<option value=''>=归属机房=</option>"; | 136 | + var options = "<option value=''>归属机房</option>"; |
| 137 | $.each(res.data, function (i, v) { | 137 | $.each(res.data, function (i, v) { |
| 138 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 138 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 139 | }); | 139 | }); |
| @@ -146,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -146,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 146 | $.ajax({ | 146 | $.ajax({ |
| 147 | url: url, | 147 | url: url, |
| 148 | success: function (res) { | 148 | success: function (res) { |
| 149 | - var options = "<option value=''>=工作单位=</option>"; | 149 | + var options = "<option value=''>工作单位</option>"; |
| 150 | $.each(res.data, function (i, v) { | 150 | $.each(res.data, function (i, v) { |
| 151 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 151 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 152 | }); | 152 | }); |
| @@ -39,7 +39,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -39,7 +39,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 39 | $dom.removeClass("active") | 39 | $dom.removeClass("active") |
| 40 | } | 40 | } |
| 41 | }) | 41 | }) |
| 42 | - reloadAllChange() | 42 | + //reloadAllChange() |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | }); | 45 | }); |
| @@ -76,20 +76,20 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -76,20 +76,20 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 76 | }); | 76 | }); |
| 77 | 77 | ||
| 78 | // 回车搜索 | 78 | // 回车搜索 |
| 79 | - $('[lay-filter="form-emergency-condition"] input').keydown(function (e) { | 79 | + /* $('[lay-filter="form-emergency-condition"] input').keydown(function (e) { |
| 80 | if (e.keyCode === 13) { | 80 | if (e.keyCode === 13) { |
| 81 | reloadAllChange(); | 81 | reloadAllChange(); |
| 82 | } | 82 | } |
| 83 | - }); | 83 | + });*/ |
| 84 | 84 | ||
| 85 | // 下拉框改变搜索 | 85 | // 下拉框改变搜索 |
| 86 | - form.on('select(slt-emergency-group)', reloadAllChange); | 86 | + //form.on('select(slt-emergency-group)', reloadAllChange); |
| 87 | // 下拉框改变搜索 | 87 | // 下拉框改变搜索 |
| 88 | - form.on('select(slt-emergency-biz)', reloadAllChange); | 88 | + //form.on('select(slt-emergency-biz)', reloadAllChange); |
| 89 | // 下拉框改变搜索 | 89 | // 下拉框改变搜索 |
| 90 | - form.on('select(slt-emergency-org)', reloadAllChange); | 90 | + //form.on('select(slt-emergency-org)', reloadAllChange); |
| 91 | 91 | ||
| 92 | - form.on('select(slt-emergency-status)', reloadAllChange); | 92 | + //form.on('select(slt-emergency-status)', reloadAllChange); |
| 93 | 93 | ||
| 94 | // tab页切换事件 | 94 | // tab页切换事件 |
| 95 | element.on('tab(emergency-tab)', function (data) { | 95 | element.on('tab(emergency-tab)', function (data) { |
| @@ -106,7 +106,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -106,7 +106,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 106 | } | 106 | } |
| 107 | currSelect = data.index; | 107 | currSelect = data.index; |
| 108 | }); | 108 | }); |
| 109 | - | 109 | + $("#orgSearchBtn").on("click",function () { |
| 110 | + renderEmergencyPlanListTable(); | ||
| 111 | + renderEmergencyReportListTable(); | ||
| 112 | + }); | ||
| 110 | // 加载配件更换表格 | 113 | // 加载配件更换表格 |
| 111 | function renderEmergencyPlanListTable() { | 114 | function renderEmergencyPlanListTable() { |
| 112 | var conditions = form.val('form-emergency-condition'); | 115 | var conditions = form.val('form-emergency-condition'); |
| @@ -331,7 +334,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -331,7 +334,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 331 | common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { | 334 | common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { |
| 332 | $("#emergency-form-save-id").trigger("click"); | 335 | $("#emergency-form-save-id").trigger("click"); |
| 333 | reloadAllChange(); | 336 | reloadAllChange(); |
| 334 | - },null,null,null,{end: reloadAllChange()}) | 337 | + },null,null,null,{end: function () { |
| 338 | + reloadAllChange(); | ||
| 339 | + }}) | ||
| 335 | } | 340 | } |
| 336 | 341 | ||
| 337 | //查看附件/调整信息列表 | 342 | //查看附件/调整信息列表 |
| @@ -345,7 +350,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -345,7 +350,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 345 | admin.req({ | 350 | admin.req({ |
| 346 | url: domainName + '/mj/sysOrg/page?orgType=1' | 351 | url: domainName + '/mj/sysOrg/page?orgType=1' |
| 347 | }).done(function (response) { | 352 | }).done(function (response) { |
| 348 | - var options = "<option value=''>=所属处室=</option>"; | 353 | + var options = "<option value=''>所属处室</option>"; |
| 349 | $.each(response.data.rows, function (i, v) { | 354 | $.each(response.data.rows, function (i, v) { |
| 350 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" | 355 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" |
| 351 | }); | 356 | }); |
| @@ -361,7 +366,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -361,7 +366,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 361 | url: url, | 366 | url: url, |
| 362 | async: false, | 367 | async: false, |
| 363 | success: function (res) { | 368 | success: function (res) { |
| 364 | - var options = "<option value=''>=工作单位=</option>"; | 369 | + var options = "<option value=''>工作单位</option>"; |
| 365 | $.each(res.data, function (i, v) { | 370 | $.each(res.data, function (i, v) { |
| 366 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 371 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 367 | var obj = {}; | 372 | var obj = {}; |
| @@ -454,11 +459,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -454,11 +459,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 454 | */ | 459 | */ |
| 455 | var option = { | 460 | var option = { |
| 456 | title: { | 461 | title: { |
| 457 | - text: '应急预案和演练报告图示', | 462 | + /* text: '应急预案和演练报告图示', |
| 458 | textStyle: { | 463 | textStyle: { |
| 459 | color: '#a3a3a4', | 464 | color: '#a3a3a4', |
| 460 | fontSize: 12 | 465 | fontSize: 12 |
| 461 | - } | 466 | + }*/ |
| 462 | }, | 467 | }, |
| 463 | tooltip: { | 468 | tooltip: { |
| 464 | trigger: 'axis', | 469 | trigger: 'axis', |
| @@ -162,7 +162,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -162,7 +162,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 162 | admin.req({ | 162 | admin.req({ |
| 163 | url: domainName + '/mj/sysOrg/page?orgType=1' | 163 | url: domainName + '/mj/sysOrg/page?orgType=1' |
| 164 | }).done(function (response) { | 164 | }).done(function (response) { |
| 165 | - var options = "<option value=''>=所属处室=</option>"; | 165 | + var options = "<option value=''>所属处室</option>"; |
| 166 | $.each(response.data.rows, function (i, v) { | 166 | $.each(response.data.rows, function (i, v) { |
| 167 | 167 | ||
| 168 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" | 168 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" |
| @@ -178,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -178,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 178 | $.ajax({ | 178 | $.ajax({ |
| 179 | url: url, | 179 | url: url, |
| 180 | success: function (res) { | 180 | success: function (res) { |
| 181 | - var options = "<option value=''>=工作单位=</option>"; | 181 | + var options = "<option value=''>工作单位</option>"; |
| 182 | $.each(res.data, function (i, v) { | 182 | $.each(res.data, function (i, v) { |
| 183 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 183 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 184 | }); | 184 | }); |
| @@ -41,7 +41,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -41,7 +41,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 41 | $dom.removeClass("active") | 41 | $dom.removeClass("active") |
| 42 | } | 42 | } |
| 43 | }) | 43 | }) |
| 44 | - reloadAllChange() | 44 | + //reloadAllChange() |
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | }); | 47 | }); |
| @@ -78,14 +78,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -78,14 +78,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 78 | }); | 78 | }); |
| 79 | 79 | ||
| 80 | // 回车搜索 | 80 | // 回车搜索 |
| 81 | - $('[lay-filter="form-enterStaff-condition"] input').keydown(function (e) { | 81 | + /* $('[lay-filter="form-enterStaff-condition"] input').keydown(function (e) { |
| 82 | if (e.keyCode === 13) { | 82 | if (e.keyCode === 13) { |
| 83 | reloadAllChange(); | 83 | reloadAllChange(); |
| 84 | } | 84 | } |
| 85 | - }); | 85 | + });*/ |
| 86 | 86 | ||
| 87 | // 下拉框改变搜索 | 87 | // 下拉框改变搜索 |
| 88 | - form.on('select(slt-staff-group)', reloadAllChange); | 88 | + //form.on('select(slt-staff-group)', reloadAllChange); |
| 89 | 89 | ||
| 90 | // tab页切换事件 | 90 | // tab页切换事件 |
| 91 | element.on('tab(enterdevice-tab)', function (data) { | 91 | element.on('tab(enterdevice-tab)', function (data) { |
| @@ -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 | //查看更换配件列表 |
| @@ -419,7 +421,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -419,7 +421,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 419 | url: url, | 421 | url: url, |
| 420 | async: false, | 422 | async: false, |
| 421 | success: function (res) { | 423 | success: function (res) { |
| 422 | - var options = "<option value=''>=归属机房=</option>"; | 424 | + var options = "<option value=''>归属机房</option>"; |
| 423 | $.each(res.data, function (i, v) { | 425 | $.each(res.data, function (i, v) { |
| 424 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 426 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 425 | var obj = {}; | 427 | var obj = {}; |
| @@ -466,6 +468,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -466,6 +468,10 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 466 | window.open(url); | 468 | window.open(url); |
| 467 | } | 469 | } |
| 468 | }) | 470 | }) |
| 471 | + $("#orgSearchBtn").on("click",function () { | ||
| 472 | + renderEnterDeviceListTable(); | ||
| 473 | + renderFittingFixListTable(); | ||
| 474 | + }); | ||
| 469 | 475 | ||
| 470 | // 各单位维修情况 | 476 | // 各单位维修情况 |
| 471 | function loadEnterDeviceChart() { | 477 | function loadEnterDeviceChart() { |
| @@ -538,11 +544,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -538,11 +544,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 538 | */ | 544 | */ |
| 539 | var option = { | 545 | var option = { |
| 540 | title: { | 546 | title: { |
| 541 | - text: '设备出入和配件更换图示', | 547 | + /* text: '设备出入和配件更换图示', |
| 542 | textStyle: { | 548 | textStyle: { |
| 543 | color: '#a3a3a4', | 549 | color: '#a3a3a4', |
| 544 | fontSize: 14 | 550 | fontSize: 14 |
| 545 | - } | 551 | + }*/ |
| 546 | }, | 552 | }, |
| 547 | tooltip: { | 553 | tooltip: { |
| 548 | trigger: 'axis', | 554 | trigger: 'axis', |
| @@ -39,7 +39,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -39,7 +39,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 39 | $dom.removeClass("active") | 39 | $dom.removeClass("active") |
| 40 | } | 40 | } |
| 41 | }) | 41 | }) |
| 42 | - reloadAllChange() | 42 | + //reloadAllChange() |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | }); | 45 | }); |
| @@ -73,16 +73,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -73,16 +73,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 73 | createTime = ($(this).data("period")) | 73 | createTime = ($(this).data("period")) |
| 74 | reloadAllChange(); | 74 | reloadAllChange(); |
| 75 | }); | 75 | }); |
| 76 | + $("#orgSearchBtn").on("click",function () { | ||
| 77 | + loadWorkReportTable(); | ||
| 78 | + }); | ||
| 76 | 79 | ||
| 77 | // 回车搜索 | 80 | // 回车搜索 |
| 78 | - $('[lay-filter="form-enterStaff-condition"] input').keydown(function (e) { | 81 | + /* $('[lay-filter="form-enterStaff-condition"] input').keydown(function (e) { |
| 79 | if (e.keyCode === 13) { | 82 | if (e.keyCode === 13) { |
| 80 | reloadAllChange(); | 83 | reloadAllChange(); |
| 81 | } | 84 | } |
| 82 | - }); | 85 | + });*/ |
| 83 | 86 | ||
| 84 | // 下拉框改变搜索 | 87 | // 下拉框改变搜索 |
| 85 | - form.on('select(slt-staff-group)', reloadAllChange); | 88 | + //form.on('select(slt-staff-group)', reloadAllChange); |
| 86 | // 加载工作汇报表格 | 89 | // 加载工作汇报表格 |
| 87 | function loadWorkReportTable() { | 90 | function loadWorkReportTable() { |
| 88 | var conditions = form.val('form-enterStaff-condition'); | 91 | var conditions = form.val('form-enterStaff-condition'); |
| @@ -224,8 +227,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -224,8 +227,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 224 | var title = id ? '编辑' : '新增' | 227 | var title = id ? '编辑' : '新增' |
| 225 | common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { | 228 | common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { |
| 226 | $("#staff-form-save-id").trigger("click"); | 229 | $("#staff-form-save-id").trigger("click"); |
| 227 | - reloadAllChange(); | ||
| 228 | - },null,null,null,{end: reloadAllChange()}) | 230 | + },null,['90%', '90%'],null,{end: function () { |
| 231 | + reloadAllChange(); | ||
| 232 | + }}) | ||
| 229 | } | 233 | } |
| 230 | 234 | ||
| 231 | //查看附件/接收人列表 | 235 | //查看附件/接收人列表 |
| @@ -243,7 +247,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -243,7 +247,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 243 | url: url, | 247 | url: url, |
| 244 | async: false, | 248 | async: false, |
| 245 | success: function (res) { | 249 | success: function (res) { |
| 246 | - var options = "<option value=''>=工作单位=</option>"; | 250 | + var options = "<option value=''>工作单位</option>"; |
| 247 | $.each(res.data, function (i, v) { | 251 | $.each(res.data, function (i, v) { |
| 248 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 252 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 249 | var obj = {}; | 253 | var obj = {}; |
| @@ -261,7 +265,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -261,7 +265,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 261 | url: url, | 265 | url: url, |
| 262 | async: false, | 266 | async: false, |
| 263 | success: function(res){ | 267 | success: function(res){ |
| 264 | - var options = "<option value=''>=归属机房=</option>"; | 268 | + var options = "<option value=''>归属机房</option>"; |
| 265 | $.each(res.data, function (i, v) { | 269 | $.each(res.data, function (i, v) { |
| 266 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 270 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 267 | var obj = {}; | 271 | var obj = {}; |
| @@ -331,11 +335,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -331,11 +335,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 331 | */ | 335 | */ |
| 332 | var option = { | 336 | var option = { |
| 333 | title: { | 337 | title: { |
| 334 | - text: '设备出入和配件更换图示', | 338 | + /* text: '设备出入和配件更换图示', |
| 335 | textStyle: { | 339 | textStyle: { |
| 336 | color: '#a3a3a4', | 340 | color: '#a3a3a4', |
| 337 | fontSize: 12 | 341 | fontSize: 12 |
| 338 | - } | 342 | + }*/ |
| 339 | }, | 343 | }, |
| 340 | tooltip: { | 344 | tooltip: { |
| 341 | trigger: 'axis', | 345 | trigger: 'axis', |
| @@ -37,7 +37,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -37,7 +37,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 37 | $dom.removeClass("active") | 37 | $dom.removeClass("active") |
| 38 | } | 38 | } |
| 39 | }) | 39 | }) |
| 40 | - reloadAllChange() | 40 | + //reloadAllChange() |
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | }); | 43 | }); |
| @@ -46,7 +46,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -46,7 +46,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 46 | loadOrgextraChart(); | 46 | loadOrgextraChart(); |
| 47 | loadextraTable(); | 47 | loadextraTable(); |
| 48 | loadConditionSelect(); | 48 | loadConditionSelect(); |
| 49 | - | 49 | + $("#orgSearchBtn").on("click",function () { |
| 50 | + loadextraTable(); | ||
| 51 | + }); | ||
| 50 | 52 | ||
| 51 | //监听Esc事件 | 53 | //监听Esc事件 |
| 52 | $(document).keyup(function (event) { | 54 | $(document).keyup(function (event) { |
| @@ -73,14 +75,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -73,14 +75,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 73 | }); | 75 | }); |
| 74 | 76 | ||
| 75 | // 回车搜索 | 77 | // 回车搜索 |
| 76 | - $('[lay-filter="form-extra-condition"] input').keydown(function (e) { | 78 | + /* $('[lay-filter="form-extra-condition"] input').keydown(function (e) { |
| 77 | if (e.keyCode === 13) { | 79 | if (e.keyCode === 13) { |
| 78 | reloadAllChange(); | 80 | reloadAllChange(); |
| 79 | } | 81 | } |
| 80 | - }); | 82 | + });*/ |
| 81 | 83 | ||
| 82 | // 下拉框改变搜索 | 84 | // 下拉框改变搜索 |
| 83 | - form.on('select(slt-extra-group)', reloadAllChange); | 85 | + //form.on('select(slt-extra-group)', reloadAllChange); |
| 84 | 86 | ||
| 85 | // 加载表格 | 87 | // 加载表格 |
| 86 | function loadextraTable() { | 88 | function loadextraTable() { |
| @@ -193,7 +195,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -193,7 +195,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 193 | common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ | 195 | common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ |
| 194 | $("#extra-form-save-id").trigger("click"); | 196 | $("#extra-form-save-id").trigger("click"); |
| 195 | reloadAllChange(); | 197 | reloadAllChange(); |
| 196 | - },null,null,null,{end: reloadAllChange()}) | 198 | + },null,null,null,{end: function () { |
| 199 | + reloadAllChange(); | ||
| 200 | + }}) | ||
| 197 | } | 201 | } |
| 198 | 202 | ||
| 199 | //查看附件/调整信息列表 | 203 | //查看附件/调整信息列表 |
| @@ -209,7 +213,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -209,7 +213,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 209 | url: url, | 213 | url: url, |
| 210 | async: false, | 214 | async: false, |
| 211 | success: function (res) { | 215 | success: function (res) { |
| 212 | - var options = "<option value=''>=工作单位=</option>"; | 216 | + var options = "<option value=''>工作单位</option>"; |
| 213 | $.each(res.data, function (i, v) { | 217 | $.each(res.data, function (i, v) { |
| 214 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 218 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 215 | var obj = {}; | 219 | var obj = {}; |
| @@ -276,11 +280,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -276,11 +280,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 276 | */ | 280 | */ |
| 277 | var option = { | 281 | var option = { |
| 278 | title: { | 282 | title: { |
| 279 | - text: '厂商加班申请图示', | 283 | + /* text: '厂商加班申请图示', |
| 280 | textStyle: { | 284 | textStyle: { |
| 281 | color: '#a3a3a4', | 285 | color: '#a3a3a4', |
| 282 | fontSize: 12 | 286 | fontSize: 12 |
| 283 | - } | 287 | + }*/ |
| 284 | }, | 288 | }, |
| 285 | tooltip: { | 289 | tooltip: { |
| 286 | trigger: 'axis', | 290 | trigger: 'axis', |
| @@ -119,7 +119,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -119,7 +119,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 119 | $.ajax({ | 119 | $.ajax({ |
| 120 | url: url, | 120 | url: url, |
| 121 | success: function (res) { | 121 | success: function (res) { |
| 122 | - var options = "<option value=''>=工作单位=</option>"; | 122 | + var options = "<option value=''>工作单位</option>"; |
| 123 | $.each(res.data, function (i, v) { | 123 | $.each(res.data, function (i, v) { |
| 124 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 124 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 125 | }); | 125 | }); |
| @@ -35,7 +35,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -35,7 +35,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 35 | $dom.removeClass("active") | 35 | $dom.removeClass("active") |
| 36 | } | 36 | } |
| 37 | }) | 37 | }) |
| 38 | - reloadAllChange() | 38 | + //reloadAllChange() |
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | }); | 41 | }); |
| @@ -71,15 +71,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -71,15 +71,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 71 | }); | 71 | }); |
| 72 | 72 | ||
| 73 | // 回车搜索 | 73 | // 回车搜索 |
| 74 | - $('[lay-filter="form-MeetingApply-condition"] input').keydown(function (e) { | 74 | + /* $('[lay-filter="form-MeetingApply-condition"] input').keydown(function (e) { |
| 75 | if (e.keyCode === 13) { | 75 | if (e.keyCode === 13) { |
| 76 | reloadAllChange(); | 76 | reloadAllChange(); |
| 77 | } | 77 | } |
| 78 | }); | 78 | }); |
| 79 | - | 79 | +*/ |
| 80 | // 下拉框改变搜索 | 80 | // 下拉框改变搜索 |
| 81 | - form.on('select(slt-MeetingApply-org)', reloadAllChange); | ||
| 82 | - | 81 | + //form.on('select(slt-MeetingApply-org)', reloadAllChange); |
| 82 | + $("#orgSearchBtn").on("click",function () { | ||
| 83 | + loadMeetingApplyTable(); | ||
| 84 | + }); | ||
| 83 | // 加载表格 | 85 | // 加载表格 |
| 84 | function loadMeetingApplyTable() { | 86 | function loadMeetingApplyTable() { |
| 85 | var conditions = form.val('form-MeetingApply-condition'); | 87 | var conditions = form.val('form-MeetingApply-condition'); |
| @@ -159,8 +161,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -159,8 +161,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 159 | common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ | 161 | common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ |
| 160 | $("#meetingApply-form-save-id").trigger("click"); | 162 | $("#meetingApply-form-save-id").trigger("click"); |
| 161 | form.render(); | 163 | form.render(); |
| 162 | - reloadAllChange(); | ||
| 163 | - },null,null,null,{end: reloadAllChange()}) | 164 | + },null,null,null,{end: function () { |
| 165 | + reloadAllChange(); | ||
| 166 | + }}) | ||
| 164 | } | 167 | } |
| 165 | 168 | ||
| 166 | //查看附件/调整信息列表 | 169 | //查看附件/调整信息列表 |
| @@ -174,7 +177,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -174,7 +177,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 174 | admin.req({ | 177 | admin.req({ |
| 175 | url: domainName + '/mj/sysOrg/page?orgType=1' | 178 | url: domainName + '/mj/sysOrg/page?orgType=1' |
| 176 | }).done(function (response) { | 179 | }).done(function (response) { |
| 177 | - var options = "<option value=''>=主办处室=</option>"; | 180 | + var options = "<option value=''>主办处室</option>"; |
| 178 | 181 | ||
| 179 | var data = response.data.rows; | 182 | var data = response.data.rows; |
| 180 | $.each(data, function (i, v) { | 183 | $.each(data, function (i, v) { |
| @@ -237,11 +240,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -237,11 +240,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 237 | */ | 240 | */ |
| 238 | var option = { | 241 | var option = { |
| 239 | title: { | 242 | title: { |
| 240 | - text: '视频会议申请图示', | 243 | + /* text: '视频会议申请图示', |
| 241 | textStyle: { | 244 | textStyle: { |
| 242 | color: '#a3a3a4', | 245 | color: '#a3a3a4', |
| 243 | fontSize: 12 | 246 | fontSize: 12 |
| 244 | - } | 247 | + }*/ |
| 245 | }, | 248 | }, |
| 246 | tooltip: { | 249 | tooltip: { |
| 247 | trigger: 'axis', | 250 | trigger: 'axis', |
| @@ -113,7 +113,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -113,7 +113,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 113 | admin.req({ | 113 | admin.req({ |
| 114 | url: domainName + '/mj/sysOrg/page?orgType=1' | 114 | url: domainName + '/mj/sysOrg/page?orgType=1' |
| 115 | }).done(function (response) { | 115 | }).done(function (response) { |
| 116 | - var options = "<option value=''>=主办处室=</option>"; | 116 | + var options = "<option value=''>主办处室</option>"; |
| 117 | 117 | ||
| 118 | var data = response.data.rows; | 118 | var data = response.data.rows; |
| 119 | $.each(data, function (i, v) { | 119 | $.each(data, function (i, v) { |
| @@ -35,7 +35,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -35,7 +35,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 35 | $dom.removeClass("active") | 35 | $dom.removeClass("active") |
| 36 | } | 36 | } |
| 37 | }) | 37 | }) |
| 38 | - reloadAllChange() | 38 | + //reloadAllChange() |
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | }); | 41 | }); |
| @@ -43,7 +43,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -43,7 +43,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 43 | form.render(); | 43 | form.render(); |
| 44 | loadOrgmeetingsummaryChart(); | 44 | loadOrgmeetingsummaryChart(); |
| 45 | loadmeetingsummaryTable(); | 45 | loadmeetingsummaryTable(); |
| 46 | - | 46 | + $("#orgSearchBtn").on("click",function () { |
| 47 | + loadmeetingsummaryTable(); | ||
| 48 | + }); | ||
| 47 | 49 | ||
| 48 | //监听Esc事件 | 50 | //监听Esc事件 |
| 49 | $(document).keyup(function (event) { | 51 | $(document).keyup(function (event) { |
| @@ -70,14 +72,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -70,14 +72,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 70 | }); | 72 | }); |
| 71 | 73 | ||
| 72 | // 回车搜索 | 74 | // 回车搜索 |
| 73 | - $('[lay-filter="form-meetingsummary-condition"] input').keydown(function (e) { | 75 | + /* $('[lay-filter="form-meetingsummary-condition"] input').keydown(function (e) { |
| 74 | if (e.keyCode === 13) { | 76 | if (e.keyCode === 13) { |
| 75 | reloadAllChange(); | 77 | reloadAllChange(); |
| 76 | } | 78 | } |
| 77 | - }); | 79 | + });*/ |
| 78 | 80 | ||
| 79 | // 下拉框改变搜索 | 81 | // 下拉框改变搜索 |
| 80 | - form.on('select(slt-meetingsummary-group)', reloadAllChange); | 82 | + //form.on('select(slt-meetingsummary-group)', reloadAllChange); |
| 81 | 83 | ||
| 82 | // 加载表格 | 84 | // 加载表格 |
| 83 | function loadmeetingsummaryTable() { | 85 | function loadmeetingsummaryTable() { |
| @@ -198,11 +200,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -198,11 +200,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 198 | */ | 200 | */ |
| 199 | var option = { | 201 | var option = { |
| 200 | title: { | 202 | title: { |
| 201 | - text: '会议纪要图示', | 203 | + /* text: '会议纪要图示', |
| 202 | textStyle: { | 204 | textStyle: { |
| 203 | color: '#a3a3a4', | 205 | color: '#a3a3a4', |
| 204 | fontSize: 12 | 206 | fontSize: 12 |
| 205 | - } | 207 | + }*/ |
| 206 | }, | 208 | }, |
| 207 | tooltip: { | 209 | tooltip: { |
| 208 | trigger: 'axis', | 210 | trigger: 'axis', |
| @@ -31,7 +31,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -31,7 +31,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 31 | var conditions = form.val('form-prediction-condition'); | 31 | var conditions = form.val('form-prediction-condition'); |
| 32 | Object.assign(conditions, { | 32 | Object.assign(conditions, { |
| 33 | access_token: accessToken, | 33 | access_token: accessToken, |
| 34 | - keyword: $("#keyword").val(), | ||
| 35 | viewMode: 'true' | 34 | viewMode: 'true' |
| 36 | }); | 35 | }); |
| 37 | table.render({ | 36 | table.render({ |
| @@ -34,14 +34,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -34,14 +34,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 34 | }); | 34 | }); |
| 35 | 35 | ||
| 36 | // 回车搜索 | 36 | // 回车搜索 |
| 37 | - $('[lay-filter="form-recoverycount-condition"] input').keydown(function (e) { | 37 | + /* $('[lay-filter="form-recoverycount-condition"] input').keydown(function (e) { |
| 38 | if (e.keyCode === 13) { | 38 | if (e.keyCode === 13) { |
| 39 | reloadAllChange(); | 39 | reloadAllChange(); |
| 40 | } | 40 | } |
| 41 | - }); | 41 | + });*/ |
| 42 | 42 | ||
| 43 | // 下拉框改变搜索 | 43 | // 下拉框改变搜索 |
| 44 | - form.on('select(slt-recoverycount-biz)', reloadAllChange); | 44 | + //form.on('select(slt-recoverycount-biz)', reloadAllChange); |
| 45 | 45 | ||
| 46 | function renderStyle(number){ | 46 | function renderStyle(number){ |
| 47 | if(number>0){ | 47 | if(number>0){ |
| @@ -58,7 +58,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -58,7 +58,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 58 | return '<i class="layui-icon layui-icon-close" style="font-size: 30px; color: #ff252c;"></i>'; | 58 | return '<i class="layui-icon layui-icon-close" style="font-size: 30px; color: #ff252c;"></i>'; |
| 59 | } | 59 | } |
| 60 | } | 60 | } |
| 61 | - | 61 | + $("#orgSearchBtn").on("click",function () { |
| 62 | + renderrecoverycountListTable(); | ||
| 63 | + }); | ||
| 62 | // 加载设备出入表格 | 64 | // 加载设备出入表格 |
| 63 | function renderrecoverycountListTable() { | 65 | function renderrecoverycountListTable() { |
| 64 | var conditions = form.val('form-recoverycount-condition'); | 66 | var conditions = form.val('form-recoverycount-condition'); |
| @@ -36,7 +36,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -36,7 +36,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 36 | $dom.removeClass("active") | 36 | $dom.removeClass("active") |
| 37 | } | 37 | } |
| 38 | }) | 38 | }) |
| 39 | - reloadAllChange() | 39 | + //reloadAllChange() |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | }); | 42 | }); |
| @@ -64,22 +64,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -64,22 +64,24 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 64 | }); | 64 | }); |
| 65 | 65 | ||
| 66 | // 回车搜索 | 66 | // 回车搜索 |
| 67 | - $('[lay-filter="form-recoveryverify-condition"] input').keydown(function (e) { | 67 | + /* $('[lay-filter="form-recoveryverify-condition"] input').keydown(function (e) { |
| 68 | if (e.keyCode === 13) { | 68 | if (e.keyCode === 13) { |
| 69 | reloadAllChange(); | 69 | reloadAllChange(); |
| 70 | } | 70 | } |
| 71 | - }); | 71 | + });*/ |
| 72 | 72 | ||
| 73 | // 下拉框改变搜索 | 73 | // 下拉框改变搜索 |
| 74 | - form.on('select(slt-recoveryverify-group)', reloadAllChange); | 74 | + //form.on('select(slt-recoveryverify-group)', reloadAllChange); |
| 75 | // 下拉框改变搜索 | 75 | // 下拉框改变搜索 |
| 76 | - form.on('select(slt-recoveryverify-biz)', reloadAllChange); | 76 | + //form.on('select(slt-recoveryverify-biz)', reloadAllChange); |
| 77 | // 下拉框改变搜索 | 77 | // 下拉框改变搜索 |
| 78 | - form.on('select(slt-recoveryverify-org)', reloadAllChange); | ||
| 79 | - | ||
| 80 | - form.on('select(slt-recoveryverify-status)', reloadAllChange); | 78 | + //form.on('select(slt-recoveryverify-org)', reloadAllChange); |
| 81 | 79 | ||
| 80 | + //form.on('select(slt-recoveryverify-status)', reloadAllChange); | ||
| 82 | 81 | ||
| 82 | + $("#orgSearchBtn").on("click",function () { | ||
| 83 | + renderrecoveryverifyListTable(); | ||
| 84 | + }); | ||
| 83 | // 加载设备出入表格 | 85 | // 加载设备出入表格 |
| 84 | function renderrecoveryverifyListTable() { | 86 | function renderrecoveryverifyListTable() { |
| 85 | var conditions = form.val('form-recoveryverify-condition'); | 87 | var conditions = form.val('form-recoveryverify-condition'); |
| @@ -209,7 +211,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -209,7 +211,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 209 | common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { | 211 | common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { |
| 210 | $("#recoveryverify-form-save-id").trigger("click"); | 212 | $("#recoveryverify-form-save-id").trigger("click"); |
| 211 | reloadAllChange(); | 213 | reloadAllChange(); |
| 212 | - },null,null,null,{end: reloadAllChange()}) | 214 | + },null,null,null,{end: function () { |
| 215 | + reloadAllChange(); | ||
| 216 | + }}) | ||
| 213 | } | 217 | } |
| 214 | 218 | ||
| 215 | //查看附件/调整信息列表 | 219 | //查看附件/调整信息列表 |
| @@ -315,11 +319,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -315,11 +319,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 315 | */ | 319 | */ |
| 316 | var option = { | 320 | var option = { |
| 317 | title: { | 321 | title: { |
| 318 | - text: '数据库恢复验证统计图示', | 322 | + /* text: '数据库恢复验证统计图示', |
| 319 | textStyle: { | 323 | textStyle: { |
| 320 | color: localStorage.getItem("theme") === 'diablo' ?'#fff':'#000', | 324 | color: localStorage.getItem("theme") === 'diablo' ?'#fff':'#000', |
| 321 | fontSize: 14 | 325 | fontSize: 14 |
| 322 | - } | 326 | + }*/ |
| 323 | }, | 327 | }, |
| 324 | tooltip: { | 328 | tooltip: { |
| 325 | trigger: 'axis', | 329 | trigger: 'axis', |
| @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 195 | admin.req({ | 195 | admin.req({ |
| 196 | url: domainName + '/api-web/recoveryverify/loadresListforBiz?busId='+busId +'&resType=DATABASE_ORACLE' | 196 | url: domainName + '/api-web/recoveryverify/loadresListforBiz?busId='+busId +'&resType=DATABASE_ORACLE' |
| 197 | }).done(function (response) { | 197 | }).done(function (response) { |
| 198 | - var options = "<option value=''>=选择数据库=</option>"; | 198 | + var options = "<option value=''>选择数据库</option>"; |
| 199 | $.each(response.data, function (i, v) { | 199 | $.each(response.data, function (i, v) { |
| 200 | options += "<option value='" + v.resId + "'>" + v.resName + "</option>" | 200 | options += "<option value='" + v.resId + "'>" + v.resName + "</option>" |
| 201 | }); | 201 | }); |
| @@ -220,7 +220,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -220,7 +220,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 220 | admin.req({ | 220 | admin.req({ |
| 221 | url: domainName + '/mj/sysOrg/page?orgType=1' | 221 | url: domainName + '/mj/sysOrg/page?orgType=1' |
| 222 | }).done(function (response) { | 222 | }).done(function (response) { |
| 223 | - var options = "<option value=''>=所属处室=</option>"; | 223 | + var options = "<option value=''>所属处室</option>"; |
| 224 | 224 | ||
| 225 | var data = response.data.rows; | 225 | var data = response.data.rows; |
| 226 | $.each(data, function (i, v) { | 226 | $.each(data, function (i, v) { |
| @@ -238,7 +238,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -238,7 +238,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 238 | $.ajax({ | 238 | $.ajax({ |
| 239 | url: url, | 239 | url: url, |
| 240 | success: function (res) { | 240 | success: function (res) { |
| 241 | - var options = "<option value=''>=工作单位=</option>"; | 241 | + var options = "<option value=''>工作单位</option>"; |
| 242 | $.each(res.data, function (i, v) { | 242 | $.each(res.data, function (i, v) { |
| 243 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 243 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 244 | }); | 244 | }); |
| @@ -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 == '修改'; |
| @@ -763,7 +763,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -763,7 +763,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
| 763 | layer.open({ | 763 | layer.open({ |
| 764 | title: ['当前绑定的告警订阅', 'font-size:18px;'], | 764 | title: ['当前绑定的告警订阅', 'font-size:18px;'], |
| 765 | type: 1, | 765 | type: 1, |
| 766 | - area: ['60%', '70%'], | 766 | + area: ['80%', '80%'], |
| 767 | content: laytpl(res.body).render(JSON.stringify(params)), | 767 | content: laytpl(res.body).render(JSON.stringify(params)), |
| 768 | resize: false, | 768 | resize: false, |
| 769 | // yes: function (index, layero) { | 769 | // yes: function (index, layero) { |
| @@ -953,7 +953,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -953,7 +953,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
| 953 | collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(), | 953 | collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(), |
| 954 | pageName: 'resmanage' | 954 | pageName: 'resmanage' |
| 955 | } | 955 | } |
| 956 | - , height: 'full-200' | 956 | + , height: 'full-120' |
| 957 | , cellMinWidth: 80 | 957 | , cellMinWidth: 80 |
| 958 | , page: { | 958 | , page: { |
| 959 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 959 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
| @@ -36,7 +36,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -36,7 +36,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 36 | $dom.removeClass("active") | 36 | $dom.removeClass("active") |
| 37 | } | 37 | } |
| 38 | }) | 38 | }) |
| 39 | - reloadAllChange() | 39 | + //reloadAllChange() |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | }); | 42 | }); |
| @@ -73,16 +73,18 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -73,16 +73,18 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 73 | }); | 73 | }); |
| 74 | 74 | ||
| 75 | // 回车搜索 | 75 | // 回车搜索 |
| 76 | - $('[lay-filter="form-routeAdjust-condition"] input').keydown(function (e) { | 76 | + /* $('[lay-filter="form-routeAdjust-condition"] input').keydown(function (e) { |
| 77 | if (e.keyCode === 13) { | 77 | if (e.keyCode === 13) { |
| 78 | reloadAllChange(); | 78 | reloadAllChange(); |
| 79 | } | 79 | } |
| 80 | - }); | 80 | + });*/ |
| 81 | 81 | ||
| 82 | // 下拉框改变搜索 | 82 | // 下拉框改变搜索 |
| 83 | - form.on('select(slt-route-group)', reloadAllChange); | ||
| 84 | - form.on('select(slt-route-org)', reloadAllChange); | ||
| 85 | - | 83 | + /* form.on('select(slt-route-group)', reloadAllChange); |
| 84 | + form.on('select(slt-route-org)', reloadAllChange);*/ | ||
| 85 | + $("#orgSearchBtn").on("click",function () { | ||
| 86 | + loadWorkReportTable(); | ||
| 87 | + }); | ||
| 86 | // 加载工作汇报表格 | 88 | // 加载工作汇报表格 |
| 87 | function loadWorkReportTable() { | 89 | function loadWorkReportTable() { |
| 88 | var conditions = form.val('form-routeAdjust-condition'); | 90 | var conditions = form.val('form-routeAdjust-condition'); |
| @@ -164,7 +166,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -164,7 +166,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 164 | common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { | 166 | common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { |
| 165 | $("#routeAdjust-form-save-id").trigger("click"); | 167 | $("#routeAdjust-form-save-id").trigger("click"); |
| 166 | reloadAllChange(); | 168 | reloadAllChange(); |
| 167 | - },null,null,null,{end: reloadAllChange()}) | 169 | + },null,null,null,{end: function () { |
| 170 | + reloadAllChange(); | ||
| 171 | + }}) | ||
| 168 | } | 172 | } |
| 169 | 173 | ||
| 170 | //查看附件/调整信息列表 | 174 | //查看附件/调整信息列表 |
| @@ -183,7 +187,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -183,7 +187,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 183 | admin.req({ | 187 | admin.req({ |
| 184 | url: domainName + '/api-web/machineRoom/findRouteAjustType' | 188 | url: domainName + '/api-web/machineRoom/findRouteAjustType' |
| 185 | }).done(function (response) { | 189 | }).done(function (response) { |
| 186 | - var options = "<option value=''>=调整要求=</option>"; | 190 | + var options = "<option value=''>调整要求</option>"; |
| 187 | 191 | ||
| 188 | $.each(response.data, function (i, v) { | 192 | $.each(response.data, function (i, v) { |
| 189 | 193 | ||
| @@ -195,9 +199,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -195,9 +199,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 195 | admin.req({ | 199 | admin.req({ |
| 196 | url: domainName + '/api-web/bResource/findAssetsRepairList' | 200 | url: domainName + '/api-web/bResource/findAssetsRepairList' |
| 197 | }).done(function (response) { | 201 | }).done(function (response) { |
| 198 | - var options = "<option value=''>=城市A选择=</option>"; | 202 | + var options = "<option value=''>城市A选择</option>"; |
| 199 | $.each(response.data, function (i, v) { | 203 | $.each(response.data, function (i, v) { |
| 200 | - | ||
| 201 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" | 204 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" |
| 202 | }); | 205 | }); |
| 203 | $('#slt-route-org').html(options); | 206 | $('#slt-route-org').html(options); |
| @@ -354,11 +357,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -354,11 +357,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 354 | */ | 357 | */ |
| 355 | var option = { | 358 | var option = { |
| 356 | title: { | 359 | title: { |
| 357 | - text: '线路调整图示', | 360 | + /* text: '线路调整图示', |
| 358 | textStyle: { | 361 | textStyle: { |
| 359 | color: '#a3a3a4', | 362 | color: '#a3a3a4', |
| 360 | fontSize: 12 | 363 | fontSize: 12 |
| 361 | - } | 364 | + }*/ |
| 362 | }, | 365 | }, |
| 363 | tooltip: { | 366 | tooltip: { |
| 364 | trigger: 'axis', | 367 | trigger: 'axis', |
| @@ -224,7 +224,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi | @@ -224,7 +224,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi | ||
| 224 | admin.req({ | 224 | admin.req({ |
| 225 | url: domainName + '/api-web/bResource/findAssetsRepairList' | 225 | url: domainName + '/api-web/bResource/findAssetsRepairList' |
| 226 | }).done(function (response) { | 226 | }).done(function (response) { |
| 227 | - var options = "<option value=''>=城市选择=</option>"; | 227 | + var options = "<option value=''>城市选择</option>"; |
| 228 | $.each(response.data, function (i, v) { | 228 | $.each(response.data, function (i, v) { |
| 229 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" | 229 | options += "<option value='" + v.orgCode + "'>" + v.orgName + "</option>" |
| 230 | }); | 230 | }); |
| @@ -235,7 +235,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi | @@ -235,7 +235,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi | ||
| 235 | admin.req({ | 235 | admin.req({ |
| 236 | url: domainName + '/api-web/machineRoom/findRouteAjustType' | 236 | url: domainName + '/api-web/machineRoom/findRouteAjustType' |
| 237 | }).done(function (response) { | 237 | }).done(function (response) { |
| 238 | - var options = "<option value=''>=调整要求=</option>"; | 238 | + var options = "<option value=''>调整要求</option>"; |
| 239 | 239 | ||
| 240 | $.each(response.data, function (i, v) { | 240 | $.each(response.data, function (i, v) { |
| 241 | 241 |
| @@ -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, '<').replace(/>/g, '>'); | ||
| 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, '<').replace(/>/g, '>'); | ||
| 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, '"').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, '"').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 | } |
| @@ -201,7 +198,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -201,7 +198,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 201 | $.ajax({ | 198 | $.ajax({ |
| 202 | url: url, | 199 | url: url, |
| 203 | success: function(res) { | 200 | success: function(res) { |
| 204 | - var options = "<option value=''>=归属机房=</option>"; | 201 | + var options = "<option value=''>归属机房</option>"; |
| 205 | $.each(res.data, function (i, v) { | 202 | $.each(res.data, function (i, v) { |
| 206 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 203 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 207 | }); | 204 | }); |
| @@ -213,7 +210,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -213,7 +210,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 213 | $.ajax({ | 210 | $.ajax({ |
| 214 | url: url, | 211 | url: url, |
| 215 | success: function (res) { | 212 | success: function (res) { |
| 216 | - var options = "<option value=''>=工作单位=</option>"; | 213 | + var options = "<option value=''>工作单位</option>"; |
| 217 | $.each(res.data, function (i, v) { | 214 | $.each(res.data, function (i, v) { |
| 218 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" | 215 | options += "<option value='" + v.id + "'>" + v.shortName + "</option>" |
| 219 | }); | 216 | }); |
| @@ -90,7 +90,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'laytpl', | @@ -90,7 +90,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'laytpl', | ||
| 90 | <div class="layui-colla-item"> | 90 | <div class="layui-colla-item"> |
| 91 | <h2 class="layui-colla-title">${v.tempName} 协议：${v.tempType} 数量：${v.resList.length} | 91 | <h2 class="layui-colla-title">${v.tempName} 协议：${v.tempType} 数量：${v.resList.length} |
| 92 | <a data-index="${i}" class="layui-btn layui-btn-xs layui-btn-normal btn-task-checktemp-add"> | 92 | <a data-index="${i}" class="layui-btn layui-btn-xs layui-btn-normal btn-task-checktemp-add"> |
| 93 | - <i class="layui-icon"></i></a> | 93 | + 添加</a> |
| 94 | </h2> | 94 | </h2> |
| 95 | <div class="layui-colla-content"> | 95 | <div class="layui-colla-content"> |
| 96 | <table id="table-task-checktemp-list-${i}"></table> | 96 | <table id="table-task-checktemp-list-${i}"></table> |
| @@ -18,30 +18,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -18,30 +18,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | //回车搜索 | 20 | //回车搜索 |
| 21 | - $('#workReport_title').keydown(function (e) { | 21 | + /* $('#workReport_title').keydown(function (e) { |
| 22 | if (e.keyCode === 13) { | 22 | if (e.keyCode === 13) { |
| 23 | reloadWorkReportTable() | 23 | reloadWorkReportTable() |
| 24 | } | 24 | } |
| 25 | }) | 25 | }) |
| 26 | - | 26 | +*/ |
| 27 | //绑定是否阅读 | 27 | //绑定是否阅读 |
| 28 | - form.on('radio(workReport_isRead)', function () { | 28 | + /* form.on('radio(workReport_isRead)', function () { |
| 29 | isRead = $('input[name="isRead"]:checked').val() | 29 | isRead = $('input[name="isRead"]:checked').val() |
| 30 | reloadWorkReportTable() | 30 | reloadWorkReportTable() |
| 31 | - }) | 31 | + })*/ |
| 32 | 32 | ||
| 33 | //绑定类型 | 33 | //绑定类型 |
| 34 | - form.on('radio(workReport_type)', function () { | 34 | + /* form.on('radio(workReport_type)', function () { |
| 35 | repType = $('input[name="repType"]:checked').val() | 35 | repType = $('input[name="repType"]:checked').val() |
| 36 | reloadWorkReportTable() | 36 | reloadWorkReportTable() |
| 37 | - }) | 37 | + })*/ |
| 38 | 38 | ||
| 39 | //时间周期切换事件 | 39 | //时间周期切换事件 |
| 40 | $("#createTimeBtn button").on("click", function () { | 40 | $("#createTimeBtn button").on("click", 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 | //渲染表单元素 |
| @@ -61,7 +61,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -61,7 +61,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 61 | $('#workReport_create_month').on('click', function () { | 61 | $('#workReport_create_month').on('click', function () { |
| 62 | openWorkReportForm('month') | 62 | openWorkReportForm('month') |
| 63 | }) | 63 | }) |
| 64 | - | 64 | + $("#orgSearchBtn").on("click",function () { |
| 65 | + reloadWorkReportTable(); | ||
| 66 | + }); | ||
| 65 | //渲染表格 | 67 | //渲染表格 |
| 66 | var workReportTable = table.render({ | 68 | var workReportTable = table.render({ |
| 67 | elem: '#workReportTable', | 69 | elem: '#workReportTable', |
| @@ -89,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -89,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 89 | cols: [[ | 91 | cols: [[ |
| 90 | {type: 'checkbox'}, | 92 | {type: 'checkbox'}, |
| 91 | { | 93 | { |
| 92 | - field: 'repType', title: '汇报类型', align: 'center', width: 150, | 94 | + field: 'repType', title: '汇报类型', align: 'center', |
| 93 | templet: function (d) { | 95 | templet: function (d) { |
| 94 | var typeName = '' | 96 | var typeName = '' |
| 95 | switch (d.repType) { | 97 | switch (d.repType) { |
| @@ -107,15 +109,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -107,15 +109,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 107 | } | 109 | } |
| 108 | }, | 110 | }, |
| 109 | { | 111 | { |
| 110 | - field: 'repTitle', title: '标题', align: 'center', minWith: 300, | 112 | + field: 'repTitle', title: '标题', align: 'center', |
| 111 | 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>' |
| 112 | }, | 114 | }, |
| 113 | { | 115 | { |
| 114 | - field: 'attachmentList', title: '附件数量', align: 'center', width: 120, | 116 | + field: 'attachmentList', title: '附件数量', align: 'center', |
| 115 | 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>' |
| 116 | }, | 118 | }, |
| 117 | { | 119 | { |
| 118 | - field: 'reportUserList', title: '已读/接收人数', align: 'center', minWith: 150, | 120 | + field: 'reportUserList', title: '已读/接收人数', align: 'center', |
| 119 | templet: function (d) { | 121 | templet: function (d) { |
| 120 | var str = '' | 122 | var str = '' |
| 121 | var count = 0 | 123 | var count = 0 |
| @@ -129,7 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -129,7 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 129 | } | 131 | } |
| 130 | }, | 132 | }, |
| 131 | { | 133 | { |
| 132 | - field: 'reportUserList', title: '已读人员', align: 'center', minWith: 400, | 134 | + field: 'reportUserList', title: '已读人员', align: 'center', |
| 133 | templet: function (d) { | 135 | templet: function (d) { |
| 134 | var userName = [] | 136 | var userName = [] |
| 135 | var str = '' | 137 | var str = '' |
| @@ -145,13 +147,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -145,13 +147,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
| 145 | } | 147 | } |
| 146 | }, | 148 | }, |
| 147 | { | 149 | { |
| 148 | - field: 'createUserNickName', title: '创建人', align: 'center', minWith: 150, | 150 | + field: 'createUserNickName', title: '创建人', align: 'center', |
| 149 | }, | 151 | }, |
| 150 | { | 152 | { |
| 151 | - field: 'createTime', title: '上报时间', align: 'center', minWith: 150, | 153 | + field: 'createTime', title: '上报时间', align: 'center', |
| 152 | }, | 154 | }, |
| 153 | { | 155 | { |
| 154 | - title: '操作', align: "center", width: 120, | 156 | + title: '操作', align: "center", |
| 155 | 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>' |
| 156 | } | 158 | } |
| 157 | ]], | 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) { |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | <div class="page-panel"> | 8 | <div class="page-panel"> |
| 9 | <div class="main" style="background-color: #fff"> | 9 | <div class="main" style="background-color: #fff"> |
| 10 | <div class="layui-card-header" style="padding-bottom: 5px;z-index:999"> | 10 | <div class="layui-card-header" style="padding-bottom: 5px;z-index:999"> |
| 11 | - <div class="layui-btn-group time-group" id="backupCount_time_button_id" style="float: right;"> | 11 | + <div class="layui-btn-group time-group right" id="backupCount_time_button_id"> |
| 12 | <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth">上月 | 12 | <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | <button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" | 14 | <button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" |
| 1 | <style type="text/css"> | 1 | <style type="text/css"> |
| 2 | - td input{ | 2 | + td input { |
| 3 | width: 70px; | 3 | width: 70px; |
| 4 | border: 1px; | 4 | border: 1px; |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | element.style { | 7 | element.style { |
| 8 | } | 8 | } |
| 9 | + | ||
| 9 | .layui-table td, .layui-table th { | 10 | .layui-table td, .layui-table th { |
| 10 | position: relative; | 11 | position: relative; |
| 11 | padding: 9px 15px; | 12 | padding: 9px 15px; |
| @@ -13,12 +14,14 @@ | @@ -13,12 +14,14 @@ | ||
| 13 | line-height: 20px; | 14 | line-height: 20px; |
| 14 | font-size: 14px; | 15 | font-size: 14px; |
| 15 | } | 16 | } |
| 17 | + | ||
| 16 | .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] { | 18 | .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] { |
| 17 | border-width: 1px; | 19 | border-width: 1px; |
| 18 | border-style: solid; | 20 | border-style: solid; |
| 19 | border-color: #e6e6e6; | 21 | border-color: #e6e6e6; |
| 20 | } | 22 | } |
| 21 | - .layui-table th{ | 23 | + |
| 24 | + .layui-table th { | ||
| 22 | min-width: 35px; | 25 | min-width: 35px; |
| 23 | text-align: center; | 26 | text-align: center; |
| 24 | background-color: cornflowerblue; | 27 | background-color: cornflowerblue; |
| @@ -28,8 +31,8 @@ | @@ -28,8 +31,8 @@ | ||
| 28 | <article class="page-container template"> | 31 | <article class="page-container template"> |
| 29 | <div class="page-panel"> | 32 | <div class="page-panel"> |
| 30 | <div class="main" style="background-color: #fff"> | 33 | <div class="main" style="background-color: #fff"> |
| 31 | - <div class="layui-card-header"> | ||
| 32 | - <div class="layui-status"> | 34 | + <div class="layui-card-body" style="margin-top: 10px;"> |
| 35 | + <div style="display: flex;justify-content: space-between;align-items: center;"> | ||
| 33 | <form class="layui-form layui-card-header" onsubmit="return false" | 36 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 34 | lay-filter="dingjia-index-form"> | 37 | lay-filter="dingjia-index-form"> |
| 35 | <div class="layui-form-item"> | 38 | <div class="layui-form-item"> |
| @@ -37,51 +40,47 @@ | @@ -37,51 +40,47 @@ | ||
| 37 | <div class="layui-input-inline"> | 40 | <div class="layui-input-inline"> |
| 38 | <select name="busId" id="slt-dingjia-biz" | 41 | <select name="busId" id="slt-dingjia-biz" |
| 39 | lay-filter="slt-dingjia-biz" lay-search> | 42 | lay-filter="slt-dingjia-biz" lay-search> |
| 40 | - <option value="">=业务系统=</option> | 43 | + <option value="">业务系统</option> |
| 41 | </select> | 44 | </select> |
| 42 | </div> | 45 | </div> |
| 43 | </div> | 46 | </div> |
| 47 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 48 | + id="orgSearchBtn" >搜索 | ||
| 49 | + </button> | ||
| 44 | </div> | 50 | </div> |
| 45 | </form> | 51 | </form> |
| 46 | - <button class="layui-btn layui-btn-sm layui-btn-normal tab-button" | 52 | + |
| 53 | + </div> | ||
| 54 | + <div style="margin-bottom: 10px;margin-top: 10px;"> | ||
| 55 | + <button class="layui-btn layui-btn-sm layui-btn-normal" | ||
| 47 | id="btn-dingjia-export-excel"> | 56 | id="btn-dingjia-export-excel"> |
| 48 | - <i class="layui-icon"></i>导出到Excel | 57 | + <i class="layui-icon"></i>导出 |
| 49 | </button> | 58 | </button> |
| 50 | </div> | 59 | </div> |
| 51 | - </div> | ||
| 52 | - <div class="layui-card" style="height: 100%"> | ||
| 53 | - <div class="layui-card-body"> | ||
| 54 | - <div class="layui-tab" lay-filter="insp-tab"> | ||
| 55 | - <!-- <ul class="layui-tab-title"> | ||
| 56 | 60 | ||
| 57 | - </ul>--> | ||
| 58 | - <div class="layui-tab-content"> | ||
| 59 | - <div class="layui-tab-item layui-show"> | ||
| 60 | - <div id="dingjia-head-info" class="statistics-top-head"></div> | ||
| 61 | - <table id="dingjia_table_id" class="layui-table"> | ||
| 62 | - <thead> | ||
| 63 | - <tr> | ||
| 64 | - <th>序号</th> | ||
| 65 | - <th>系统名称</th> | ||
| 66 | - <th>子系统名称</th> | ||
| 67 | - <th>资源数</th> | ||
| 68 | - <th>已备份</th> | ||
| 69 | - <th>未备份</th> | ||
| 70 | - <th>数据量(GB)</th> | ||
| 71 | - <th>甲方负责人</th> | ||
| 72 | - <th>联系方式</th> | ||
| 73 | - <th>乙方负责人</th> | ||
| 74 | - <th>上次备份时间</th> | ||
| 75 | - </tr> | ||
| 76 | - </thead> | ||
| 77 | - <tbody> | ||
| 78 | - </tbody> | ||
| 79 | - </table> | ||
| 80 | - </div> | ||
| 81 | - </div> | ||
| 82 | - </div> | ||
| 83 | - </div> | 61 | + <table id="dingjia_table_id" class="layui-table"> |
| 62 | + <thead> | ||
| 63 | + <tr> | ||
| 64 | + <th>序号</th> | ||
| 65 | + <th>系统名称</th> | ||
| 66 | + <th>子系统名称</th> | ||
| 67 | + <th>资源数</th> | ||
| 68 | + <th>已备份</th> | ||
| 69 | + <th>未备份</th> | ||
| 70 | + <th>数据量(GB)</th> | ||
| 71 | + <th>甲方负责人</th> | ||
| 72 | + <th>联系方式</th> | ||
| 73 | + <th>乙方负责人</th> | ||
| 74 | + <th>上次备份时间</th> | ||
| 75 | + </tr> | ||
| 76 | + </thead> | ||
| 77 | + <tbody> | ||
| 78 | + </tbody> | ||
| 79 | + </table> | ||
| 80 | + | ||
| 81 | + | ||
| 84 | </div> | 82 | </div> |
| 83 | + | ||
| 85 | </div> | 84 | </div> |
| 86 | </div> | 85 | </div> |
| 87 | </article> | 86 | </article> |
| 1 | <style type="text/css"> | 1 | <style type="text/css"> |
| 2 | - td input{ | 2 | + td input { |
| 3 | width: 70px; | 3 | width: 70px; |
| 4 | border: 1px; | 4 | border: 1px; |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | element.style { | 7 | element.style { |
| 8 | } | 8 | } |
| 9 | + | ||
| 9 | .layui-table td, .layui-table th { | 10 | .layui-table td, .layui-table th { |
| 10 | position: relative; | 11 | position: relative; |
| 11 | padding: 9px 15px; | 12 | padding: 9px 15px; |
| @@ -13,12 +14,14 @@ | @@ -13,12 +14,14 @@ | ||
| 13 | line-height: 20px; | 14 | line-height: 20px; |
| 14 | font-size: 14px; | 15 | font-size: 14px; |
| 15 | } | 16 | } |
| 17 | + | ||
| 16 | .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] { | 18 | .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] { |
| 17 | border-width: 1px; | 19 | border-width: 1px; |
| 18 | border-style: solid; | 20 | border-style: solid; |
| 19 | border-color: #e6e6e6; | 21 | border-color: #e6e6e6; |
| 20 | } | 22 | } |
| 21 | - .layui-table th{ | 23 | + |
| 24 | + .layui-table th { | ||
| 22 | min-width: 35px; | 25 | min-width: 35px; |
| 23 | text-align: center; | 26 | text-align: center; |
| 24 | background-color: cornflowerblue; | 27 | background-color: cornflowerblue; |
| @@ -28,79 +31,59 @@ | @@ -28,79 +31,59 @@ | ||
| 28 | <article class="page-container template"> | 31 | <article class="page-container template"> |
| 29 | <div class="page-panel"> | 32 | <div class="page-panel"> |
| 30 | <div class="main" style="background-color: #fff"> | 33 | <div class="main" style="background-color: #fff"> |
| 31 | - <div class="layui-card-header"> | ||
| 32 | - <div class="layui-status"> | 34 | + <div class="layui-card-body" style="margin-top: 10px;"> |
| 35 | + <div style="display: flex;justify-content: space-between;align-items: center;"> | ||
| 33 | <form class="layui-form layui-card-header" onsubmit="return false" | 36 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 34 | lay-filter="inspectioncount-index-form"> | 37 | lay-filter="inspectioncount-index-form"> |
| 35 | <div class="layui-form-item"> | 38 | <div class="layui-form-item"> |
| 36 | - <div class="layui-btn-group time-group" id="btns-insp-time" style="padding: 0;margin-bottom: 5px;"> | ||
| 37 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" id="probutton" | ||
| 38 | - data-period="today">今日 | ||
| 39 | - </button> | ||
| 40 | - </div> | ||
| 41 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 42 | - <div class="layui-input-inline" style="width: auto"> | 39 | + <!-- <div class="layui-btn-group time-group" id="btns-insp-time"> |
| 40 | + <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" id="probutton" | ||
| 41 | + data-period="today">今日 | ||
| 42 | + </button> | ||
| 43 | + </div>--> | ||
| 44 | + <div class="layui-inline"> | ||
| 45 | + <div class="layui-input-inline"> | ||
| 43 | <input type="text" name="backTime" id="backTime" autocomplete="off" | 46 | <input type="text" name="backTime" id="backTime" autocomplete="off" |
| 44 | - class="layui-input" readonly placeholder="其他日期范围"> | 47 | + class="layui-input" readonly placeholder="日期范围"> |
| 45 | </div> | 48 | </div> |
| 46 | </div> | 49 | </div> |
| 47 | - | 50 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" |
| 51 | + id="orgSearchBtn" >搜索 | ||
| 52 | + </button> | ||
| 48 | </div> | 53 | </div> |
| 49 | </form> | 54 | </form> |
| 50 | - <button class="layui-btn layui-btn-sm layui-btn-normal tab-button" | ||
| 51 | - id="btn-inspStatistics-export-excel" style="float: right"> | ||
| 52 | - <i class="layui-icon"></i>导出到Excel | ||
| 53 | - </button> | ||
| 54 | - </div> | ||
| 55 | 55 | ||
| 56 | - </div> | ||
| 57 | - <div class="layui-card" style="height: 100%"> | ||
| 58 | - <div class="layui-card-body"> | ||
| 59 | - <div class="layui-tab" lay-filter="insp-tab"> | ||
| 60 | - <!-- <ul class="layui-tab-title"> | ||
| 61 | -<!– | ||
| 62 | - <li class="layui-this">数据库备份</li> | ||
| 63 | -–> | ||
| 64 | -<!– | ||
| 65 | - <li>虚拟机备份</li> | ||
| 66 | -–> | ||
| 67 | - | ||
| 68 | - </ul>--> | ||
| 69 | - <div class="layui-tab-content"> | ||
| 70 | - <div class="layui-tab-item layui-show"> | ||
| 71 | - <div id="inspection-report-head-info" class="statistics-top-head"></div> | ||
| 72 | - <table id="inspectioncount_table_id" class="layui-table"> | ||
| 73 | - <thead> | ||
| 74 | - <tr> | ||
| 75 | - <th >序号</th> | ||
| 76 | - <th >系统名称</th> | ||
| 77 | - <th >等保等级</th> | ||
| 78 | - <th>数据库名称</th> | ||
| 79 | - <th>IP地址</th> | ||
| 80 | - <th>备份平台</th> | ||
| 81 | - <th>备份级别</th> | ||
| 82 | - <th>备份状态</th> | ||
| 83 | - <th>数据量(GB)</th> | ||
| 84 | - <th>速率(MB/s)</th> | ||
| 85 | - <th>运行时间(分)</th> | ||
| 86 | - <th>开始时间</th> | ||
| 87 | - <th>结束时间</th> | ||
| 88 | - <th>备注</th> | ||
| 89 | - <th>上次备份</th> | ||
| 90 | - <th>操作</th> | ||
| 91 | - </tr> | ||
| 92 | - </thead> | ||
| 93 | - <tbody> | ||
| 94 | - </tbody> | ||
| 95 | - </table> | ||
| 96 | - </div> | ||
| 97 | - <div class="layui-tab-item"> | ||
| 98 | - <div id="business-report-head-info" class="statistics-top-head"></div> | ||
| 99 | - <table id="business-report-table" lay-filter="business-report-table"></table> | ||
| 100 | - </div> | ||
| 101 | - </div> | ||
| 102 | - </div> | ||
| 103 | </div> | 56 | </div> |
| 57 | + <div style="margin-bottom: 10px;margin-top: 10px;"> | ||
| 58 | + <button class="layui-btn layui-btn-sm layui-btn-normal" | ||
| 59 | + id="btn-inspStatistics-export-excel"> | ||
| 60 | + <i class="layui-icon"></i>导出 | ||
| 61 | + </button> | ||
| 62 | + </div> | ||
| 63 | + <table id="inspectioncount_table_id" class="layui-table"> | ||
| 64 | + <thead> | ||
| 65 | + <tr> | ||
| 66 | + <th>序号</th> | ||
| 67 | + <th>系统名称</th> | ||
| 68 | + <th>等保等级</th> | ||
| 69 | + <th>数据库名称</th> | ||
| 70 | + <th>IP地址</th> | ||
| 71 | + <th>备份平台</th> | ||
| 72 | + <th>备份级别</th> | ||
| 73 | + <th>备份状态</th> | ||
| 74 | + <th>数据量(GB)</th> | ||
| 75 | + <th>速率(MB/s)</th> | ||
| 76 | + <th>运行时间(分)</th> | ||
| 77 | + <th>开始时间</th> | ||
| 78 | + <th>结束时间</th> | ||
| 79 | + <th>备注</th> | ||
| 80 | + <th>上次备份</th> | ||
| 81 | + <th>操作</th> | ||
| 82 | + </tr> | ||
| 83 | + </thead> | ||
| 84 | + <tbody> | ||
| 85 | + </tbody> | ||
| 86 | + </table> | ||
| 104 | </div> | 87 | </div> |
| 105 | </div> | 88 | </div> |
| 106 | </div> | 89 | </div> |
| @@ -91,7 +91,7 @@ | @@ -91,7 +91,7 @@ | ||
| 91 | <div class="box-group-left" style="text-align: center">告警内容<br/>描述表达式</div> | 91 | <div class="box-group-left" style="text-align: center">告警内容<br/>描述表达式</div> |
| 92 | <div class="box-group-right"> | 92 | <div class="box-group-right"> |
| 93 | <div class="layui-form-item"> | 93 | <div class="layui-form-item"> |
| 94 | - <div class="layui-input-block"> | 94 | + <div class="layui-input-block textarea-border"> |
| 95 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="alarmContentExpr" name="alarmContentExpr"></textarea> | 95 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="alarmContentExpr" name="alarmContentExpr"></textarea> |
| 96 | </div> | 96 | </div> |
| 97 | </div> | 97 | </div> |
| @@ -136,7 +136,7 @@ | @@ -136,7 +136,7 @@ | ||
| 136 | </div> | 136 | </div> |
| 137 | </div> | 137 | </div> |
| 138 | <div class="layui-form-item cont-other"> | 138 | <div class="layui-form-item cont-other"> |
| 139 | - <div class="layui-input-block"> | 139 | + <div class="layui-input-block textarea-border"> |
| 140 | <textarea placeholder="请输入内容" class="layui-textarea" id="seriousPolicy" name="seriousPolicy"></textarea> | 140 | <textarea placeholder="请输入内容" class="layui-textarea" id="seriousPolicy" name="seriousPolicy"></textarea> |
| 141 | </div> | 141 | </div> |
| 142 | </div> | 142 | </div> |
| @@ -147,7 +147,7 @@ | @@ -147,7 +147,7 @@ | ||
| 147 | <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> | 147 | <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> |
| 148 | <div class="box-group-right"> | 148 | <div class="box-group-right"> |
| 149 | <div class="layui-form-item"> | 149 | <div class="layui-form-item"> |
| 150 | - <div class="layui-input-block"> | 150 | + <div class="layui-input-block textarea-border"> |
| 151 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="seriousExpr" name="seriousExpr"></textarea> | 151 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="seriousExpr" name="seriousExpr"></textarea> |
| 152 | </div> | 152 | </div> |
| 153 | </div> | 153 | </div> |
| @@ -192,7 +192,7 @@ | @@ -192,7 +192,7 @@ | ||
| 192 | </div> | 192 | </div> |
| 193 | </div> | 193 | </div> |
| 194 | <div class="layui-form-item cont-other"> | 194 | <div class="layui-form-item cont-other"> |
| 195 | - <div class="layui-input-block"> | 195 | + <div class="layui-input-block textarea-border"> |
| 196 | <textarea placeholder="请输入内容" class="layui-textarea" id="importantPolicy" name="importantPolicy"></textarea> | 196 | <textarea placeholder="请输入内容" class="layui-textarea" id="importantPolicy" name="importantPolicy"></textarea> |
| 197 | </div> | 197 | </div> |
| 198 | </div> | 198 | </div> |
| @@ -203,7 +203,7 @@ | @@ -203,7 +203,7 @@ | ||
| 203 | <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> | 203 | <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> |
| 204 | <div class="box-group-right"> | 204 | <div class="box-group-right"> |
| 205 | <div class="layui-form-item"> | 205 | <div class="layui-form-item"> |
| 206 | - <div class="layui-input-block"> | 206 | + <div class="layui-input-block textarea-border"> |
| 207 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="importantExpr" name="importantExpr"></textarea> | 207 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="importantExpr" name="importantExpr"></textarea> |
| 208 | </div> | 208 | </div> |
| 209 | </div> | 209 | </div> |
| @@ -248,7 +248,7 @@ | @@ -248,7 +248,7 @@ | ||
| 248 | </div> | 248 | </div> |
| 249 | </div> | 249 | </div> |
| 250 | <div class="layui-form-item cont-other"> | 250 | <div class="layui-form-item cont-other"> |
| 251 | - <div class="layui-input-block"> | 251 | + <div class="layui-input-block textarea-border"> |
| 252 | <textarea placeholder="请输入内容" class="layui-textarea" id="commonlyPolicy" name="commonlyPolicy"></textarea> | 252 | <textarea placeholder="请输入内容" class="layui-textarea" id="commonlyPolicy" name="commonlyPolicy"></textarea> |
| 253 | </div> | 253 | </div> |
| 254 | </div> | 254 | </div> |
| @@ -259,7 +259,7 @@ | @@ -259,7 +259,7 @@ | ||
| 259 | <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> | 259 | <div class="box-group-left" style="text-align: center">通知内容<br/>描述表达式</div> |
| 260 | <div class="box-group-right"> | 260 | <div class="box-group-right"> |
| 261 | <div class="layui-form-item"> | 261 | <div class="layui-form-item"> |
| 262 | - <div class="layui-input-block"> | 262 | + <div class="layui-input-block textarea-border"> |
| 263 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="commonlyExpr" name="commonlyExpr"></textarea> | 263 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="commonlyExpr" name="commonlyExpr"></textarea> |
| 264 | </div> | 264 | </div> |
| 265 | </div> | 265 | </div> |
| @@ -304,7 +304,7 @@ | @@ -304,7 +304,7 @@ | ||
| 304 | </div> | 304 | </div> |
| 305 | </div> | 305 | </div> |
| 306 | <div class="layui-form-item cont-other"> | 306 | <div class="layui-form-item cont-other"> |
| 307 | - <div class="layui-input-block"> | 307 | + <div class="layui-input-block textarea-border"> |
| 308 | <textarea placeholder="请输入内容" class="layui-textarea" id="filterPolicy" name="filterPolicy"></textarea> | 308 | <textarea placeholder="请输入内容" class="layui-textarea" id="filterPolicy" name="filterPolicy"></textarea> |
| 309 | </div> | 309 | </div> |
| 310 | </div> | 310 | </div> |
| @@ -323,7 +323,7 @@ | @@ -323,7 +323,7 @@ | ||
| 323 | </div> | 323 | </div> |
| 324 | </div> | 324 | </div> |
| 325 | <div class="layui-form-item"> | 325 | <div class="layui-form-item"> |
| 326 | - <div class="layui-input-block"> | 326 | + <div class="layui-input-block textarea-border"> |
| 327 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="cleanPolicy" name="cleanPolicy"></textarea> | 327 | <textarea placeholder="请输入内容" class="layui-textarea noticeExpr" readonly id="cleanPolicy" name="cleanPolicy"></textarea> |
| 328 | </div> | 328 | </div> |
| 329 | </div> | 329 | </div> |
| @@ -336,7 +336,7 @@ | @@ -336,7 +336,7 @@ | ||
| 336 | <div class="box-group-left" style="text-align: center">通知合并策略<br/>描述表达式</div> | 336 | <div class="box-group-left" style="text-align: center">通知合并策略<br/>描述表达式</div> |
| 337 | <div class="box-group-right"> | 337 | <div class="box-group-right"> |
| 338 | <div class="layui-form-item"> | 338 | <div class="layui-form-item"> |
| 339 | - <div class="layui-input-block"> | 339 | + <div class="layui-input-block textarea-border"> |
| 340 | <textarea placeholder="请输入内容" class="layui-textarea" id="noticeMergeFlagExpr" name="noticeMergeFlagExpr"></textarea> | 340 | <textarea placeholder="请输入内容" class="layui-textarea" id="noticeMergeFlagExpr" name="noticeMergeFlagExpr"></textarea> |
| 341 | </div> | 341 | </div> |
| 342 | </div> | 342 | </div> |
| @@ -118,8 +118,7 @@ | @@ -118,8 +118,7 @@ | ||
| 118 | 118 | ||
| 119 | <fieldset class="layui-elem-field layui-field-title" id="message-time-quantum-div"> | 119 | <fieldset class="layui-elem-field layui-field-title" id="message-time-quantum-div"> |
| 120 | <legend>订阅信息 | 120 | <legend>订阅信息 |
| 121 | - <i class="layui-icon layui-icon-edit" id="alarmsubscirbe-form-select-users" | ||
| 122 | - lay-tips="订阅绑定用户、部门及组" style="background-color: #1E9FFF;color: #fff;font-size: 20px"></i> | 121 | + <a id="alarmsubscirbe-form-select-users" class="layui-btn layui-btn-xs layui-btn-normal" id="add_alarmtemplate_policy" lay-tips="订阅绑定用户、部门及组"> 绑定 </a> |
| 123 | </legend> | 122 | </legend> |
| 124 | </fieldset> | 123 | </fieldset> |
| 125 | <div class="layui-form-item"> | 124 | <div class="layui-form-item"> |
| @@ -149,8 +148,8 @@ | @@ -149,8 +148,8 @@ | ||
| 149 | </div> | 148 | </div> |
| 150 | 149 | ||
| 151 | <div class="layui-form-item"> | 150 | <div class="layui-form-item"> |
| 152 | - <label class="layui-form-label textarea-label">订阅描述</label> | ||
| 153 | - <div class="layui-input-block"> | 151 | + <label class="layui-form-label">订阅描述</label> |
| 152 | + <div class="layui-input-block textarea-border"> | ||
| 154 | <textarea class="layui-textarea" name="subDesc"></textarea> | 153 | <textarea class="layui-textarea" name="subDesc"></textarea> |
| 155 | </div> | 154 | </div> |
| 156 | </div> | 155 | </div> |
| @@ -24,9 +24,9 @@ | @@ -24,9 +24,9 @@ | ||
| 24 | </div> | 24 | </div> |
| 25 | <div class="layui-card-body"> | 25 | <div class="layui-card-body"> |
| 26 | <div class="warn-btns"> | 26 | <div class="warn-btns"> |
| 27 | - <button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-create"> | 27 | + <!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-create"> |
| 28 | <i class="layui-icon"></i>新增 | 28 | <i class="layui-icon"></i>新增 |
| 29 | - </button> | 29 | + </button>--> |
| 30 | <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-bustype-delete"> | 30 | <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-bustype-delete"> |
| 31 | <i class="layui-icon"></i>删除 | 31 | <i class="layui-icon"></i>删除 |
| 32 | </button> | 32 | </button> |
| @@ -229,16 +229,16 @@ | @@ -229,16 +229,16 @@ | ||
| 229 | <a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" | 229 | <a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" |
| 230 | id="viewResExtendParam" | 230 | id="viewResExtendParam" |
| 231 | lay-tips="选择已保存的高级参数" title="快捷方式"> | 231 | lay-tips="选择已保存的高级参数" title="快捷方式"> |
| 232 | - <i class="layui-icon"></i> | 232 | + 保存 |
| 233 | </a> | 233 | </a> |
| 234 | <a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" | 234 | <a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" |
| 235 | id="saveResExtendParam" | 235 | id="saveResExtendParam" |
| 236 | lay-tips="保存当前配置信息" title="保存当前配置信息"> | 236 | lay-tips="保存当前配置信息" title="保存当前配置信息"> |
| 237 | - <i class="layui-icon"></i> | 237 | + 保存配置 |
| 238 | </a> | 238 | </a> |
| 239 | <a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" id="addResExtendParam" | 239 | <a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" id="addResExtendParam" |
| 240 | lay-tips="添加高级参数" title="添加高级参数"> | 240 | lay-tips="添加高级参数" title="添加高级参数"> |
| 241 | - <i class="layui-icon"></i> | 241 | + 添加 |
| 242 | </a> | 242 | </a> |
| 243 | </legend> | 243 | </legend> |
| 244 | </fieldset> | 244 | </fieldset> |
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-status"> | 7 | + <div class="layui-status duty-tools"> |
| 8 | <form class="layui-card-header layuiadmin-card-header-auto layui-form" lay-filter="form-duty-condition" | 8 | <form class="layui-card-header layuiadmin-card-header-auto layui-form" lay-filter="form-duty-condition" |
| 9 | onsubmit="return false"> | 9 | onsubmit="return false"> |
| 10 | <div class="warn-btns"> | 10 | <div class="warn-btns"> |
| @@ -82,13 +82,13 @@ | @@ -82,13 +82,13 @@ | ||
| 82 | data-sign="{{ item.sign }}"> | 82 | data-sign="{{ item.sign }}"> |
| 83 | <div class="duty-td-div-line"> | 83 | <div class="duty-td-div-line"> |
| 84 | <div class="table-duty-td-day"> | 84 | <div class="table-duty-td-day"> |
| 85 | - <sapn class="duty-td-div-now-close" data-datetime="{{ item.dateTime }}">{{ item.day }}</sapn> | 85 | + <span class="duty-td-div-now-close" data-datetime="{{ item.dateTime }}">{{ item.day }}</span> |
| 86 | </div> | 86 | </div> |
| 87 | <div class="table-duty-td-lunar"> | 87 | <div class="table-duty-td-lunar"> |
| 88 | - <sapn class="{{ (item.festival && item.festival.split(' ')[0].length <=3 ) ? 'table-duty-td-span-lunar' : '' }}"> | 88 | + <span class="{{ (item.festival && item.festival.split(' ')[0].length <=3 ) ? 'table-duty-td-span-lunar' : '' }}"> |
| 89 | {{ (item.festival && item.festival.split(' ')[0].length <=3 ) ? item.festival.split(' ')[0] | 89 | {{ (item.festival && item.festival.split(' ')[0].length <=3 ) ? item.festival.split(' ')[0] |
| 90 | : item.lunar}} | 90 | : item.lunar}} |
| 91 | - </sapn> | 91 | + </span> |
| 92 | </div> | 92 | </div> |
| 93 | </div> | 93 | </div> |
| 94 | {{# | 94 | {{# |
| @@ -97,14 +97,14 @@ | @@ -97,14 +97,14 @@ | ||
| 97 | <div class="duty-td-div-line"> | 97 | <div class="duty-td-div-line"> |
| 98 | {{# if(item.list.length != 1){ }} | 98 | {{# if(item.list.length != 1){ }} |
| 99 | <div class="table-duty-td-time-left"> | 99 | <div class="table-duty-td-time-left"> |
| 100 | - <sapn>{{ item.list[0].dutyDuration }}</sapn> | 100 | + <span>{{ item.list[0].dutyDuration }}</span> |
| 101 | </div> | 101 | </div> |
| 102 | <div class="table-duty-td-time-right"> | 102 | <div class="table-duty-td-time-right"> |
| 103 | - <sapn>{{ item.list[1].dutyDuration }}</sapn> | 103 | + <span>{{ item.list[1].dutyDuration }}</span> |
| 104 | </div> | 104 | </div> |
| 105 | {{# }else{ }} | 105 | {{# }else{ }} |
| 106 | <div class="table-duty-td-time-center"> | 106 | <div class="table-duty-td-time-center"> |
| 107 | - <sapn>{{ item.list[0].dutyDuration }}</sapn> | 107 | + <span>{{ item.list[0].dutyDuration }}</span> |
| 108 | </div> | 108 | </div> |
| 109 | {{# } }} | 109 | {{# } }} |
| 110 | </div> | 110 | </div> |
| @@ -116,7 +116,7 @@ | @@ -116,7 +116,7 @@ | ||
| 116 | data-dutycena="{{ item.list[0].dutyCena }}" data-remark="{{ item.list[0].remark }}" | 116 | data-dutycena="{{ item.list[0].dutyCena }}" data-remark="{{ item.list[0].remark }}" |
| 117 | data-userid="{{ item.list[0].userId }}" data-username="{{ item.list[0].userName }}" | 117 | data-userid="{{ item.list[0].userId }}" data-username="{{ item.list[0].userName }}" |
| 118 | data-useraccount="{{ item.list[0].userAccount }}"> | 118 | data-useraccount="{{ item.list[0].userAccount }}"> |
| 119 | - <sapn>{{ item.list[0].userName }}</sapn> | 119 | + <span>{{ item.list[0].userName }}</span> |
| 120 | </div> | 120 | </div> |
| 121 | <div class="table-duty-td-name-left" lay-filter="duty-name" data-id="{{ item.list[1].id }}" | 121 | <div class="table-duty-td-name-left" lay-filter="duty-name" data-id="{{ item.list[1].id }}" |
| 122 | data-dutytime="{{ item.list[1].dutyTime }}" | 122 | data-dutytime="{{ item.list[1].dutyTime }}" |
| @@ -124,7 +124,7 @@ | @@ -124,7 +124,7 @@ | ||
| 124 | data-dutycena="{{ item.list[1].dutyCena }}" data-remark="{{ item.list[1].remark }}" | 124 | data-dutycena="{{ item.list[1].dutyCena }}" data-remark="{{ item.list[1].remark }}" |
| 125 | data-userid="{{ item.list[1].userId }}" data-username="{{ item.list[1].userName }}" | 125 | data-userid="{{ item.list[1].userId }}" data-username="{{ item.list[1].userName }}" |
| 126 | data-useraccount="{{ item.list[1].userAccount }}"> | 126 | data-useraccount="{{ item.list[1].userAccount }}"> |
| 127 | - <sapn>{{ item.list[1].userName }}</sapn> | 127 | + <span>{{ item.list[1].userName }}</span> |
| 128 | </div> | 128 | </div> |
| 129 | {{# }else{ }} | 129 | {{# }else{ }} |
| 130 | <div class="table-duty-td-name-center" lay-filter="duty-name" data-id="{{ item.list[0].id }}" | 130 | <div class="table-duty-td-name-center" lay-filter="duty-name" data-id="{{ item.list[0].id }}" |
| @@ -133,7 +133,7 @@ | @@ -133,7 +133,7 @@ | ||
| 133 | data-dutycena="{{ item.list[0].dutyCena }}" data-remark="{{ item.list[0].remark }}" | 133 | data-dutycena="{{ item.list[0].dutyCena }}" data-remark="{{ item.list[0].remark }}" |
| 134 | data-userid="{{ item.list[0].userId }}" data-username="{{ item.list[0].userName }}" | 134 | data-userid="{{ item.list[0].userId }}" data-username="{{ item.list[0].userName }}" |
| 135 | data-useraccount="{{ item.list[0].userAccount }}"> | 135 | data-useraccount="{{ item.list[0].userAccount }}"> |
| 136 | - <sapn>{{ item.list[0].userName }}</sapn> | 136 | + <span>{{ item.list[0].userName }}</span> |
| 137 | </div> | 137 | </div> |
| 138 | {{# } }} | 138 | {{# } }} |
| 139 | </div> | 139 | </div> |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | <input hidden name="id" id="id" lay-verify="checkEmergencyIsExist"> | 8 | <input hidden name="id" id="id" lay-verify="checkEmergencyIsExist"> |
| 9 | <div class="layui-form-item"> | 9 | <div class="layui-form-item"> |
| 10 | <div class="layui-inline inline-onethird"> | 10 | <div class="layui-inline inline-onethird"> |
| 11 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>文件类型</label> | 11 | + <label class="layui-form-label"><span>*</span>文件类型</label> |
| 12 | <div class="layui-input-inline"> | 12 | <div class="layui-input-inline"> |
| 13 | <select name="docType" id="slt-docType" | 13 | <select name="docType" id="slt-docType" |
| 14 | lay-filter="slt-docType" > | 14 | lay-filter="slt-docType" > |
| @@ -20,17 +20,17 @@ | @@ -20,17 +20,17 @@ | ||
| 20 | </div> | 20 | </div> |
| 21 | </div> | 21 | </div> |
| 22 | <div class="layui-inline inline-onethird"> | 22 | <div class="layui-inline inline-onethird"> |
| 23 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>业务系统</label> | 23 | + <label class="layui-form-label"><span>*</span>业务系统</label> |
| 24 | <div class="layui-input-inline"> | 24 | <div class="layui-input-inline"> |
| 25 | <select name="bizId" id="slt-biz-add" | 25 | <select name="bizId" id="slt-biz-add" |
| 26 | lay-filter="slt-biz-add" lay-verify="required"> | 26 | lay-filter="slt-biz-add" lay-verify="required"> |
| 27 | - <option value="">=业务系统=</option> | 27 | + <option value="">业务系统</option> |
| 28 | </select> | 28 | </select> |
| 29 | </div> | 29 | </div> |
| 30 | </div> | 30 | </div> |
| 31 | <div class="layui-inline inline-onethird"> | 31 | <div class="layui-inline inline-onethird"> |
| 32 | <label class="layui-form-label"><span | 32 | <label class="layui-form-label"><span |
| 33 | - style="color: red;font-size: 16px">*</span>预案版本</label> | 33 | + >*</span>预案版本</label> |
| 34 | <div class="layui-input-inline"> | 34 | <div class="layui-input-inline"> |
| 35 | <input type="text" class="layui-input" name="title" id="title" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 35 | <input type="text" class="layui-input" name="title" id="title" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 36 | </div> | 36 | </div> |
| @@ -38,22 +38,22 @@ | @@ -38,22 +38,22 @@ | ||
| 38 | </div> | 38 | </div> |
| 39 | <div class="layui-form-item"> | 39 | <div class="layui-form-item"> |
| 40 | <div class="layui-inline inline-onethird"> | 40 | <div class="layui-inline inline-onethird"> |
| 41 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>所属处室</label> | 41 | + <label class="layui-form-label"><span>*</span>所属处室</label> |
| 42 | <div class="layui-input-inline"> | 42 | <div class="layui-input-inline"> |
| 43 | <select name="orgCode" id="slt-emergencyAdd-org" | 43 | <select name="orgCode" id="slt-emergencyAdd-org" |
| 44 | lay-filter="slt-emergencyAdd-org" lay-verify="required"> | 44 | lay-filter="slt-emergencyAdd-org" lay-verify="required"> |
| 45 | - <option value="">=所属处室=</option> | 45 | + <option value="">所属处室</option> |
| 46 | </select> | 46 | </select> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | <div class="layui-inline inline-onethird"> | 49 | <div class="layui-inline inline-onethird"> |
| 50 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label> | 50 | + <label class="layui-form-label"><span>*</span>系统负责人</label> |
| 51 | <div class="layui-input-inline"> | 51 | <div class="layui-input-inline"> |
| 52 | <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)"> | 52 | <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)"> |
| 53 | </div> | 53 | </div> |
| 54 | </div> | 54 | </div> |
| 55 | <div class="layui-inline inline-onethird"> | 55 | <div class="layui-inline inline-onethird"> |
| 56 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 56 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 57 | <div class="layui-input-inline"> | 57 | <div class="layui-input-inline"> |
| 58 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> | 58 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> |
| 59 | </div> | 59 | </div> |
| @@ -61,18 +61,18 @@ | @@ -61,18 +61,18 @@ | ||
| 61 | </div> | 61 | </div> |
| 62 | <div class="layui-form-item"> | 62 | <div class="layui-form-item"> |
| 63 | <div class="layui-inline inline-onethird"> | 63 | <div class="layui-inline inline-onethird"> |
| 64 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维人员</label> | 64 | + <label class="layui-form-label"><span>*</span>运维人员</label> |
| 65 | <div class="layui-input-inline"> | 65 | <div class="layui-input-inline"> |
| 66 | <input type="text" class="layui-input" name="operationUser" id="operationUser" | 66 | <input type="text" class="layui-input" name="operationUser" id="operationUser" |
| 67 | lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 67 | lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 68 | </div> | 68 | </div> |
| 69 | </div> | 69 | </div> |
| 70 | <div class="layui-inline inline-onethird"> | 70 | <div class="layui-inline inline-onethird"> |
| 71 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维公司</label> | 71 | + <label class="layui-form-label"><span>*</span>运维公司</label> |
| 72 | <div class="layui-input-inline"> | 72 | <div class="layui-input-inline"> |
| 73 | <select name="manufacturerId" id="slt-emergencyadd-group" | 73 | <select name="manufacturerId" id="slt-emergencyadd-group" |
| 74 | lay-filter="slt-emergencyadd-group" lay-verify="required"> | 74 | lay-filter="slt-emergencyadd-group" lay-verify="required"> |
| 75 | - <option value="">=运维公司=</option> | 75 | + <option value="">运维公司</option> |
| 76 | </select> | 76 | </select> |
| 77 | </div> | 77 | </div> |
| 78 | </div> | 78 | </div> |
| @@ -86,14 +86,14 @@ | @@ -86,14 +86,14 @@ | ||
| 86 | </div> | 86 | </div> |
| 87 | <div class="layui-form-item"> | 87 | <div class="layui-form-item"> |
| 88 | <div class="layui-inline inline-half"> | 88 | <div class="layui-inline inline-half"> |
| 89 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label> | 89 | + <label class="layui-form-label"><span>*</span>申请时间</label> |
| 90 | <div class="layui-input-inline"> | 90 | <div class="layui-input-inline"> |
| 91 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> | 91 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> |
| 92 | </div> | 92 | </div> |
| 93 | </div> | 93 | </div> |
| 94 | <div hidden class="layui-inline inline-half" id="period" > | 94 | <div hidden class="layui-inline inline-half" id="period" > |
| 95 | <label class="layui-form-label" style="width: 160px"><span | 95 | <label class="layui-form-label" style="width: 160px"><span |
| 96 | - style="color: red;font-size: 16px">*</span>演练实施时间段</label> | 96 | + >*</span>演练实施时间段</label> |
| 97 | <div class="layui-input-inline"> | 97 | <div class="layui-input-inline"> |
| 98 | <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" | 98 | <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" |
| 99 | lay-verify="checkDocTypeIsReport"> | 99 | lay-verify="checkDocTypeIsReport"> |
| @@ -121,8 +121,8 @@ | @@ -121,8 +121,8 @@ | ||
| 121 | </div> | 121 | </div> |
| 122 | 122 | ||
| 123 | <div class="layui-form-item"> | 123 | <div class="layui-form-item"> |
| 124 | - <label class="layui-form-label textarea-label" style="text-overflow: clip;"><span | ||
| 125 | - style="color: red;font-size: 16px">*</span>内容</label> | 124 | + <label class="layui-form-label textarea-label" ><span |
| 125 | + >*</span>内容</label> | ||
| 126 | <div class="layui-input-block"> | 126 | <div class="layui-input-block"> |
| 127 | <textarea class="layui-textarea" name="emergencyContent" maxlength="500" | 127 | <textarea class="layui-textarea" name="emergencyContent" maxlength="500" |
| 128 | placeholder="预案内容/演练内容" lay-verify="required"></textarea> | 128 | placeholder="预案内容/演练内容" lay-verify="required"></textarea> |
| @@ -130,16 +130,14 @@ | @@ -130,16 +130,14 @@ | ||
| 130 | </div> | 130 | </div> |
| 131 | <div class="layui-form-item" id="backDiv" hidden> | 131 | <div class="layui-form-item" id="backDiv" hidden> |
| 132 | <div class="layui-inline inline-half"> | 132 | <div class="layui-inline inline-half"> |
| 133 | - <label class="layui-form-label" style="width: 130px"><span | ||
| 134 | - style="color: red;font-size: 16px">*</span>演练前备份：</label> | 133 | + <label class="layui-form-label"><span>*</span>演练前备份：</label> |
| 135 | <div class="layui-input-block"> | 134 | <div class="layui-input-block"> |
| 136 | <input type="radio" lay-filter="isBack" name="isBack" value="0" title="是" checked> | 135 | <input type="radio" lay-filter="isBack" name="isBack" value="0" title="是" checked> |
| 137 | <input type="radio" lay-filter="isBack" name="isBack" value="1" title="否"> | 136 | <input type="radio" lay-filter="isBack" name="isBack" value="1" title="否"> |
| 138 | </div> | 137 | </div> |
| 139 | </div> | 138 | </div> |
| 140 | <div class="layui-inline inline-half"> | 139 | <div class="layui-inline inline-half"> |
| 141 | - <label class="layui-form-label"><span | ||
| 142 | - style="color: red;font-size: 16px">*</span>备份内容</label> | 140 | + <label class="layui-form-label"><span>*</span>备份内容</label> |
| 143 | <div class="layui-input-inline"> | 141 | <div class="layui-input-inline"> |
| 144 | <input type="text" class="layui-input" name="backProject" id="backProject" lay-verify="checkDocTypeIsReport"> | 142 | <input type="text" class="layui-input" name="backProject" id="backProject" lay-verify="checkDocTypeIsReport"> |
| 145 | </div> | 143 | </div> |
| @@ -147,37 +145,34 @@ | @@ -147,37 +145,34 @@ | ||
| 147 | </div> | 145 | </div> |
| 148 | <div class="layui-form-item" id="resultDiv" hidden> | 146 | <div class="layui-form-item" id="resultDiv" hidden> |
| 149 | <div class="layui-inline inline-half"> | 147 | <div class="layui-inline inline-half"> |
| 150 | - <label class="layui-form-label" style="width: 130px"><span | ||
| 151 | - style="color: red;font-size: 16px">*</span>演练后结果：</label> | 148 | + <label class="layui-form-label" style="width: 130px"><span>*</span>演练后结果：</label> |
| 152 | <div class="layui-input-block"> | 149 | <div class="layui-input-block"> |
| 153 | <input type="radio" name="status" value="0" title="成功" checked> | 150 | <input type="radio" name="status" value="0" title="成功" checked> |
| 154 | <input type="radio" name="status" value="1" title="失败"> | 151 | <input type="radio" name="status" value="1" title="失败"> |
| 155 | </div> | 152 | </div> |
| 156 | </div> | 153 | </div> |
| 157 | <div class="layui-inline inline-half"> | 154 | <div class="layui-inline inline-half"> |
| 158 | - <label class="layui-form-label"><span | ||
| 159 | - style="color: red;font-size: 16px">*</span>结果说明</label> | 155 | + <label class="layui-form-label"><span>*</span>结果说明</label> |
| 160 | <div class="layui-input-inline"> | 156 | <div class="layui-input-inline"> |
| 161 | <input type="text" class="layui-input" name="resultDesc" id="resultDesc" lay-verify="checkDocTypeIsReport"> | 157 | <input type="text" class="layui-input" name="resultDesc" id="resultDesc" lay-verify="checkDocTypeIsReport"> |
| 162 | </div> | 158 | </div> |
| 163 | </div> | 159 | </div> |
| 164 | </div> | 160 | </div> |
| 165 | <div class="layui-form-item"> | 161 | <div class="layui-form-item"> |
| 166 | - <label class="layui-form-label textarea-label" style="text-overflow: clip;"><span | ||
| 167 | - style="color: red;font-size: 16px">*</span>缺陷/汇总</label> | 162 | + <label class="layui-form-label textarea-label" ><span>*</span>缺陷/汇总</label> |
| 168 | <div class="layui-input-block"> | 163 | <div class="layui-input-block"> |
| 169 | <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="方案缺陷/演练汇总"></textarea> | 164 | <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="方案缺陷/演练汇总"></textarea> |
| 170 | </div> | 165 | </div> |
| 171 | </div> | 166 | </div> |
| 172 | <div class="layui-form-item"> | 167 | <div class="layui-form-item"> |
| 173 | <div class="layui-inline inline-half"> | 168 | <div class="layui-inline inline-half"> |
| 174 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>甲方确认签字</label> | 169 | + <label class="layui-form-label" ><span>*</span>甲方确认签字</label> |
| 175 | <div class="layui-input-inline"> | 170 | <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)"> | 171 | <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> | 172 | </div> |
| 178 | </div> | 173 | </div> |
| 179 | <div class="layui-inline inline-half"> | 174 | <div class="layui-inline inline-half"> |
| 180 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red">*</span>甲方确认时间</label> | 175 | + <label class="layui-form-label" ><span>*</span>甲方确认时间</label> |
| 181 | <div class="layui-input-inline"> | 176 | <div class="layui-input-inline"> |
| 182 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" | 177 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" |
| 183 | lay-verify="required"> | 178 | lay-verify="required"> |
| @@ -186,13 +181,13 @@ | @@ -186,13 +181,13 @@ | ||
| 186 | </div> | 181 | </div> |
| 187 | <div class="layui-form-item"> | 182 | <div class="layui-form-item"> |
| 188 | <div class="layui-inline inline-half"> | 183 | <div class="layui-inline inline-half"> |
| 189 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;">*</span>乙方确认签字</label> | 184 | + <label class="layui-form-label" ><span style="color: red;">*</span>乙方确认签字</label> |
| 190 | <div class="layui-input-inline"> | 185 | <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)"> | 186 | <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> | 187 | </div> |
| 193 | </div> | 188 | </div> |
| 194 | <div class="layui-inline inline-half"> | 189 | <div class="layui-inline inline-half"> |
| 195 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red">*</span>运维确认时间</label> | 190 | + <label class="layui-form-label" ><span>*</span>运维确认时间</label> |
| 196 | <div class="layui-input-inline"> | 191 | <div class="layui-input-inline"> |
| 197 | <input type="text" class="layui-input" name="bAcknowledgingTime" id="bAcknowledgingTime" | 192 | <input type="text" class="layui-input" name="bAcknowledgingTime" id="bAcknowledgingTime" |
| 198 | lay-verify="required"> | 193 | lay-verify="required"> |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-emergency-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-emergency-time" > |
| 8 | + <button type="button" class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button type="button" class="layui-btn layui-btn-primary active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 20 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -28,22 +28,15 @@ | @@ -28,22 +28,15 @@ | ||
| 28 | </div> | 28 | </div> |
| 29 | </div> | 29 | </div> |
| 30 | <div class="layui-card-body" style="margin-top: 10px;"> | 30 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 31 | - <div style="display: flex"> | 31 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 32 | <form class="layui-form layui-card-header" onsubmit="return false" | 32 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 33 | lay-filter="form-emergency-condition"> | 33 | lay-filter="form-emergency-condition"> |
| 34 | <div class="layui-form-item"> | 34 | <div class="layui-form-item"> |
| 35 | - <!--<div class="layui-inline">--> | ||
| 36 | - <!--<div class="layui-input-inline layui-input-inline--long">--> | ||
| 37 | - <!--<input type="text" id="title" name="title"--> | ||
| 38 | - <!--placeholder="应急方案版本" autocomplete="off" class="layui-input">--> | ||
| 39 | - <!--</div>--> | ||
| 40 | - <!--</div>--> | ||
| 41 | <div class="layui-inline"> | 35 | <div class="layui-inline"> |
| 42 | - | ||
| 43 | <div class="layui-input-inline"> | 36 | <div class="layui-input-inline"> |
| 44 | <select name="orgCode" id="slt-emergency-org" | 37 | <select name="orgCode" id="slt-emergency-org" |
| 45 | lay-filter="slt-emergency-org" lay-search> | 38 | lay-filter="slt-emergency-org" lay-search> |
| 46 | - <option value="">=所属处室=</option> | 39 | + <option value="">所属处室</option> |
| 47 | </select> | 40 | </select> |
| 48 | </div> | 41 | </div> |
| 49 | 42 | ||
| @@ -52,7 +45,7 @@ | @@ -52,7 +45,7 @@ | ||
| 52 | <div class="layui-input-inline"> | 45 | <div class="layui-input-inline"> |
| 53 | <select name="manufacturerId" id="slt-emergency-group" | 46 | <select name="manufacturerId" id="slt-emergency-group" |
| 54 | lay-filter="slt-emergency-group" lay-search> | 47 | lay-filter="slt-emergency-group" lay-search> |
| 55 | - <option value="">=运维单位=</option> | 48 | + <option value="">运维单位</option> |
| 56 | </select> | 49 | </select> |
| 57 | </div> | 50 | </div> |
| 58 | </div> | 51 | </div> |
| @@ -60,7 +53,7 @@ | @@ -60,7 +53,7 @@ | ||
| 60 | <div class="layui-input-inline"> | 53 | <div class="layui-input-inline"> |
| 61 | <select name="bizId" id="slt-emergency-biz" | 54 | <select name="bizId" id="slt-emergency-biz" |
| 62 | lay-filter="slt-emergency-biz" lay-search> | 55 | lay-filter="slt-emergency-biz" lay-search> |
| 63 | - <option value="">=业务系统=</option> | 56 | + <option value="">业务系统</option> |
| 64 | </select> | 57 | </select> |
| 65 | </div> | 58 | </div> |
| 66 | </div> | 59 | </div> |
| @@ -74,14 +67,19 @@ | @@ -74,14 +67,19 @@ | ||
| 74 | </select> | 67 | </select> |
| 75 | </div> | 68 | </div> |
| 76 | </div> | 69 | </div> |
| 77 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 78 | - <div class="layui-input-inline" style="width: auto"> | 70 | + <div class="layui-inline"> |
| 71 | + <div class="layui-input-inline"> | ||
| 79 | <input type="text" name="dateLimit" id="emergencydateLimit" autocomplete="off" | 72 | <input type="text" name="dateLimit" id="emergencydateLimit" autocomplete="off" |
| 80 | class="layui-input" readonly placeholder="其他日期范围"> | 73 | class="layui-input" readonly placeholder="其他日期范围"> |
| 81 | </div> | 74 | </div> |
| 82 | </div> | 75 | </div> |
| 76 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 77 | + id="orgSearchBtn" >搜索 | ||
| 78 | + </button> | ||
| 83 | </div> | 79 | </div> |
| 84 | </form> | 80 | </form> |
| 81 | + </div> | ||
| 82 | + <div style="margin-bottom: 10px;"> | ||
| 85 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="emergency_create"> | 83 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="emergency_create"> |
| 86 | <i class="layui-icon"></i>新增 | 84 | <i class="layui-icon"></i>新增 |
| 87 | </button> | 85 | </button> |
| @@ -90,7 +88,7 @@ | @@ -90,7 +88,7 @@ | ||
| 90 | </button> | 88 | </button> |
| 91 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 89 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 92 | id="emergency-export-excel"> | 90 | id="emergency-export-excel"> |
| 93 | - <i class="layui-icon"></i>导出到Excel | 91 | + <i class="layui-icon"></i>导出 |
| 94 | </button> | 92 | </button> |
| 95 | </div> | 93 | </div> |
| 96 | <div class="layui-tab layui-tab-card" lay-filter="emergency-tab"> | 94 | <div class="layui-tab layui-tab-card" lay-filter="emergency-tab"> |
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-bizupgrade-time" style="float: right;"> | 7 | + <div class="layui-btn-group time-group right" id="btns-bizupgrade-time" > |
| 8 | <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 8 | <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" |
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | </div> | 28 | </div> |
| 29 | </div> | 29 | </div> |
| 30 | <div class="layui-card-body" style="margin-top: 10px;"> | 30 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 31 | - <div style="display: flex"> | 31 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 32 | <form class="layui-form layui-card-header" onsubmit="return false" | 32 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 33 | lay-filter="form-bizupgrade-condition"> | 33 | lay-filter="form-bizupgrade-condition"> |
| 34 | <div class="layui-form-item"> | 34 | <div class="layui-form-item"> |
| @@ -48,7 +48,7 @@ | @@ -48,7 +48,7 @@ | ||
| 48 | <div class="layui-input-inline"> | 48 | <div class="layui-input-inline"> |
| 49 | <select name="manufacturerId" id="slt-bizupgrade-group" | 49 | <select name="manufacturerId" id="slt-bizupgrade-group" |
| 50 | lay-filter="slt-bizupgrade-group" lay-search> | 50 | lay-filter="slt-bizupgrade-group" lay-search> |
| 51 | - <option value="">=升级单位=</option> | 51 | + <option value="">升级单位</option> |
| 52 | </select> | 52 | </select> |
| 53 | </div> | 53 | </div> |
| 54 | </div> | 54 | </div> |
| @@ -56,24 +56,29 @@ | @@ -56,24 +56,29 @@ | ||
| 56 | <div class="layui-input-inline"> | 56 | <div class="layui-input-inline"> |
| 57 | <select name="busId" id="slt-bizupgrade-biz" | 57 | <select name="busId" id="slt-bizupgrade-biz" |
| 58 | lay-filter="slt-bizupgrade-biz" lay-search> | 58 | lay-filter="slt-bizupgrade-biz" lay-search> |
| 59 | - <option value="">=业务系统=</option> | 59 | + <option value="">业务系统</option> |
| 60 | </select> | 60 | </select> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| 63 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 64 | - <div class="layui-input-inline" style="width: auto"> | 63 | + <div class="layui-inline" > |
| 64 | + <div class="layui-input-inline"> | ||
| 65 | <input type="text" name="dateLimit" id="bizupgradedateLimit" autocomplete="off" | 65 | <input type="text" name="dateLimit" id="bizupgradedateLimit" autocomplete="off" |
| 66 | class="layui-input" readonly placeholder="其他日期范围"> | 66 | class="layui-input" readonly placeholder="其他日期范围"> |
| 67 | </div> | 67 | </div> |
| 68 | </div> | 68 | </div> |
| 69 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 70 | + id="orgSearchBtn" >搜索 | ||
| 71 | + </button> | ||
| 69 | </div> | 72 | </div> |
| 70 | </form> | 73 | </form> |
| 74 | + </div> | ||
| 75 | + <div style="margin-bottom: 10px;"> | ||
| 71 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="bizupgrade_create"> | 76 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="bizupgrade_create"> |
| 72 | <i class="layui-icon"></i>新增 | 77 | <i class="layui-icon"></i>新增 |
| 73 | </button> | 78 | </button> |
| 74 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 79 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 75 | id="bizupgrade-export-excel"> | 80 | id="bizupgrade-export-excel"> |
| 76 | - <i class="layui-icon"></i>导出到Excel | 81 | + <i class="layui-icon"></i>导出 |
| 77 | </button> | 82 | </button> |
| 78 | </div> | 83 | </div> |
| 79 | <div class="layui-tab layui-tab-card" lay-filter="bizupgrade-tab"> | 84 | <div class="layui-tab layui-tab-card" lay-filter="bizupgrade-tab"> |
| @@ -8,26 +8,26 @@ | @@ -8,26 +8,26 @@ | ||
| 8 | <input hidden name="id" id="id" lay-verify="checkReportIsExist"> | 8 | <input hidden name="id" id="id" lay-verify="checkReportIsExist"> |
| 9 | <div class="layui-form-item"> | 9 | <div class="layui-form-item"> |
| 10 | <div class="layui-inline inline-onethird"> | 10 | <div class="layui-inline inline-onethird"> |
| 11 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>升级类型</label> | 11 | + <label class="layui-form-label"><span>*</span>升级类型</label> |
| 12 | <div class="layui-input-inline"> | 12 | <div class="layui-input-inline"> |
| 13 | <select name="level" id="level" lay-filter="level" lay-verify="required"> | 13 | <select name="level" id="level" lay-filter="level" lay-verify="required"> |
| 14 | - <option value="">=升级类型=</option> | 14 | + <option value="">升级类型</option> |
| 15 | <option value="1">系统升级</option> | 15 | <option value="1">系统升级</option> |
| 16 | <option value="2">补丁升级</option> | 16 | <option value="2">补丁升级</option> |
| 17 | </select> | 17 | </select> |
| 18 | </div> | 18 | </div> |
| 19 | </div> | 19 | </div> |
| 20 | <div class="layui-inline inline-onethird"> | 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>*</span>业务系统</label> |
| 22 | <div class="layui-input-inline"> | 22 | <div class="layui-input-inline"> |
| 23 | <select name="busId" id="slt-biz-add" | 23 | <select name="busId" id="slt-biz-add" |
| 24 | lay-filter="slt-biz-add" lay-verify="required"> | 24 | lay-filter="slt-biz-add" lay-verify="required"> |
| 25 | - <option value="">=业务系统=</option> | 25 | + <option value="">业务系统</option> |
| 26 | </select> | 26 | </select> |
| 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" style="width: 165px"><span style="color: red;font-size: 16px">*</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> |
| @@ -35,19 +35,19 @@ | @@ -35,19 +35,19 @@ | ||
| 35 | </div> | 35 | </div> |
| 36 | <div class="layui-form-item"> | 36 | <div class="layui-form-item"> |
| 37 | <div class="layui-inline inline-onethird"> | 37 | <div class="layui-inline inline-onethird"> |
| 38 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label> | 38 | + <label class="layui-form-label"><span>*</span>申请时间</label> |
| 39 | <div class="layui-input-inline"> | 39 | <div class="layui-input-inline"> |
| 40 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> | 40 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> |
| 41 | </div> | 41 | </div> |
| 42 | </div> | 42 | </div> |
| 43 | <div class="layui-inline inline-onethird"> | 43 | <div class="layui-inline inline-onethird"> |
| 44 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label> | 44 | + <label class="layui-form-label"><span>*</span>系统负责人</label> |
| 45 | <div class="layui-input-inline"> | 45 | <div class="layui-input-inline"> |
| 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)"> | 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)"> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | <div class="layui-inline inline-onethird"> | 49 | <div class="layui-inline inline-onethird"> |
| 50 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 50 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 51 | <div class="layui-input-inline"> | 51 | <div class="layui-input-inline"> |
| 52 | <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"> |
| 53 | </div> | 53 | </div> |
| @@ -55,22 +55,22 @@ | @@ -55,22 +55,22 @@ | ||
| 55 | </div> | 55 | </div> |
| 56 | <div class="layui-form-item"> | 56 | <div class="layui-form-item"> |
| 57 | <div class="layui-inline inline-onethird"> | 57 | <div class="layui-inline inline-onethird"> |
| 58 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>升级人</label> | 58 | + <label class="layui-form-label"><span>*</span>升级人</label> |
| 59 | <div class="layui-input-inline"> | 59 | <div class="layui-input-inline"> |
| 60 | <input type="text" class="layui-input" name="upgradePerson" id = "upgradePerson" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 60 | <input type="text" class="layui-input" name="upgradePerson" id = "upgradePerson" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| 63 | <div class="layui-inline inline-onethird"> | 63 | <div class="layui-inline inline-onethird"> |
| 64 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>升级人单位</label> | 64 | + <label class="layui-form-label"><span>*</span>升级人单位</label> |
| 65 | <div class="layui-input-inline"> | 65 | <div class="layui-input-inline"> |
| 66 | <select name="manufacturerId" id="slt-upgradeadd-group" | 66 | <select name="manufacturerId" id="slt-upgradeadd-group" |
| 67 | lay-filter="slt-upgradeadd-group" lay-verify="required"> | 67 | lay-filter="slt-upgradeadd-group" lay-verify="required"> |
| 68 | - <option value="">=工作单位=</option> | 68 | + <option value="">工作单位</option> |
| 69 | </select> | 69 | </select> |
| 70 | </div> | 70 | </div> |
| 71 | </div> | 71 | </div> |
| 72 | <div class="layui-inline inline-onethird"> | 72 | <div class="layui-inline inline-onethird"> |
| 73 | - <label class="layui-form-label"><span style="color: red">*</span>升级人电话</label> | 73 | + <label class="layui-form-label"><span>*</span>升级人电话</label> |
| 74 | <div class="layui-input-inline"> | 74 | <div class="layui-input-inline"> |
| 75 | <input type="text" class="layui-input" name="upgradePhone" id="upgradePhone" lay-verify="required|phone"> | 75 | <input type="text" class="layui-input" name="upgradePhone" id="upgradePhone" lay-verify="required|phone"> |
| 76 | </div> | 76 | </div> |
| @@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
| 79 | </div> | 79 | </div> |
| 80 | <div class="layui-form-item"> | 80 | <div class="layui-form-item"> |
| 81 | <div class="layui-inline inline-onethird"> | 81 | <div class="layui-inline inline-onethird"> |
| 82 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>升级时间段</label> | 82 | + <label class="layui-form-label"><span>*</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> |
| @@ -106,13 +106,13 @@ | @@ -106,13 +106,13 @@ | ||
| 106 | </div> | 106 | </div> |
| 107 | 107 | ||
| 108 | <div class="layui-form-item"> | 108 | <div class="layui-form-item"> |
| 109 | - <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>升级内容</label> | 109 | + <label class="layui-form-label textarea-label"><span>*</span>升级内容</label> |
| 110 | <div class="layui-input-block"> | 110 | <div class="layui-input-block"> |
| 111 | <textarea class="layui-textarea" name="upgradeContent" maxlength="500" placeholder="升级内容"></textarea> | 111 | <textarea class="layui-textarea" name="upgradeContent" maxlength="500" placeholder="升级内容"></textarea> |
| 112 | </div> | 112 | </div> |
| 113 | </div> | 113 | </div> |
| 114 | <div class="layui-form-item"> | 114 | <div class="layui-form-item"> |
| 115 | - <label class="layui-form-label textarea-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>升级结果反馈</label> | 115 | + <label class="layui-form-label textarea-label"><span>*</span>升级结果反馈</label> |
| 116 | <div class="layui-input-block"> | 116 | <div class="layui-input-block"> |
| 117 | <textarea class="layui-textarea" name="feedback" maxlength="100" placeholder="升级结果反馈"></textarea> | 117 | <textarea class="layui-textarea" name="feedback" maxlength="100" placeholder="升级结果反馈"></textarea> |
| 118 | </div> | 118 | </div> |
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 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-onethird"> | 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>*</span>报表类型</label> |
| 13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
| 14 | <select name="docType" id="slt-docType" | 14 | <select name="docType" id="slt-docType" |
| 15 | lay-filter="slt-docType" > | 15 | lay-filter="slt-docType" > |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | </div> | 19 | </div> |
| 20 | </div> | 20 | </div> |
| 21 | <div class="layui-inline inline-onethird"> | 21 | <div class="layui-inline inline-onethird"> |
| 22 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>操作类型</label> | 22 | + <label class="layui-form-label"><span>*</span>操作类型</label> |
| 23 | <div class="layui-input-inline"> | 23 | <div class="layui-input-inline"> |
| 24 | <select name="actionType" id="slt-actionType" | 24 | <select name="actionType" id="slt-actionType" |
| 25 | lay-filter="slt-actionType" > | 25 | lay-filter="slt-actionType" > |
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | </div> | 30 | </div> |
| 31 | </div> | 31 | </div> |
| 32 | <div class="layui-inline inline-onethird"> | 32 | <div class="layui-inline inline-onethird"> |
| 33 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备型号</label> | 33 | + <label class="layui-form-label"><span>*</span>设备型号</label> |
| 34 | <div class="layui-input-inline"> | 34 | <div class="layui-input-inline"> |
| 35 | <input type="text" class="layui-input" name="deviceModel" id="deviceModel" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 35 | <input type="text" class="layui-input" name="deviceModel" id="deviceModel" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 36 | </div> | 36 | </div> |
| @@ -38,26 +38,26 @@ | @@ -38,26 +38,26 @@ | ||
| 38 | </div> | 38 | </div> |
| 39 | <div class="layui-form-item"> | 39 | <div class="layui-form-item"> |
| 40 | <div class="layui-inline inline-onethird"> | 40 | <div class="layui-inline inline-onethird"> |
| 41 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>机房</label> | 41 | + <label class="layui-form-label"><span>*</span>机房</label> |
| 42 | <div class="layui-input-inline"> | 42 | <div class="layui-input-inline"> |
| 43 | <select name="machineRoomId" id="slt-staffadd-machine" | 43 | <select name="machineRoomId" id="slt-staffadd-machine" |
| 44 | lay-filter="slt-staffadd-machine" lay-verify="required"> | 44 | lay-filter="slt-staffadd-machine" lay-verify="required"> |
| 45 | - <option value="">=选择机房=</option> | 45 | + <option value="">选择机房</option> |
| 46 | </select> | 46 | </select> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | <div class="layui-inline inline-onethird"> | 49 | <div class="layui-inline inline-onethird"> |
| 50 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>选择单位</label> | 50 | + <label class="layui-form-label"><span>*</span>选择单位</label> |
| 51 | <div class="layui-input-inline"> | 51 | <div class="layui-input-inline"> |
| 52 | <select name="manufacturerId" id="slt-staffadd-group" | 52 | <select name="manufacturerId" id="slt-staffadd-group" |
| 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"> |
| 60 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请人</label> | 60 | + <label class="layui-form-label"><span>*</span>申请人</label> |
| 61 | <div class="layui-input-inline"> | 61 | <div class="layui-input-inline"> |
| 62 | <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 62 | <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 63 | </div> | 63 | </div> |
| @@ -65,19 +65,19 @@ | @@ -65,19 +65,19 @@ | ||
| 65 | </div> | 65 | </div> |
| 66 | <div class="layui-form-item"> | 66 | <div class="layui-form-item"> |
| 67 | <div class="layui-inline inline-onethird"> | 67 | <div class="layui-inline inline-onethird"> |
| 68 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 68 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 69 | <div class="layui-input-inline"> | 69 | <div class="layui-input-inline"> |
| 70 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> | 70 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> |
| 71 | </div> | 71 | </div> |
| 72 | </div> | 72 | </div> |
| 73 | <div class="layui-inline inline-onethird"> | 73 | <div class="layui-inline inline-onethird"> |
| 74 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>进入时间</label> | 74 | + <label class="layui-form-label"><span>*</span>进入时间</label> |
| 75 | <div class="layui-input-inline"> | 75 | <div class="layui-input-inline"> |
| 76 | <input type="text" class="layui-input" name="enterTime" id="enterTime" lay-verify="required"> | 76 | <input type="text" class="layui-input" name="enterTime" id="enterTime" lay-verify="required"> |
| 77 | </div> | 77 | </div> |
| 78 | </div> | 78 | </div> |
| 79 | <div class="layui-inline inline-onethird"> | 79 | <div class="layui-inline inline-onethird"> |
| 80 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>出来时间</label> | 80 | + <label class="layui-form-label"><span>*</span>出来时间</label> |
| 81 | <div class="layui-input-inline"> | 81 | <div class="layui-input-inline"> |
| 82 | <input type="text" class="layui-input" name="outTime" id="outTime" lay-verify="required"> | 82 | <input type="text" class="layui-input" name="outTime" id="outTime" lay-verify="required"> |
| 83 | </div> | 83 | </div> |
| @@ -85,7 +85,7 @@ | @@ -85,7 +85,7 @@ | ||
| 85 | </div> | 85 | </div> |
| 86 | <div class="layui-form-item" > | 86 | <div class="layui-form-item" > |
| 87 | <div class="layui-inline inline-onethird"> | 87 | <div class="layui-inline inline-onethird"> |
| 88 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>现物理位置</label> | 88 | + <label class="layui-form-label"><span>*</span>现物理位置</label> |
| 89 | <div class="layui-input-inline"> | 89 | <div class="layui-input-inline"> |
| 90 | <input type="text" class="layui-input" name="localPlace" id= "localPlace" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 90 | <input type="text" class="layui-input" name="localPlace" id= "localPlace" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 91 | </div> | 91 | </div> |
| @@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
| 97 | </div> | 97 | </div> |
| 98 | </div> | 98 | </div> |
| 99 | <div class="layui-inline inline-onethird"> | 99 | <div class="layui-inline inline-onethird"> |
| 100 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>值班人</label> | 100 | + <label class="layui-form-label"><span>*</span>值班人</label> |
| 101 | <div class="layui-input-inline"> | 101 | <div class="layui-input-inline"> |
| 102 | <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)" > | 102 | <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)" > |
| 103 | </div> | 103 | </div> |
| @@ -105,26 +105,26 @@ | @@ -105,26 +105,26 @@ | ||
| 105 | </div> | 105 | </div> |
| 106 | <div class="layui-form-item"> | 106 | <div class="layui-form-item"> |
| 107 | <div class="layui-inline inline-onethird"> | 107 | <div class="layui-inline inline-onethird"> |
| 108 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备负责人</label> | 108 | + <label class="layui-form-label"><span>*</span>设备负责人</label> |
| 109 | <div class="layui-input-inline"> | 109 | <div class="layui-input-inline"> |
| 110 | <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 110 | <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 111 | </div> | 111 | </div> |
| 112 | </div> | 112 | </div> |
| 113 | <div class="layui-inline inline-onethird"> | 113 | <div class="layui-inline inline-onethird"> |
| 114 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>总集成</label> | 114 | + <label class="layui-form-label"><span>*</span>总集成</label> |
| 115 | <div class="layui-input-inline"> | 115 | <div class="layui-input-inline"> |
| 116 | <input type="text" class="layui-input" name="integration" id="integration" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 116 | <input type="text" class="layui-input" name="integration" id="integration" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 117 | </div> | 117 | </div> |
| 118 | </div> | 118 | </div> |
| 119 | <div class="layui-inline inline-onethird"> | 119 | <div class="layui-inline inline-onethird"> |
| 120 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维负责人</label> | 120 | + <label class="layui-form-label"><span>*</span>运维负责人</label> |
| 121 | <div class="layui-input-inline"> | 121 | <div class="layui-input-inline"> |
| 122 | <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 122 | <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 123 | </div> | 123 | </div> |
| 124 | </div> | 124 | </div> |
| 125 | </div> | 125 | </div> |
| 126 | <div class="layui-form-item"> | 126 | <div class="layui-form-item"> |
| 127 | - <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>进入事由</label> | 127 | + <label class="layui-form-label textarea-label"><span>*</span>进入事由</label> |
| 128 | <div class="layui-input-block"> | 128 | <div class="layui-input-block"> |
| 129 | <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required|account" maxlength="300" onkeyup="if(this.value.length>300) this.value=this.value.substr(0,300)" ></textarea> | 129 | <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required|account" maxlength="300" onkeyup="if(this.value.length>300) this.value=this.value.substr(0,300)" ></textarea> |
| 130 | </div> | 130 | </div> |
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-devicehitch-time" style="float: right;"> | 7 | + <div class="layui-btn-group time-group right" id="btns-devicehitch-time"> |
| 8 | <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 8 | <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" |
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | </div> | 29 | </div> |
| 30 | </div> | 30 | </div> |
| 31 | <div class="layui-card-body" style="margin-top: 10px;"> | 31 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 32 | - <div style="display: flex"> | 32 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 33 | <form class="layui-form layui-card-header" onsubmit="return false" | 33 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 34 | lay-filter="form-devicehitch-condition"> | 34 | lay-filter="form-devicehitch-condition"> |
| 35 | <div class="layui-form-item"> | 35 | <div class="layui-form-item"> |
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | <div class="layui-input-inline"> | 43 | <div class="layui-input-inline"> |
| 44 | <select name="deviceType" id="slt-devicehitch-org" | 44 | <select name="deviceType" id="slt-devicehitch-org" |
| 45 | lay-filter="slt-devicehitch-org" lay-search> | 45 | lay-filter="slt-devicehitch-org" lay-search> |
| 46 | - <option value="">=设备类型=</option> | 46 | + <option value="">设备类型</option> |
| 47 | </select> | 47 | </select> |
| 48 | </div> | 48 | </div> |
| 49 | </div> | 49 | </div> |
| @@ -57,23 +57,28 @@ | @@ -57,23 +57,28 @@ | ||
| 57 | </select> | 57 | </select> |
| 58 | </div> | 58 | </div> |
| 59 | </div> | 59 | </div> |
| 60 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 61 | - <div class="layui-input-inline" style="width: auto"> | 60 | + <div class="layui-inline" > |
| 61 | + <div class="layui-input-inline" > | ||
| 62 | <input type="text" name="dateLimit" id="hitchdateLimit" autocomplete="off" | 62 | <input type="text" name="dateLimit" id="hitchdateLimit" autocomplete="off" |
| 63 | class="layui-input" readonly placeholder="日期范围"> | 63 | class="layui-input" readonly placeholder="日期范围"> |
| 64 | </div> | 64 | </div> |
| 65 | </div> | 65 | </div> |
| 66 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 67 | + id="orgSearchBtn" >搜索 | ||
| 68 | + </button> | ||
| 66 | </div> | 69 | </div> |
| 67 | </form> | 70 | </form> |
| 71 | + </div> | ||
| 72 | + <div style="margin-bottom: 10px;"> | ||
| 68 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_create" > | 73 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_create" > |
| 69 | <i class="layui-icon"></i>新增 | 74 | <i class="layui-icon"></i>新增 |
| 70 | </button> | 75 | </button> |
| 71 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_download" > | 76 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_download" > |
| 72 | - <i class="layui-icon"></i>模板下载 | 77 | + <i class="layui-icon"></i>下载 |
| 73 | </button> | 78 | </button> |
| 74 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 79 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 75 | id="devicehitch-export-excel"> | 80 | id="devicehitch-export-excel"> |
| 76 | - <i class="layui-icon"></i>导出到Excel | 81 | + <i class="layui-icon"></i>导出 |
| 77 | </button> | 82 | </button> |
| 78 | </div> | 83 | </div> |
| 79 | <table id="table-devicehitch-view" lay-filter="table-devicehitch-view"></table> | 84 | <table id="table-devicehitch-view" lay-filter="table-devicehitch-view"></table> |
| @@ -9,25 +9,25 @@ | @@ -9,25 +9,25 @@ | ||
| 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-onethird"> | 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>*</span>机房</label> |
| 13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
| 14 | <select name="machineRoomId" id="slt-devicehitch-machine" lay-verify="required" | 14 | <select name="machineRoomId" id="slt-devicehitch-machine" lay-verify="required" |
| 15 | lay-filter="slt-devicehitch-machine"> | 15 | lay-filter="slt-devicehitch-machine"> |
| 16 | - <option value="">=选择机房=</option> | 16 | + <option value="">选择机房</option> |
| 17 | </select> | 17 | </select> |
| 18 | </div> | 18 | </div> |
| 19 | </div> | 19 | </div> |
| 20 | <div class="layui-inline inline-onethird"> | 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>*</span>设备类型</label> |
| 22 | <div class="layui-input-inline"> | 22 | <div class="layui-input-inline"> |
| 23 | <select name="deviceType" id="slt-devicehitch-res" | 23 | <select name="deviceType" id="slt-devicehitch-res" |
| 24 | lay-filter="slt-devicehitch-res" lay-verify="required"> | 24 | lay-filter="slt-devicehitch-res" lay-verify="required"> |
| 25 | - <option value="">=设备类型=</option> | 25 | + <option value="">设备类型</option> |
| 26 | </select> | 26 | </select> |
| 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 style="color: red;font-size: 16px">*</span>设备名称</label> | 30 | + <label class="layui-form-label"><span>*</span>设备名称</label> |
| 31 | <div class="layui-input-inline"> | 31 | <div class="layui-input-inline"> |
| 32 | <input type="text" class="layui-input" name="deviceInfo" id="deviceInfo" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 32 | <input type="text" class="layui-input" name="deviceInfo" id="deviceInfo" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 33 | </div> | 33 | </div> |
| @@ -35,19 +35,19 @@ | @@ -35,19 +35,19 @@ | ||
| 35 | </div> | 35 | </div> |
| 36 | <div class="layui-form-item"> | 36 | <div class="layui-form-item"> |
| 37 | <div class="layui-inline inline-onethird"> | 37 | <div class="layui-inline inline-onethird"> |
| 38 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>故障发现人</label> | 38 | + <label class="layui-form-label"><span>*</span>故障发现人</label> |
| 39 | <div class="layui-input-inline"> | 39 | <div class="layui-input-inline"> |
| 40 | <input type="text" class="layui-input" name="hitchDiscover" id="hitchDiscover" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 40 | <input type="text" class="layui-input" name="hitchDiscover" id="hitchDiscover" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 41 | </div> | 41 | </div> |
| 42 | </div> | 42 | </div> |
| 43 | <div class="layui-inline inline-onethird"> | 43 | <div class="layui-inline inline-onethird"> |
| 44 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>发现人电话</label> | 44 | + <label class="layui-form-label"><span>*</span>发现人电话</label> |
| 45 | <div class="layui-input-inline"> | 45 | <div class="layui-input-inline"> |
| 46 | <input type="text" class="layui-input" name="discoverPhone" id="discoverPhone" lay-verify="required|phone"> | 46 | <input type="text" class="layui-input" name="discoverPhone" id="discoverPhone" lay-verify="required|phone"> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | <div class="layui-inline inline-onethird"> | 49 | <div class="layui-inline inline-onethird"> |
| 50 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>发现人单位</label> | 50 | + <label class="layui-form-label"><span>*</span>发现人单位</label> |
| 51 | <div class="layui-input-inline"> | 51 | <div class="layui-input-inline"> |
| 52 | <select name="discoverMfId" id="slt-discoverMfId-group" | 52 | <select name="discoverMfId" id="slt-discoverMfId-group" |
| 53 | lay-filter="slt-discoverMfId-group" lay-verify="required"> | 53 | lay-filter="slt-discoverMfId-group" lay-verify="required"> |
| @@ -59,19 +59,19 @@ | @@ -59,19 +59,19 @@ | ||
| 59 | </div> | 59 | </div> |
| 60 | <div class="layui-form-item"> | 60 | <div class="layui-form-item"> |
| 61 | <div class="layui-inline inline-onethird"> | 61 | <div class="layui-inline inline-onethird"> |
| 62 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>故障时间</label> | 62 | + <label class="layui-form-label"><span>*</span>故障时间</label> |
| 63 | <div class="layui-input-inline"> | 63 | <div class="layui-input-inline"> |
| 64 | <input type="text" class="layui-input" name="hitchTime" id="hitchTime" lay-verify="required"> | 64 | <input type="text" class="layui-input" name="hitchTime" id="hitchTime" lay-verify="required"> |
| 65 | </div> | 65 | </div> |
| 66 | </div> | 66 | </div> |
| 67 | <div class="layui-inline inline-onethird"> | 67 | <div class="layui-inline inline-onethird"> |
| 68 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>设备负责人</label> | 68 | + <label class="layui-form-label"><span>*</span>设备负责人</label> |
| 69 | <div class="layui-input-inline"> | 69 | <div class="layui-input-inline"> |
| 70 | <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 70 | <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 71 | </div> | 71 | </div> |
| 72 | </div> | 72 | </div> |
| 73 | <div class="layui-inline inline-onethird"> | 73 | <div class="layui-inline inline-onethird"> |
| 74 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 74 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 75 | <div class="layui-input-inline"> | 75 | <div class="layui-input-inline"> |
| 76 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> | 76 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> |
| 77 | </div> | 77 | </div> |
| @@ -79,19 +79,19 @@ | @@ -79,19 +79,19 @@ | ||
| 79 | </div> | 79 | </div> |
| 80 | <div class="layui-form-item"> | 80 | <div class="layui-form-item"> |
| 81 | <div class="layui-inline inline-onethird"> | 81 | <div class="layui-inline inline-onethird"> |
| 82 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>维修人</label> | 82 | + <label class="layui-form-label"><span>*</span>维修人</label> |
| 83 | <div class="layui-input-inline"> | 83 | <div class="layui-input-inline"> |
| 84 | <input type="text" class="layui-input" name="repairer" id= "repairer" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 84 | <input type="text" class="layui-input" name="repairer" id= "repairer" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 85 | </div> | 85 | </div> |
| 86 | </div> | 86 | </div> |
| 87 | <div class="layui-inline inline-onethird"> | 87 | <div class="layui-inline inline-onethird"> |
| 88 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>维修人电话</label> | 88 | + <label class="layui-form-label"><span>*</span>维修人电话</label> |
| 89 | <div class="layui-input-inline"> | 89 | <div class="layui-input-inline"> |
| 90 | <input type="text" class="layui-input" name="repairPhone" id= "repairPhone" lay-verify="required|phone" > | 90 | <input type="text" class="layui-input" name="repairPhone" id= "repairPhone" lay-verify="required|phone" > |
| 91 | </div> | 91 | </div> |
| 92 | </div> | 92 | </div> |
| 93 | <div class="layui-inline inline-onethird"> | 93 | <div class="layui-inline inline-onethird"> |
| 94 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>维修人单位</label> | 94 | + <label class="layui-form-label"><span>*</span>维修人单位</label> |
| 95 | <div class="layui-input-inline"> | 95 | <div class="layui-input-inline"> |
| 96 | <select name="repairMfId" id="slt-repairMfId-group" | 96 | <select name="repairMfId" id="slt-repairMfId-group" |
| 97 | lay-filter="slt-repairMfId-group" lay-verify="required"> | 97 | lay-filter="slt-repairMfId-group" lay-verify="required"> |
| @@ -103,13 +103,13 @@ | @@ -103,13 +103,13 @@ | ||
| 103 | </div> | 103 | </div> |
| 104 | <div class="layui-form-item"> | 104 | <div class="layui-form-item"> |
| 105 | <div class="layui-inline inline-onethird"> | 105 | <div class="layui-inline inline-onethird"> |
| 106 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red">*</span>计划维修时间</label> | 106 | + <label class="layui-form-label" ><span>*</span>计划维修时间</label> |
| 107 | <div class="layui-input-inline"> | 107 | <div class="layui-input-inline"> |
| 108 | <input type="text" class="layui-input" name="repairPlan" id="repairPlan" lay-verify="required"> | 108 | <input type="text" class="layui-input" name="repairPlan" id="repairPlan" lay-verify="required"> |
| 109 | </div> | 109 | </div> |
| 110 | </div> | 110 | </div> |
| 111 | <div class="layui-inline inline-onethird"> | 111 | <div class="layui-inline inline-onethird"> |
| 112 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>维修状态</label> | 112 | + <label class="layui-form-label"><span>*</span>维修状态</label> |
| 113 | <div class="layui-input-inline"> | 113 | <div class="layui-input-inline"> |
| 114 | <select name="repairStatus" id="slt-repairStatus" | 114 | <select name="repairStatus" id="slt-repairStatus" |
| 115 | lay-filter="slt-repairStatus" > | 115 | lay-filter="slt-repairStatus" > |
| @@ -119,7 +119,7 @@ | @@ -119,7 +119,7 @@ | ||
| 119 | </div> | 119 | </div> |
| 120 | </div> | 120 | </div> |
| 121 | <div class="layui-inline inline-onethird"> | 121 | <div class="layui-inline inline-onethird"> |
| 122 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>记录时间</label> | 122 | + <label class="layui-form-label"><span>*</span>记录时间</label> |
| 123 | <div class="layui-input-inline"> | 123 | <div class="layui-input-inline"> |
| 124 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> | 124 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> |
| 125 | </div> | 125 | </div> |
| @@ -146,26 +146,26 @@ | @@ -146,26 +146,26 @@ | ||
| 146 | </div> | 146 | </div> |
| 147 | 147 | ||
| 148 | <div class="layui-form-item"> | 148 | <div class="layui-form-item"> |
| 149 | - <label class="layui-form-label textarea-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>故障现象描述</label> | 149 | + <label class="layui-form-label textarea-label" ><span>*</span>故障现象描述</label> |
| 150 | <div class="layui-input-block"> | 150 | <div class="layui-input-block"> |
| 151 | <textarea class="layui-textarea" name="hitchDesc" maxlength="200" placeholder="故障现象描述"></textarea> | 151 | <textarea class="layui-textarea" name="hitchDesc" maxlength="200" placeholder="故障现象描述"></textarea> |
| 152 | </div> | 152 | </div> |
| 153 | </div> | 153 | </div> |
| 154 | <div class="layui-form-item"> | 154 | <div class="layui-form-item"> |
| 155 | - <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>影响范围</label> | 155 | + <label class="layui-form-label textarea-label"><span>*</span>影响范围</label> |
| 156 | <div class="layui-input-block"> | 156 | <div class="layui-input-block"> |
| 157 | <textarea class="layui-textarea" name="affected" maxlength="300" placeholder="影响范围"></textarea> | 157 | <textarea class="layui-textarea" name="affected" maxlength="300" placeholder="影响范围"></textarea> |
| 158 | </div> | 158 | </div> |
| 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"><span>*</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"><span>*</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> |
| @@ -173,13 +173,13 @@ | @@ -173,13 +173,13 @@ | ||
| 173 | </div> | 173 | </div> |
| 174 | <div class="layui-form-item"> | 174 | <div class="layui-form-item"> |
| 175 | <div class="layui-inline inline-half"> | 175 | <div class="layui-inline inline-half"> |
| 176 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red">*</span>甲方确认时间</label> | 176 | + <label class="layui-form-label" ><span >*</span>甲方确认时间</label> |
| 177 | <div class="layui-input-inline"> | 177 | <div class="layui-input-inline"> |
| 178 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" lay-verify="required"> | 178 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" lay-verify="required"> |
| 179 | </div> | 179 | </div> |
| 180 | </div> | 180 | </div> |
| 181 | <div class="layui-inline inline-half"> | 181 | <div class="layui-inline inline-half"> |
| 182 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red">*</span>乙方确认时间</label> | 182 | + <label class="layui-form-label" ><span >*</span>乙方确认时间</label> |
| 183 | <div class="layui-input-inline"> | 183 | <div class="layui-input-inline"> |
| 184 | <input type="text" class="layui-input" name="bAcknowledgingTime" id="bAcknowledgingTime" lay-verify="required"> | 184 | <input type="text" class="layui-input" name="bAcknowledgingTime" id="bAcknowledgingTime" lay-verify="required"> |
| 185 | </div> | 185 | </div> |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-staff-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-staff-time" > |
| 8 | + <button class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button class="layui-btn layui-btn-primary active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button class="layui-btn layui-btn-primary date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 20 | + <button class="layui-btn layui-btn-primary date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -46,22 +46,25 @@ | @@ -46,22 +46,25 @@ | ||
| 46 | </select> | 46 | </select> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 50 | - <div class="layui-input-inline" style="width: auto"> | 49 | + <div class="layui-inline" > |
| 50 | + <div class="layui-input-inline" > | ||
| 51 | <input type="text" name="dateLimit" id="devicedateLimit" autocomplete="off" | 51 | <input type="text" name="dateLimit" id="devicedateLimit" autocomplete="off" |
| 52 | class="layui-input" readonly placeholder="其他日期范围"> | 52 | class="layui-input" readonly placeholder="其他日期范围"> |
| 53 | </div> | 53 | </div> |
| 54 | </div> | 54 | </div> |
| 55 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 56 | + id="orgSearchBtn" >搜索 | ||
| 57 | + </button> | ||
| 55 | </div> | 58 | </div> |
| 56 | </form> | 59 | </form> |
| 57 | - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" style="margin-right: 76px !important;"> | ||
| 58 | - <i class="layui-icon"></i>新增 | ||
| 59 | - </button> | ||
| 60 | </div> | 60 | </div> |
| 61 | <div style="margin-bottom: 10px;"> | 61 | <div style="margin-bottom: 10px;"> |
| 62 | + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" > | ||
| 63 | + <i class="layui-icon"></i>新增 | ||
| 64 | + </button> | ||
| 62 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 65 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 63 | id="device-export-excel"> | 66 | id="device-export-excel"> |
| 64 | - <i class="layui-icon"></i>导出到Excel | 67 | + <i class="layui-icon"></i>导出 |
| 65 | </button> | 68 | </button> |
| 66 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_download" > | 69 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_download" > |
| 67 | <i class="layui-icon"></i>下载 | 70 | <i class="layui-icon"></i>下载 |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-staff-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-staff-time" > |
| 8 | + <button type="button" class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button type="button" class="layui-btn layui-btn-primary active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 20 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | </div> | 28 | </div> |
| 29 | </div> | 29 | </div> |
| 30 | <div class="layui-card-body" style="margin-top: 10px;"> | 30 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 31 | - <div style="display: flex"> | 31 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 32 | <form class="layui-form layui-card-header" onsubmit="return false" | 32 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 33 | lay-filter="form-enterStaff-condition"> | 33 | lay-filter="form-enterStaff-condition"> |
| 34 | <div class="layui-form-item"> | 34 | <div class="layui-form-item"> |
| @@ -42,26 +42,34 @@ | @@ -42,26 +42,34 @@ | ||
| 42 | <div class="layui-input-inline"> | 42 | <div class="layui-input-inline"> |
| 43 | <select name="manufacturerId" id="slt-staff-group" | 43 | <select name="manufacturerId" id="slt-staff-group" |
| 44 | lay-filter="slt-staff-group" lay-search> | 44 | lay-filter="slt-staff-group" lay-search> |
| 45 | - <option value="">=工作单位=</option> | 45 | + <option value="">工作单位</option> |
| 46 | </select> | 46 | </select> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 50 | - <div class="layui-input-inline" style="width: auto"> | 49 | + <div class="layui-inline"> |
| 50 | + <div class="layui-input-inline"> | ||
| 51 | <input type="text" name="dateLimit" id="staffdateLimit" autocomplete="off" | 51 | <input type="text" name="dateLimit" id="staffdateLimit" autocomplete="off" |
| 52 | class="layui-input" readonly placeholder="其他日期范围"> | 52 | class="layui-input" readonly placeholder="其他日期范围"> |
| 53 | </div> | 53 | </div> |
| 54 | </div> | 54 | </div> |
| 55 | + | ||
| 56 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 57 | + id="orgSearchBtn" >搜索 | ||
| 58 | + </button> | ||
| 59 | + | ||
| 55 | </div> | 60 | </div> |
| 56 | </form> | 61 | </form> |
| 57 | - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="staff_create" > | 62 | + </div> |
| 63 | + <div style="margin-bottom: 10px;"> | ||
| 64 | + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="staff_create"> | ||
| 58 | <i class="layui-icon"></i>新增 | 65 | <i class="layui-icon"></i>新增 |
| 59 | </button> | 66 | </button> |
| 60 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 67 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 61 | id="staff-export-excel"> | 68 | id="staff-export-excel"> |
| 62 | - <i class="layui-icon"></i>导出到Excel | 69 | + <i class="layui-icon"></i>导出 |
| 63 | </button> | 70 | </button> |
| 64 | - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="report_download" > | 71 | + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" |
| 72 | + id="report_download"> | ||
| 65 | <i class="layui-icon"></i>下载 | 73 | <i class="layui-icon"></i>下载 |
| 66 | </button> | 74 | </button> |
| 67 | </div> | 75 | </div> |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-extra-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-extra-time"> |
| 8 | + <button type="button" class="layui-btn layui-btn-primary span date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary span date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button type="button" class="layui-btn layui-btn-primary span active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button type="button" class="layui-btn layui-btn-primary span date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 20 | + <button type="button" class="layui-btn layui-btn-primary span date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | </div> | 29 | </div> |
| 30 | </div> | 30 | </div> |
| 31 | <div class="layui-card-body" style="margin-top: 10px;"> | 31 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 32 | - <div style="display: flex"> | 32 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 33 | <form class="layui-form layui-card-header" onsubmit="return false" | 33 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 34 | lay-filter="form-extra-condition"> | 34 | lay-filter="form-extra-condition"> |
| 35 | <div class="layui-form-item"> | 35 | <div class="layui-form-item"> |
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | <div class="layui-input-inline"> | 43 | <div class="layui-input-inline"> |
| 44 | <select name="manufacturerId" id="slt-extra-group" | 44 | <select name="manufacturerId" id="slt-extra-group" |
| 45 | lay-filter="slt-extra-group" lay-search> | 45 | lay-filter="slt-extra-group" lay-search> |
| 46 | - <option value="">=工作单位=</option> | 46 | + <option value="">工作单位</option> |
| 47 | </select> | 47 | </select> |
| 48 | </div> | 48 | </div> |
| 49 | </div> | 49 | </div> |
| @@ -53,23 +53,28 @@ | @@ -53,23 +53,28 @@ | ||
| 53 | placeholder="加班人" autocomplete="off" class="layui-input"> | 53 | placeholder="加班人" autocomplete="off" class="layui-input"> |
| 54 | </div> | 54 | </div> |
| 55 | </div> | 55 | </div> |
| 56 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 57 | - <div class="layui-input-inline" style="width: auto"> | 56 | + <div class="layui-inline"> |
| 57 | + <div class="layui-input-inline"> | ||
| 58 | <input type="text" name="dateLimit" id="extradateLimit" autocomplete="off" | 58 | <input type="text" name="dateLimit" id="extradateLimit" autocomplete="off" |
| 59 | class="layui-input" readonly placeholder="日期范围"> | 59 | class="layui-input" readonly placeholder="日期范围"> |
| 60 | </div> | 60 | </div> |
| 61 | </div> | 61 | </div> |
| 62 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 63 | + id="orgSearchBtn" >搜索 | ||
| 64 | + </button> | ||
| 62 | </div> | 65 | </div> |
| 63 | </form> | 66 | </form> |
| 67 | + </div> | ||
| 68 | + <div style="margin-bottom: 10px;"> | ||
| 64 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_create" > | 69 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_create" > |
| 65 | <i class="layui-icon"></i>新增 | 70 | <i class="layui-icon"></i>新增 |
| 66 | </button> | 71 | </button> |
| 67 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_download" > | 72 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_download" > |
| 68 | - <i class="layui-icon"></i>模板下载 | 73 | + <i class="layui-icon"></i>下载 |
| 69 | </button> | 74 | </button> |
| 70 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 75 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 71 | id="extra-export-excel"> | 76 | id="extra-export-excel"> |
| 72 | - <i class="layui-icon"></i>导出到Excel | 77 | + <i class="layui-icon"></i>导出 |
| 73 | </button> | 78 | </button> |
| 74 | </div> | 79 | </div> |
| 75 | <table id="table-extra-view" lay-filter="table-extra-view"></table> | 80 | <table id="table-extra-view" lay-filter="table-extra-view"></table> |
| @@ -9,23 +9,23 @@ | @@ -9,23 +9,23 @@ | ||
| 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-onethird"> | 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>*</span>单位</label> |
| 13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
| 14 | <select name="manufacturerId" id="slt-extraAdd-org" | 14 | <select name="manufacturerId" id="slt-extraAdd-org" |
| 15 | lay-filter="slt-extraAdd-org" lay-verify="required"> | 15 | lay-filter="slt-extraAdd-org" lay-verify="required"> |
| 16 | - <option value="">=工作单位=</option> | 16 | + <option value="">工作单位</option> |
| 17 | </select> | 17 | </select> |
| 18 | <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none"> | 18 | <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none"> |
| 19 | </div> | 19 | </div> |
| 20 | </div> | 20 | </div> |
| 21 | <div class="layui-inline inline-onethird"> | 21 | <div class="layui-inline inline-onethird"> |
| 22 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</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 type="text" class="layui-input" name="extraWorker" id="extraWorker" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 24 | <input type="text" class="layui-input" name="extraWorker" id="extraWorker" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 25 | </div> | 25 | </div> |
| 26 | </div> | 26 | </div> |
| 27 | <div class="layui-inline inline-onethird"> | 27 | <div class="layui-inline inline-onethird"> |
| 28 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 28 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 29 | <div class="layui-input-inline"> | 29 | <div class="layui-input-inline"> |
| 30 | <input type="text" class="layui-input" name="extraPhone" id="extraPhone" lay-verify="required|phone"> | 30 | <input type="text" class="layui-input" name="extraPhone" id="extraPhone" lay-verify="required|phone"> |
| 31 | </div> | 31 | </div> |
| @@ -33,19 +33,19 @@ | @@ -33,19 +33,19 @@ | ||
| 33 | </div> | 33 | </div> |
| 34 | <div class="layui-form-item"> | 34 | <div class="layui-form-item"> |
| 35 | <div class="layui-inline inline-onethird"> | 35 | <div class="layui-inline inline-onethird"> |
| 36 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label> | 36 | + <label class="layui-form-label"><span>*</span>申请时间</label> |
| 37 | <div class="layui-input-inline"> | 37 | <div class="layui-input-inline"> |
| 38 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> | 38 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> |
| 39 | </div> | 39 | </div> |
| 40 | </div> | 40 | </div> |
| 41 | <div class="layui-inline inline-onethird"> | 41 | <div class="layui-inline inline-onethird"> |
| 42 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>开始时间</label> | 42 | + <label class="layui-form-label"><span>*</span>开始时间</label> |
| 43 | <div class="layui-input-inline"> | 43 | <div class="layui-input-inline"> |
| 44 | <input type="text" class="layui-input" name="startTime" id="startTime" lay-verify="required"> | 44 | <input type="text" class="layui-input" name="startTime" id="startTime" lay-verify="required"> |
| 45 | </div> | 45 | </div> |
| 46 | </div> | 46 | </div> |
| 47 | <div class="layui-inline inline-onethird"> | 47 | <div class="layui-inline inline-onethird"> |
| 48 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>结束时间</label> | 48 | + <label class="layui-form-label"><span>*</span>结束时间</label> |
| 49 | <div class="layui-input-inline"> | 49 | <div class="layui-input-inline"> |
| 50 | <input type="text" class="layui-input" name="endTime" id="endTime" lay-verify="required"> | 50 | <input type="text" class="layui-input" name="endTime" id="endTime" lay-verify="required"> |
| 51 | </div> | 51 | </div> |
| @@ -53,19 +53,19 @@ | @@ -53,19 +53,19 @@ | ||
| 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"><span>*</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> |
| 60 | </div> | 60 | </div> |
| 61 | <div class="layui-inline inline-onethird" > | 61 | <div class="layui-inline inline-onethird" > |
| 62 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>甲方负责人</label> | 62 | + <label class="layui-form-label"><span>*</span>甲方负责人</label> |
| 63 | <div class="layui-input-inline"> | 63 | <div class="layui-input-inline"> |
| 64 | <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 64 | <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 65 | </div> | 65 | </div> |
| 66 | </div> | 66 | </div> |
| 67 | <div class="layui-inline inline-onethird"> | 67 | <div class="layui-inline inline-onethird"> |
| 68 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 68 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 69 | <div class="layui-input-inline"> | 69 | <div class="layui-input-inline"> |
| 70 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> | 70 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> |
| 71 | </div> | 71 | </div> |
| @@ -91,20 +91,20 @@ | @@ -91,20 +91,20 @@ | ||
| 91 | </div> | 91 | </div> |
| 92 | </div> | 92 | </div> |
| 93 | <div class="layui-form-item"> | 93 | <div class="layui-form-item"> |
| 94 | - <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>加班内容</label> | 94 | + <label class="layui-form-label textarea-label"><span>*</span>加班内容</label> |
| 95 | <div class="layui-input-block"> | 95 | <div class="layui-input-block"> |
| 96 | <textarea class="layui-textarea" name="extraContent" maxlength="500" placeholder="加班内容"></textarea> | 96 | <textarea class="layui-textarea" name="extraContent" maxlength="500" placeholder="加班内容"></textarea> |
| 97 | </div> | 97 | </div> |
| 98 | </div> | 98 | </div> |
| 99 | <div class="layui-form-item"> | 99 | <div class="layui-form-item"> |
| 100 | <div class="layui-inline inline-half"> | 100 | <div class="layui-inline inline-half"> |
| 101 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>甲方确认签字</label> | 101 | + <label class="layui-form-label"><span>*</span>甲方确认签字</label> |
| 102 | <div class="layui-input-inline"> | 102 | <div class="layui-input-inline"> |
| 103 | <input type="text" class="layui-input" name="partA" id="partA" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 103 | <input type="text" class="layui-input" name="partA" id="partA" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 104 | </div> | 104 | </div> |
| 105 | </div> | 105 | </div> |
| 106 | <div class="layui-inline inline-half"> | 106 | <div class="layui-inline inline-half"> |
| 107 | - <label class="layui-form-label" style="text-overflow: clip;"><span style="color: red;font-size: 16px">*</span>甲方确认时间</label> | 107 | + <label class="layui-form-label"><span>*</span>甲方确认时间</label> |
| 108 | <div class="layui-input-inline"> | 108 | <div class="layui-input-inline"> |
| 109 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" lay-verify="required"> | 109 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" lay-verify="required"> |
| 110 | </div> | 110 | </div> |
| @@ -4,21 +4,21 @@ | @@ -4,21 +4,21 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-MeetingApply-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-MeetingApply-time"> |
| 8 | + <button type="button" class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button type="button" class="layui-btn layui-btn-primary active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | 17 | ||
| 18 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 18 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 19 | data-period="lastYear">去年 | 19 | data-period="lastYear">去年 |
| 20 | </button> | 20 | </button> |
| 21 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 21 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 22 | data-period="year">今年 | 22 | data-period="year">今年 |
| 23 | </button> | 23 | </button> |
| 24 | </div> | 24 | </div> |
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | </div> | 30 | </div> |
| 31 | </div> | 31 | </div> |
| 32 | <div class="layui-card-body" style="margin-top: 10px;"> | 32 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 33 | - <div style="display: flex"> | 33 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 34 | <form class="layui-form layui-card-header" onsubmit="return false" | 34 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 35 | lay-filter="form-MeetingApply-condition"> | 35 | lay-filter="form-MeetingApply-condition"> |
| 36 | <div class="layui-form-item"> | 36 | <div class="layui-form-item"> |
| @@ -44,24 +44,29 @@ | @@ -44,24 +44,29 @@ | ||
| 44 | <div class="layui-input-inline"> | 44 | <div class="layui-input-inline"> |
| 45 | <select name="orgCode" id="slt-MeetingApply-org" | 45 | <select name="orgCode" id="slt-MeetingApply-org" |
| 46 | lay-filter="slt-MeetingApply-org" lay-search> | 46 | lay-filter="slt-MeetingApply-org" lay-search> |
| 47 | - <option value="">=主办处室=</option> | 47 | + <option value="">主办处室</option> |
| 48 | </select> | 48 | </select> |
| 49 | </div> | 49 | </div> |
| 50 | </div> | 50 | </div> |
| 51 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 52 | - <div class="layui-input-inline" style="width: auto"> | 51 | + <div class="layui-inline" > |
| 52 | + <div class="layui-input-inline"> | ||
| 53 | <input type="text" name="dateLimit" id="mettingdateLimit" autocomplete="off" | 53 | <input type="text" name="dateLimit" id="mettingdateLimit" autocomplete="off" |
| 54 | class="layui-input" readonly placeholder="日期范围"> | 54 | class="layui-input" readonly placeholder="日期范围"> |
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 58 | + id="orgSearchBtn" >搜索 | ||
| 59 | + </button> | ||
| 57 | </div> | 60 | </div> |
| 58 | </form> | 61 | </form> |
| 62 | + </div> | ||
| 63 | + <div style="margin-bottom: 10px;"> | ||
| 59 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="meetingApply_create" > | 64 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="meetingApply_create" > |
| 60 | <i class="layui-icon"></i>新增 | 65 | <i class="layui-icon"></i>新增 |
| 61 | </button> | 66 | </button> |
| 62 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 67 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 63 | id="meetingApply-export-excel"> | 68 | id="meetingApply-export-excel"> |
| 64 | - <i class="layui-icon"></i>导出到Excel | 69 | + <i class="layui-icon"></i>导出 |
| 65 | </button> | 70 | </button> |
| 66 | </div> | 71 | </div> |
| 67 | <table id="table-MeetingApply-view" lay-filter="table-MeetingApply-view"></table> | 72 | <table id="table-MeetingApply-view" lay-filter="table-MeetingApply-view"></table> |
| @@ -9,22 +9,22 @@ | @@ -9,22 +9,22 @@ | ||
| 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-onethird"> | 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>*</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" |
| 15 | lay-filter="slt-mettingAdd-org" lay-verify="required"> | 15 | lay-filter="slt-mettingAdd-org" lay-verify="required"> |
| 16 | - <option value="">=主办处室=</option> | 16 | + <option value="">主办处室</option> |
| 17 | </select> | 17 | </select> |
| 18 | </div> | 18 | </div> |
| 19 | </div> | 19 | </div> |
| 20 | <div class="layui-inline inline-onethird"> | 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>*</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 class="layui-inline inline-onethird"> | 26 | <div class="layui-inline inline-onethird"> |
| 27 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>会议时间</label> | 27 | + <label class="layui-form-label"><span>*</span>会议时间</label> |
| 28 | <div class="layui-input-inline"> | 28 | <div class="layui-input-inline"> |
| 29 | <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"> |
| 30 | </div> | 30 | </div> |
| @@ -39,13 +39,13 @@ | @@ -39,13 +39,13 @@ | ||
| 39 | </div> | 39 | </div> |
| 40 | </div> | 40 | </div> |
| 41 | <div class="layui-inline inline-onethird"> | 41 | <div class="layui-inline inline-onethird"> |
| 42 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联调人员</label> | 42 | + <label class="layui-form-label"><span>*</span>联调人员</label> |
| 43 | <div class="layui-input-inline"> | 43 | <div class="layui-input-inline"> |
| 44 | <input type="text" class="layui-input" name="unitadjustPerson" id="unitadjustPerson" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 44 | <input type="text" class="layui-input" name="unitadjustPerson" id="unitadjustPerson" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 45 | </div> | 45 | </div> |
| 46 | </div> | 46 | </div> |
| 47 | <div class="layui-inline inline-onethird"> | 47 | <div class="layui-inline inline-onethird"> |
| 48 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联调时间</label> | 48 | + <label class="layui-form-label"><span>*</span>联调时间</label> |
| 49 | <div class="layui-input-inline"> | 49 | <div class="layui-input-inline"> |
| 50 | <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required"> | 50 | <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required"> |
| 51 | </div> | 51 | </div> |
| @@ -54,19 +54,19 @@ | @@ -54,19 +54,19 @@ | ||
| 54 | </div> | 54 | </div> |
| 55 | <div class="layui-form-item"> | 55 | <div class="layui-form-item"> |
| 56 | <div class="layui-inline inline-onethird"> | 56 | <div class="layui-inline inline-onethird"> |
| 57 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请时间</label> | 57 | + <label class="layui-form-label"><span>*</span>申请时间</label> |
| 58 | <div class="layui-input-inline"> | 58 | <div class="layui-input-inline"> |
| 59 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> | 59 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> |
| 60 | </div> | 60 | </div> |
| 61 | </div> | 61 | </div> |
| 62 | <div class="layui-inline inline-onethird"> | 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> | 63 | + <label class="layui-form-label" ><span>*</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-onethird"> | 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"><span>*</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)" > |
| 72 | 72 | ||
| @@ -76,13 +76,13 @@ | @@ -76,13 +76,13 @@ | ||
| 76 | <div class="layui-form-item"> | 76 | <div class="layui-form-item"> |
| 77 | 77 | ||
| 78 | <div class="layui-inline inline-onethird"> | 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>*</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-onethird"> | 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>*</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"> |
| 88 | </div> | 88 | </div> |
| @@ -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">主席台人员</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> |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-meetingsummary-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-meetingsummary-time" > |
| 8 | + <button type="button" class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button type="button" class="layui-btn layui-btn-primary active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 20 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | </div> | 29 | </div> |
| 30 | </div> | 30 | </div> |
| 31 | <div class="layui-card-body" style="margin-top: 20px;"> | 31 | <div class="layui-card-body" style="margin-top: 20px;"> |
| 32 | - <div style="display: flex"> | 32 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 33 | <form class="layui-form layui-card-header" onsubmit="return false" | 33 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 34 | lay-filter="form-meetingsummary-condition"> | 34 | lay-filter="form-meetingsummary-condition"> |
| 35 | <div class="layui-form-item"> | 35 | <div class="layui-form-item"> |
| @@ -39,12 +39,15 @@ | @@ -39,12 +39,15 @@ | ||
| 39 | placeholder="会议纪要编号" autocomplete="off" class="layui-input"> | 39 | placeholder="会议纪要编号" autocomplete="off" class="layui-input"> |
| 40 | </div> | 40 | </div> |
| 41 | </div> | 41 | </div> |
| 42 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 43 | - <div class="layui-input-inline" style="width: auto"> | 42 | + <div class="layui-inline"> |
| 43 | + <div class="layui-input-inline"> | ||
| 44 | <input type="text" name="dateLimit" id="meetingsummarydateLimit" autocomplete="off" | 44 | <input type="text" name="dateLimit" id="meetingsummarydateLimit" autocomplete="off" |
| 45 | class="layui-input" readonly placeholder="日期范围"> | 45 | class="layui-input" readonly placeholder="日期范围"> |
| 46 | </div> | 46 | </div> |
| 47 | </div> | 47 | </div> |
| 48 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 49 | + id="orgSearchBtn" >搜索 | ||
| 50 | + </button> | ||
| 48 | </div> | 51 | </div> |
| 49 | </form> | 52 | </form> |
| 50 | </div> | 53 | </div> |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-routeAdjust-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-routeAdjust-time"> |
| 8 | + <button type="button" class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 14 | + <button type="button" class="layui-btn layui-btn-primary active date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 20 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | </div> | 33 | </div> |
| 34 | </div> | 34 | </div> |
| 35 | <div class="layui-card-body" style="margin-top: 10px;"> | 35 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 36 | - <div style="display: flex"> | 36 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 37 | <form class="layui-form layui-card-header" onsubmit="return false" | 37 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 38 | lay-filter="form-routeAdjust-condition"> | 38 | lay-filter="form-routeAdjust-condition"> |
| 39 | <div class="layui-form-item"> | 39 | <div class="layui-form-item"> |
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 47 | <div class="layui-input-inline"> | 47 | <div class="layui-input-inline"> |
| 48 | <select name="adjustType" id="slt-route-group" | 48 | <select name="adjustType" id="slt-route-group" |
| 49 | lay-filter="slt-route-group" lay-search> | 49 | lay-filter="slt-route-group" lay-search> |
| 50 | - <option value="">=调整要求=</option> | 50 | + <option value="">调整要求</option> |
| 51 | </select> | 51 | </select> |
| 52 | </div> | 52 | </div> |
| 53 | </div> | 53 | </div> |
| @@ -55,19 +55,24 @@ | @@ -55,19 +55,24 @@ | ||
| 55 | <div class="layui-input-inline"> | 55 | <div class="layui-input-inline"> |
| 56 | <select name="localCity" id="slt-route-org" | 56 | <select name="localCity" id="slt-route-org" |
| 57 | lay-filter="slt-route-org" lay-search> | 57 | lay-filter="slt-route-org" lay-search> |
| 58 | - <option value="">=城市A=</option> | 58 | + <option value="">城市A</option> |
| 59 | </select> | 59 | </select> |
| 60 | </div> | 60 | </div> |
| 61 | </div> | 61 | </div> |
| 62 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 63 | - <div class="layui-input-inline" style="width: auto"> | 62 | + <div class="layui-inline"> |
| 63 | + <div class="layui-input-inline"> | ||
| 64 | <input type="text" name="dateLimit" id="routedateLimit" autocomplete="off" | 64 | <input type="text" name="dateLimit" id="routedateLimit" autocomplete="off" |
| 65 | class="layui-input" readonly placeholder="日期范围"> | 65 | class="layui-input" readonly placeholder="日期范围"> |
| 66 | </div> | 66 | </div> |
| 67 | </div> | 67 | </div> |
| 68 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 69 | + id="orgSearchBtn" >搜索 | ||
| 70 | + </button> | ||
| 68 | </div> | 71 | </div> |
| 69 | </form> | 72 | </form> |
| 70 | - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="routeAdjust_create" style="float: right"> | 73 | + </div> |
| 74 | + <div style="margin-bottom: 10px;"> | ||
| 75 | + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="routeAdjust_create" > | ||
| 71 | 新增 | 76 | 新增 |
| 72 | </button> | 77 | </button> |
| 73 | </div> | 78 | </div> |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <div class="layui-input-inline"> | 19 | <div class="layui-input-inline"> |
| 20 | <select name="adjustType" id="slt-adjustType-group" | 20 | <select name="adjustType" id="slt-adjustType-group" |
| 21 | lay-filter="slt-adjustType-group" > | 21 | lay-filter="slt-adjustType-group" > |
| 22 | - <option value="">=调整要求=</option> | 22 | + <option value="">调整要求</option> |
| 23 | </select> | 23 | </select> |
| 24 | </div> | 24 | </div> |
| 25 | </div> | 25 | </div> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | <div class="layui-input-inline"> | 28 | <div class="layui-input-inline"> |
| 29 | <select name="localCity" id="slt-localCity-group" | 29 | <select name="localCity" id="slt-localCity-group" |
| 30 | lay-filter="slt-localCity-group"> | 30 | lay-filter="slt-localCity-group"> |
| 31 | - <option value="">=城市选择=</option> | 31 | + <option value="">城市选择</option> |
| 32 | </select> | 32 | </select> |
| 33 | </div> | 33 | </div> |
| 34 | </div> | 34 | </div> |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | <div class="layui-input-inline"> | 39 | <div class="layui-input-inline"> |
| 40 | <select name="targetCity" id="slt-targetCity-group" | 40 | <select name="targetCity" id="slt-targetCity-group" |
| 41 | lay-filter="slt-targetCity-group"> | 41 | lay-filter="slt-targetCity-group"> |
| 42 | - <option value="">=城市选择=</option> | 42 | + <option value="">城市选择</option> |
| 43 | </select> | 43 | </select> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| @@ -9,26 +9,26 @@ | @@ -9,26 +9,26 @@ | ||
| 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-onethird"> | 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>*</span>机房</label> |
| 13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
| 14 | <select name="machineRoomId" id="slt-staffadd-machine" lay-verify="required" | 14 | <select name="machineRoomId" id="slt-staffadd-machine" lay-verify="required" |
| 15 | lay-filter="slt-staffadd-machine"> | 15 | lay-filter="slt-staffadd-machine"> |
| 16 | - <option value="">=选择机房=</option> | 16 | + <option value="">选择机房</option> |
| 17 | </select> | 17 | </select> |
| 18 | </div> | 18 | </div> |
| 19 | </div> | 19 | </div> |
| 20 | <div class="layui-inline inline-onethird"> | 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>*</span>选择单位</label> |
| 22 | <div class="layui-input-inline"> | 22 | <div class="layui-input-inline"> |
| 23 | <select name="manufacturerId" id="slt-staffadd-group" | 23 | <select name="manufacturerId" id="slt-staffadd-group" |
| 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"> |
| 31 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>申请人</label> | 31 | + <label class="layui-form-label"><span>*</span>申请人</label> |
| 32 | <div class="layui-input-inline"> | 32 | <div class="layui-input-inline"> |
| 33 | <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > | 33 | <input type="text" class="layui-input" name="applyUser" id="applyUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" > |
| 34 | </div> | 34 | </div> |
| @@ -36,19 +36,19 @@ | @@ -36,19 +36,19 @@ | ||
| 36 | </div> | 36 | </div> |
| 37 | <div class="layui-form-item"> | 37 | <div class="layui-form-item"> |
| 38 | <div class="layui-inline inline-onethird"> | 38 | <div class="layui-inline inline-onethird"> |
| 39 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 39 | + <label class="layui-form-label"><span>*</span>联系方式</label> |
| 40 | <div class="layui-input-inline"> | 40 | <div class="layui-input-inline"> |
| 41 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> | 41 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> |
| 42 | </div> | 42 | </div> |
| 43 | </div> | 43 | </div> |
| 44 | <div class="layui-inline inline-onethird"> | 44 | <div class="layui-inline inline-onethird"> |
| 45 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>进入时间</label> | 45 | + <label class="layui-form-label"><span>*</span>进入时间</label> |
| 46 | <div class="layui-input-inline"> | 46 | <div class="layui-input-inline"> |
| 47 | <input type="text" class="layui-input" name="enterTime" id="enterTime" lay-verify="required"> | 47 | <input type="text" class="layui-input" name="enterTime" id="enterTime" lay-verify="required"> |
| 48 | </div> | 48 | </div> |
| 49 | </div> | 49 | </div> |
| 50 | <div class="layui-inline inline-onethird"> | 50 | <div class="layui-inline inline-onethird"> |
| 51 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>出来时间</label> | 51 | + <label class="layui-form-label"><span>*</span>出来时间</label> |
| 52 | <div class="layui-input-inline"> | 52 | <div class="layui-input-inline"> |
| 53 | <input type="text" class="layui-input" name="outTime" id="outTime" lay-verify="required"> | 53 | <input type="text" class="layui-input" name="outTime" id="outTime" lay-verify="required"> |
| 54 | </div> | 54 | </div> |
| @@ -56,19 +56,19 @@ | @@ -56,19 +56,19 @@ | ||
| 56 | </div> | 56 | </div> |
| 57 | <div class="layui-form-item"> | 57 | <div class="layui-form-item"> |
| 58 | <div class="layui-inline inline-onethird"> | 58 | <div class="layui-inline inline-onethird"> |
| 59 | - <label class="layui-form-label" ><span style="color: red;font-size: 16px">*</span>机房负责人</label> | 59 | + <label class="layui-form-label" ><span>*</span>机房负责人</label> |
| 60 | <div class="layui-input-inline"> | 60 | <div class="layui-input-inline"> |
| 61 | <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 61 | <input type="text" class="layui-input" name="machineRoomLeader" id="machineRoomLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 62 | </div> | 62 | </div> |
| 63 | </div> | 63 | </div> |
| 64 | <div class="layui-inline inline-onethird"> | 64 | <div class="layui-inline inline-onethird"> |
| 65 | - <label class="layui-form-label" ><span style="color: red;font-size: 16px">*</span>项目管理员</label> | 65 | + <label class="layui-form-label" ><span>*</span>项目管理员</label> |
| 66 | <div class="layui-input-inline"> | 66 | <div class="layui-input-inline"> |
| 67 | <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 67 | <input type="text" class="layui-input" name="projectLeader" id="projectLeader" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 68 | </div> | 68 | </div> |
| 69 | </div> | 69 | </div> |
| 70 | <div class="layui-inline inline-onethird"> | 70 | <div class="layui-inline inline-onethird"> |
| 71 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维负责人</label> | 71 | + <label class="layui-form-label"><span>*</span>运维负责人</label> |
| 72 | <div class="layui-input-inline"> | 72 | <div class="layui-input-inline"> |
| 73 | <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 73 | <input type="text" class="layui-input" name="operationUser" id="operationUser" lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 74 | </div> | 74 | </div> |
| @@ -76,20 +76,20 @@ | @@ -76,20 +76,20 @@ | ||
| 76 | </div> | 76 | </div> |
| 77 | <div class="layui-form-item" > | 77 | <div class="layui-form-item" > |
| 78 | <div class="layui-inline inline-onethird"> | 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>*</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-onethird"> | 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>*</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)"> |
| 88 | </div> | 88 | </div> |
| 89 | </div> | 89 | </div> |
| 90 | </div> | 90 | </div> |
| 91 | <div class="layui-form-item"> | 91 | <div class="layui-form-item"> |
| 92 | - <label class="layui-form-label textarea-label"><span style="color: red;font-size: 16px">*</span>进入事由</label> | 92 | + <label class="layui-form-label textarea-label"><span>*</span>进入事由</label> |
| 93 | <div class="layui-input-block"> | 93 | <div class="layui-input-block"> |
| 94 | <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required|account" maxlength="150" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,150)"></textarea> | 94 | <textarea class="layui-textarea" name="reason" id="reason" lay-verify="required|account" maxlength="150" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,150)"></textarea> |
| 95 | </div> | 95 | </div> |
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | lay-filter="noticemerge-form"> | 10 | lay-filter="noticemerge-form"> |
| 11 | <div class="layui-form-item"> | 11 | <div class="layui-form-item"> |
| 12 | <div class="layui-inline"> | 12 | <div class="layui-inline"> |
| 13 | - <div class="layui-input-inline layui-input-inline--long"> | 13 | + <div class="layui-input-inline layui-input-inline--long keyword-input"> |
| 14 | <input autocomplete="off" class="layui-input" id="condition-noticemerge-name" | 14 | <input autocomplete="off" class="layui-input" id="condition-noticemerge-name" |
| 15 | lay-tips="关键字检索包含: </br>通知内容" placeholder="输入关键字，回车搜索" type="text"> | 15 | lay-tips="关键字检索包含: </br>通知内容" placeholder="输入关键字，回车搜索" type="text"> |
| 16 | </div> | 16 | </div> |
| @@ -8,26 +8,26 @@ | @@ -8,26 +8,26 @@ | ||
| 8 | <input hidden name="id" id="id" lay-verify="checkrecoveryverifyIsExist"> | 8 | <input hidden name="id" id="id" lay-verify="checkrecoveryverifyIsExist"> |
| 9 | <div class="layui-form-item"> | 9 | <div class="layui-form-item"> |
| 10 | <div class="layui-inline inline-onethird"> | 10 | <div class="layui-inline inline-onethird"> |
| 11 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>业务系统</label> | 11 | + <label class="layui-form-label"><span>*</span>业务系统</label> |
| 12 | <div class="layui-input-inline"> | 12 | <div class="layui-input-inline"> |
| 13 | <select name="bizId" id="slt-biz-add" | 13 | <select name="bizId" id="slt-biz-add" |
| 14 | lay-filter="slt-biz-add" lay-verify="required"> | 14 | lay-filter="slt-biz-add" lay-verify="required"> |
| 15 | - <option value="">=业务系统=</option> | 15 | + <option value="">业务系统</option> |
| 16 | </select> | 16 | </select> |
| 17 | </div> | 17 | </div> |
| 18 | </div> | 18 | </div> |
| 19 | <div class="layui-inline inline-onethird"> | 19 | <div class="layui-inline inline-onethird"> |
| 20 | <label class="layui-form-label"><span | 20 | <label class="layui-form-label"><span |
| 21 | - style="color: red;font-size: 16px">*</span>数据库名称</label> | 21 | + >*</span>数据库名称</label> |
| 22 | <div class="layui-input-inline"> | 22 | <div class="layui-input-inline"> |
| 23 | <input type="text" class="layui-input" name="databaseName" id="databaseName" style="display: none"> | 23 | <input type="text" class="layui-input" name="databaseName" id="databaseName" style="display: none"> |
| 24 | <select name="resId" id="slt-resId" lay-verify="required" lay-filter ="slt-resId"> | 24 | <select name="resId" id="slt-resId" lay-verify="required" lay-filter ="slt-resId"> |
| 25 | - <option value="">=选择数据库=</option> | 25 | + <option value="">选择数据库</option> |
| 26 | </select> | 26 | </select> |
| 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 style="color: red;font-size: 16px">*</span>申请时间</label> | 30 | + <label class="layui-form-label"><span >*</span>申请时间</label> |
| 31 | <div class="layui-input-inline"> | 31 | <div class="layui-input-inline"> |
| 32 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> | 32 | <input type="text" class="layui-input" name="applyTime" id="applyTime" lay-verify="required"> |
| 33 | </div> | 33 | </div> |
| @@ -35,22 +35,22 @@ | @@ -35,22 +35,22 @@ | ||
| 35 | </div> | 35 | </div> |
| 36 | <div class="layui-form-item"> | 36 | <div class="layui-form-item"> |
| 37 | <div class="layui-inline inline-onethird"> | 37 | <div class="layui-inline inline-onethird"> |
| 38 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>系统负责人</label> | 38 | + <label class="layui-form-label"><span >*</span>系统负责人</label> |
| 39 | <div class="layui-input-inline"> | 39 | <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)"> | 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)"> |
| 41 | </div> | 41 | </div> |
| 42 | </div> | 42 | </div> |
| 43 | <div class="layui-inline inline-onethird"> | 43 | <div class="layui-inline inline-onethird"> |
| 44 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>所属处室</label> | 44 | + <label class="layui-form-label"><span >*</span>所属处室</label> |
| 45 | <div class="layui-input-inline"> | 45 | <div class="layui-input-inline"> |
| 46 | <select name="orgCode" id="slt-recoveryverifyAdd-org" | 46 | <select name="orgCode" id="slt-recoveryverifyAdd-org" |
| 47 | lay-filter="slt-recoveryverifyAdd-org" lay-verify="required"> | 47 | lay-filter="slt-recoveryverifyAdd-org" lay-verify="required"> |
| 48 | - <option value="">=所属处室=</option> | 48 | + <option value="">所属处室</option> |
| 49 | </select> | 49 | </select> |
| 50 | </div> | 50 | </div> |
| 51 | </div> | 51 | </div> |
| 52 | <div class="layui-inline inline-onethird"> | 52 | <div class="layui-inline inline-onethird"> |
| 53 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>联系方式</label> | 53 | + <label class="layui-form-label"><span >*</span>联系方式</label> |
| 54 | <div class="layui-input-inline"> | 54 | <div class="layui-input-inline"> |
| 55 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> | 55 | <input type="text" class="layui-input" name="phone" id="phone" lay-verify="required|phone"> |
| 56 | </div> | 56 | </div> |
| @@ -58,23 +58,23 @@ | @@ -58,23 +58,23 @@ | ||
| 58 | </div> | 58 | </div> |
| 59 | <div class="layui-form-item"> | 59 | <div class="layui-form-item"> |
| 60 | <div class="layui-inline inline-onethird"> | 60 | <div class="layui-inline inline-onethird"> |
| 61 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>运维负责人</label> | 61 | + <label class="layui-form-label"><span >*</span>运维负责人</label> |
| 62 | <div class="layui-input-inline"> | 62 | <div class="layui-input-inline"> |
| 63 | <input type="text" class="layui-input" name="operationUser" id="operationUser" | 63 | <input type="text" class="layui-input" name="operationUser" id="operationUser" |
| 64 | lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> | 64 | lay-verify="required|account" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)"> |
| 65 | </div> | 65 | </div> |
| 66 | </div> | 66 | </div> |
| 67 | <div class="layui-inline inline-onethird"> | 67 | <div class="layui-inline inline-onethird"> |
| 68 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>所属公司</label> | 68 | + <label class="layui-form-label"><span >*</span>所属公司</label> |
| 69 | <div class="layui-input-inline"> | 69 | <div class="layui-input-inline"> |
| 70 | <select name="omanufacturerId" id="slt-recoveryverifyadd-group" | 70 | <select name="omanufacturerId" id="slt-recoveryverifyadd-group" |
| 71 | lay-filter="slt-recoveryverifyadd-group" lay-verify="required"> | 71 | lay-filter="slt-recoveryverifyadd-group" lay-verify="required"> |
| 72 | - <option value="">=所属公司=</option> | 72 | + <option value="">所属公司</option> |
| 73 | </select> | 73 | </select> |
| 74 | </div> | 74 | </div> |
| 75 | </div> | 75 | </div> |
| 76 | <div class="layui-inline inline-onethird"> | 76 | <div class="layui-inline inline-onethird"> |
| 77 | - <label class="layui-form-label"><span style="color: red">*</span>电话</label> | 77 | + <label class="layui-form-label"><span>*</span>电话</label> |
| 78 | <div class="layui-input-inline"> | 78 | <div class="layui-input-inline"> |
| 79 | <input type="text" class="layui-input" name="ophone" id="ophone" lay-verify="required|phone"> | 79 | <input type="text" class="layui-input" name="ophone" id="ophone" lay-verify="required|phone"> |
| 80 | </div> | 80 | </div> |
| @@ -82,23 +82,23 @@ | @@ -82,23 +82,23 @@ | ||
| 82 | </div> | 82 | </div> |
| 83 | <div class="layui-form-item"> | 83 | <div class="layui-form-item"> |
| 84 | <div class="layui-inline inline-onethird"> | 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 >*</span>实施人</label> |
| 86 | <div class="layui-input-inline"> | 86 | <div class="layui-input-inline"> |
| 87 | <input type="text" class="layui-input" name="implemented" id="implemented" | 87 | <input type="text" class="layui-input" name="implemented" id="implemented" |
| 88 | lay-verify="required"> | 88 | lay-verify="required"> |
| 89 | </div> | 89 | </div> |
| 90 | </div> | 90 | </div> |
| 91 | <div class="layui-inline inline-onethird"> | 91 | <div class="layui-inline inline-onethird"> |
| 92 | - <label class="layui-form-label"><span style="color: red;font-size: 16px">*</span>所属公司</label> | 92 | + <label class="layui-form-label"><span >*</span>所属公司</label> |
| 93 | <div class="layui-input-inline"> | 93 | <div class="layui-input-inline"> |
| 94 | <select name="imanufacturerId" id="slt-Irecoveryverify-group" | 94 | <select name="imanufacturerId" id="slt-Irecoveryverify-group" |
| 95 | lay-filter="slt-Irecoveryverify-group" lay-verify="required"> | 95 | lay-filter="slt-Irecoveryverify-group" lay-verify="required"> |
| 96 | - <option value="">=所属公司=</option> | 96 | + <option value="">所属公司</option> |
| 97 | </select> | 97 | </select> |
| 98 | </div> | 98 | </div> |
| 99 | </div> | 99 | </div> |
| 100 | <div class="layui-inline inline-onethird"> | 100 | <div class="layui-inline inline-onethird"> |
| 101 | - <label class="layui-form-label"><span style="color: red">*</span>电话</label> | 101 | + <label class="layui-form-label"><span>*</span>电话</label> |
| 102 | <div class="layui-input-inline"> | 102 | <div class="layui-input-inline"> |
| 103 | <input type="text" class="layui-input" name="iphone" id="iphone" lay-verify="required|phone"> | 103 | <input type="text" class="layui-input" name="iphone" id="iphone" lay-verify="required|phone"> |
| 104 | </div> | 104 | </div> |
| @@ -129,23 +129,20 @@ | @@ -129,23 +129,20 @@ | ||
| 129 | </div> | 129 | </div> |
| 130 | <div class="layui-form-item"> | 130 | <div class="layui-form-item"> |
| 131 | <div class="layui-inline inline-onethird" > | 131 | <div class="layui-inline inline-onethird" > |
| 132 | - <label class="layui-form-label" ><span | ||
| 133 | - style="color: red;font-size: 16px">*</span>恢复方式</label> | 132 | + <label class="layui-form-label" ><span>*</span>恢复方式</label> |
| 134 | <div class="layui-input-inline"> | 133 | <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)"/> | 134 | <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> | 135 | </div> |
| 137 | </div> | 136 | </div> |
| 138 | <div class="layui-inline inline-onethird"> | 137 | <div class="layui-inline inline-onethird"> |
| 139 | - <label class="layui-form-label"><span | ||
| 140 | - style="color: red;font-size: 16px">*</span>恢复结果：</label> | 138 | + <label class="layui-form-label"><span>*</span>恢复结果：</label> |
| 141 | <div class="layui-input-block"> | 139 | <div class="layui-input-block"> |
| 142 | <input type="radio" name="recoverResult" value="0" title="成功" checked> | 140 | <input type="radio" name="recoverResult" value="0" title="成功" checked> |
| 143 | <input type="radio" name="recoverResult" value="1" title="失败"> | 141 | <input type="radio" name="recoverResult" value="1" title="失败"> |
| 144 | </div> | 142 | </div> |
| 145 | </div> | 143 | </div> |
| 146 | <div class="layui-inline inline-onethird"> | 144 | <div class="layui-inline inline-onethird"> |
| 147 | - <label class="layui-form-label"><span | ||
| 148 | - style="color: red;font-size: 16px">*</span>恢复时间段</label> | 145 | + <label class="layui-form-label"><span>*</span>恢复时间段</label> |
| 149 | <div class="layui-input-inline"> | 146 | <div class="layui-input-inline"> |
| 150 | <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required"> | 147 | <input type="text" class="layui-input" name="unitadjustperiod" id="unitadjustperiod" lay-verify="required"> |
| 151 | </div> | 148 | </div> |
| @@ -173,8 +170,8 @@ | @@ -173,8 +170,8 @@ | ||
| 173 | </div> | 170 | </div> |
| 174 | 171 | ||
| 175 | <div class="layui-form-item"> | 172 | <div class="layui-form-item"> |
| 176 | - <label class="layui-form-label textarea-label" style="text-overflow: clip"><span | ||
| 177 | - style="color: red;font-size: 16px">*</span>恢复验证结果</label> | 173 | + <label class="layui-form-label textarea-label" ><span |
| 174 | + >*</span>恢复验证结果</label> | ||
| 178 | <div class="layui-input-block"> | 175 | <div class="layui-input-block"> |
| 179 | <textarea class="layui-textarea" name="resultDesc" maxlength="500" | 176 | <textarea class="layui-textarea" name="resultDesc" maxlength="500" |
| 180 | placeholder="恢复验证结果" lay-verify="required"></textarea> | 177 | placeholder="恢复验证结果" lay-verify="required"></textarea> |
| @@ -182,8 +179,8 @@ | @@ -182,8 +179,8 @@ | ||
| 182 | </div> | 179 | </div> |
| 183 | 180 | ||
| 184 | <div class="layui-form-item"> | 181 | <div class="layui-form-item"> |
| 185 | - <label class="layui-form-label textarea-label" style="text-overflow: clip"><span | ||
| 186 | - style="color: red;font-size: 16px">*</span>恢复验证缺陷</label> | 182 | + <label class="layui-form-label textarea-label" ><span |
| 183 | + >*</span>恢复验证缺陷</label> | ||
| 187 | <div class="layui-input-block"> | 184 | <div class="layui-input-block"> |
| 188 | <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea> | 185 | <textarea class="layui-textarea" name="defect" maxlength="300" placeholder="恢复验证缺陷(没有填无)" lay-verify="required"></textarea> |
| 189 | </div> | 186 | </div> |
| @@ -193,13 +190,13 @@ | @@ -193,13 +190,13 @@ | ||
| 193 | </fieldset> | 190 | </fieldset> |
| 194 | <div class="layui-form-item"> | 191 | <div class="layui-form-item"> |
| 195 | <div class="layui-inline inline-half"> | 192 | <div class="layui-inline inline-half"> |
| 196 | - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>运维负责人确认签字</label> | 193 | + <label class="layui-form-label" ><span >*</span>运维确认签字</label> |
| 197 | <div class="layui-input-inline"> | 194 | <div class="layui-input-inline"> |
| 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)"> | 195 | <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)"> |
| 199 | </div> | 196 | </div> |
| 200 | </div> | 197 | </div> |
| 201 | <div class="layui-inline inline-half"> | 198 | <div class="layui-inline inline-half"> |
| 202 | - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red">*</span>运维负责人确认时间</label> | 199 | + <label class="layui-form-label" ><span>*</span>运维确认时间</label> |
| 203 | <div class="layui-input-inline"> | 200 | <div class="layui-input-inline"> |
| 204 | <input type="text" class="layui-input" name="oAcknowledgingTime" id="oAcknowledgingTime" | 201 | <input type="text" class="layui-input" name="oAcknowledgingTime" id="oAcknowledgingTime" |
| 205 | lay-verify="required"> | 202 | lay-verify="required"> |
| @@ -208,13 +205,13 @@ | @@ -208,13 +205,13 @@ | ||
| 208 | </div> | 205 | </div> |
| 209 | <div class="layui-form-item"> | 206 | <div class="layui-form-item"> |
| 210 | <div class="layui-inline inline-half"> | 207 | <div class="layui-inline inline-half"> |
| 211 | - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>实施人确认签字</label> | 208 | + <label class="layui-form-label" ><span >*</span>实施确认签字</label> |
| 212 | <div class="layui-input-inline"> | 209 | <div class="layui-input-inline"> |
| 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)"> | 210 | <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)"> |
| 214 | </div> | 211 | </div> |
| 215 | </div> | 212 | </div> |
| 216 | <div class="layui-inline inline-half"> | 213 | <div class="layui-inline inline-half"> |
| 217 | - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red">*</span>实施人确认时间</label> | 214 | + <label class="layui-form-label" ><span>*</span>实施确认时间</label> |
| 218 | <div class="layui-input-inline"> | 215 | <div class="layui-input-inline"> |
| 219 | <input type="text" class="layui-input" name="iAcknowledgingTime" id="iAcknowledgingTime" | 216 | <input type="text" class="layui-input" name="iAcknowledgingTime" id="iAcknowledgingTime" |
| 220 | lay-verify="required"> | 217 | lay-verify="required"> |
| @@ -223,13 +220,13 @@ | @@ -223,13 +220,13 @@ | ||
| 223 | </div> | 220 | </div> |
| 224 | <div class="layui-form-item"> | 221 | <div class="layui-form-item"> |
| 225 | <div class="layui-inline inline-half"> | 222 | <div class="layui-inline inline-half"> |
| 226 | - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red;">*</span>甲方确认签字</label> | 223 | + <label class="layui-form-label" ><span >*</span>甲方确认签字</label> |
| 227 | <div class="layui-input-inline"> | 224 | <div class="layui-input-inline"> |
| 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)"> | 225 | <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)"> |
| 229 | </div> | 226 | </div> |
| 230 | </div> | 227 | </div> |
| 231 | <div class="layui-inline inline-half"> | 228 | <div class="layui-inline inline-half"> |
| 232 | - <label class="layui-form-label" style="text-overflow: clip;width: 160px"><span style="color: red">*</span>甲方确认时间</label> | 229 | + <label class="layui-form-label" ><span>*</span>甲方确认时间</label> |
| 233 | <div class="layui-input-inline"> | 230 | <div class="layui-input-inline"> |
| 234 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" | 231 | <input type="text" class="layui-input" name="aAcknowledgingTime" id="aAcknowledgingTime" |
| 235 | lay-verify="required"> | 232 | lay-verify="required"> |
| @@ -3,17 +3,8 @@ | @@ -3,17 +3,8 @@ | ||
| 3 | <div class="page-panel "> | 3 | <div class="page-panel "> |
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | - | ||
| 7 | <div class="layui-card-body" style="margin-top: 10px;"> | 6 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 8 | - <div class="layui-btn-group time-group" id="btns-recoverycount-time" style="float: right;"> | ||
| 9 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | ||
| 10 | - data-period="lastYear">去年 | ||
| 11 | - </button> | ||
| 12 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | ||
| 13 | - data-period="year">今年 | ||
| 14 | - </button> | ||
| 15 | - </div> | ||
| 16 | - <div style="display: flex"> | 7 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 17 | <form class="layui-form layui-card-header" onsubmit="return false" | 8 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 18 | lay-filter="form-recoverycount-condition"> | 9 | lay-filter="form-recoverycount-condition"> |
| 19 | <div class="layui-form-item"> | 10 | <div class="layui-form-item"> |
| @@ -21,19 +12,24 @@ | @@ -21,19 +12,24 @@ | ||
| 21 | <div class="layui-input-inline"> | 12 | <div class="layui-input-inline"> |
| 22 | <select name="busId" id="slt-recoverycount-biz" | 13 | <select name="busId" id="slt-recoverycount-biz" |
| 23 | lay-filter="slt-recoverycount-biz" lay-search> | 14 | lay-filter="slt-recoverycount-biz" lay-search> |
| 24 | - <option value="">=业务系统=</option> | 15 | + <option value="">业务系统</option> |
| 25 | </select> | 16 | </select> |
| 26 | </div> | 17 | </div> |
| 27 | - <!-- <button class="layui-btn layui-btn-sm layui-btn-normal active" | ||
| 28 | - id="recoverycount-export-excel" style="float: right;"> | ||
| 29 | - <i class="layui-icon"></i>导出到Excel | ||
| 30 | - </button>--> | ||
| 31 | </div> | 18 | </div> |
| 32 | - | 19 | + <div class="layui-inline layui-btn-group time-group" id="btns-recoverycount-time"> |
| 20 | + <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | ||
| 21 | + data-period="lastYear">去年 | ||
| 22 | + </button> | ||
| 23 | + <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | ||
| 24 | + data-period="year">今年 | ||
| 25 | + </button> | ||
| 26 | + </div> | ||
| 27 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 28 | + id="orgSearchBtn" >搜索 | ||
| 29 | + </button> | ||
| 33 | </div> | 30 | </div> |
| 34 | 31 | ||
| 35 | </form> | 32 | </form> |
| 36 | - | ||
| 37 | </div> | 33 | </div> |
| 38 | <table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table"> | 34 | <table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table"> |
| 39 | <thead> | 35 | <thead> |
| @@ -4,20 +4,20 @@ | @@ -4,20 +4,20 @@ | ||
| 4 | <div class="main"> | 4 | <div class="main"> |
| 5 | <div class="layui-card"> | 5 | <div class="layui-card"> |
| 6 | <div class="layui-card-header"> | 6 | <div class="layui-card-header"> |
| 7 | - <div class="layui-btn-group time-group" id="btns-recoveryverify-time" style="float: right;"> | ||
| 8 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 7 | + <div class="layui-btn-group time-group right" id="btns-recoveryverify-time"> |
| 8 | + <button type="button" class="layui-btn layui-btn-primary date" | ||
| 9 | data-period="all">全部 | 9 | data-period="all">全部 |
| 10 | </button> | 10 | </button> |
| 11 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 11 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 12 | data-period="lastMonth">上月 | 12 | data-period="lastMonth">上月 |
| 13 | </button> | 13 | </button> |
| 14 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 14 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 15 | data-period="month">本月 | 15 | data-period="month">本月 |
| 16 | </button> | 16 | </button> |
| 17 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" | 17 | + <button type="button" class="layui-btn layui-btn-primary date" |
| 18 | data-period="lastYear">去年 | 18 | data-period="lastYear">去年 |
| 19 | </button> | 19 | </button> |
| 20 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date" | 20 | + <button type="button" class="layui-btn layui-btn-primary active date" |
| 21 | data-period="year">今年 | 21 | data-period="year">今年 |
| 22 | </button> | 22 | </button> |
| 23 | </div> | 23 | </div> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | </div> | 28 | </div> |
| 29 | </div> | 29 | </div> |
| 30 | <div class="layui-card-body" style="margin-top: 10px;"> | 30 | <div class="layui-card-body" style="margin-top: 10px;"> |
| 31 | - <div style="display: flex"> | 31 | + <div style="display: flex;justify-content: space-between;align-items: center;"> |
| 32 | <form class="layui-form layui-card-header" onsubmit="return false" | 32 | <form class="layui-form layui-card-header" onsubmit="return false" |
| 33 | lay-filter="form-recoveryverify-condition"> | 33 | lay-filter="form-recoveryverify-condition"> |
| 34 | <div class="layui-form-item"> | 34 | <div class="layui-form-item"> |
| @@ -72,16 +72,19 @@ | @@ -72,16 +72,19 @@ | ||
| 72 | </select> | 72 | </select> |
| 73 | </div> | 73 | </div> |
| 74 | </div> | 74 | </div> |
| 75 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 76 | - <div class="layui-input-inline" style="width: auto"> | 75 | + <div class="layui-inline" > |
| 76 | + <div class="layui-input-inline"> | ||
| 77 | <input type="text" name="dateLimit" id="recoveryverifydateLimit" autocomplete="off" | 77 | <input type="text" name="dateLimit" id="recoveryverifydateLimit" autocomplete="off" |
| 78 | class="layui-input" readonly placeholder="其他日期范围"> | 78 | class="layui-input" readonly placeholder="其他日期范围"> |
| 79 | </div> | 79 | </div> |
| 80 | </div> | 80 | </div> |
| 81 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 82 | + id="orgSearchBtn" >搜索 | ||
| 83 | + </button> | ||
| 81 | </div> | 84 | </div> |
| 82 | </form> | 85 | </form> |
| 83 | </div> | 86 | </div> |
| 84 | - <div style="display: flex;"> | 87 | + <div style="margin-bottom: 10px;"> |
| 85 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create"> | 88 | <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create"> |
| 86 | 新增 | 89 | 新增 |
| 87 | </button> | 90 | </button> |
| @@ -90,7 +93,7 @@ | @@ -90,7 +93,7 @@ | ||
| 90 | </button> | 93 | </button> |
| 91 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 94 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
| 92 | id="recoveryverify-export-excel"> | 95 | id="recoveryverify-export-excel"> |
| 93 | - 导出到Excel | 96 | + 导出 |
| 94 | </button> | 97 | </button> |
| 95 | </div> | 98 | </div> |
| 96 | <table id="recoveryverify-table" class="layui-table" lay-filter="recoveryverify-table"></table> | 99 | <table id="recoveryverify-table" class="layui-table" lay-filter="recoveryverify-table"></table> |
| @@ -95,10 +95,10 @@ | @@ -95,10 +95,10 @@ | ||
| 95 | <div class="layui-card-body"> | 95 | <div class="layui-card-body"> |
| 96 | <div class="warn-btns bustype-btns hide"> | 96 | <div class="warn-btns bustype-btns hide"> |
| 97 | <button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-reslist-add"> | 97 | <button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-reslist-add"> |
| 98 | - <i class="layui-icon"></i>添加绑定 | 98 | + 添加绑定 |
| 99 | </button> | 99 | </button> |
| 100 | <button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-reslist-unbind"> | 100 | <button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-reslist-unbind"> |
| 101 | - <i class="layui-icon"></i>取消绑定 | 101 | + 取消绑定 |
| 102 | </button> | 102 | </button> |
| 103 | </div> | 103 | </div> |
| 104 | <table id="reslist_resListTable" lay-filter="reslist_resListTable"></table> | 104 | <table id="reslist_resListTable" lay-filter="reslist_resListTable"></table> |
| @@ -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> |
| @@ -19,15 +19,15 @@ | @@ -19,15 +19,15 @@ | ||
| 19 | <div class="layui-status search_panel"> | 19 | <div class="layui-status search_panel"> |
| 20 | <form class="layui-form layui-card-header layuiadmin-card-header-auto" | 20 | <form class="layui-form layui-card-header layuiadmin-card-header-auto" |
| 21 | lay-filter="workReport-form" onsubmit="return false;"> | 21 | lay-filter="workReport-form" onsubmit="return false;"> |
| 22 | - <div class="layui-form-item"> | 22 | + <div class="layui-form-item" style="width: 100%"> |
| 23 | <div class="layui-inline"> | 23 | <div class="layui-inline"> |
| 24 | - <div class="layui-input-inline" style="width: 260px"> | 24 | + <div class="layui-input-inline"> |
| 25 | <input autocomplete="off" class="layui-input" id="workReport_title" | 25 | <input autocomplete="off" class="layui-input" id="workReport_title" |
| 26 | - name="repTitle" placeholder="标题搜索，支持内容模糊匹配" type="text"> | 26 | + name="repTitle" placeholder="请输入关键字" type="text"> |
| 27 | </div> | 27 | </div> |
| 28 | </div> | 28 | </div> |
| 29 | <div class="layui-inline"> | 29 | <div class="layui-inline"> |
| 30 | - <div class="layui-input-inline auto-width"> | 30 | + <div class="layui-input-inline auto-width" style="border-style: none!important;"> |
| 31 | <input checked lay-filter="workReport_isRead" name="isRead" title="全部" type="radio" | 31 | <input checked lay-filter="workReport_isRead" name="isRead" title="全部" type="radio" |
| 32 | value=""> | 32 | value=""> |
| 33 | <input lay-filter="workReport_isRead" name="isRead" title="无人阅读" type="radio" | 33 | <input lay-filter="workReport_isRead" name="isRead" title="无人阅读" type="radio" |
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | </div> | 37 | </div> |
| 38 | </div> | 38 | </div> |
| 39 | <div class="layui-inline"> | 39 | <div class="layui-inline"> |
| 40 | - <div class="layui-input-inline auto-width"> | 40 | + <div class="layui-input-inline auto-width" style="border-style: none!important;"> |
| 41 | <input checked lay-filter="workReport_type" name="repType" title="全部" type="radio" | 41 | <input checked lay-filter="workReport_type" name="repType" title="全部" type="radio" |
| 42 | value=""> | 42 | value=""> |
| 43 | <input lay-filter="workReport_type" name="repType" title="日报" type="radio" | 43 | <input lay-filter="workReport_type" name="repType" title="日报" type="radio" |
| @@ -71,6 +71,9 @@ | @@ -71,6 +71,9 @@ | ||
| 71 | type="button">全部 | 71 | type="button">全部 |
| 72 | </button> | 72 | </button> |
| 73 | </div> | 73 | </div> |
| 74 | + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active" | ||
| 75 | + id="orgSearchBtn" >搜索 | ||
| 76 | + </button> | ||
| 74 | </div> | 77 | </div> |
| 75 | </form> | 78 | </form> |
| 76 | </div> | 79 | </div> |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | <div class="layui-inline"> | 23 | <div class="layui-inline"> |
| 24 | <div class="layui-input-inline layui-input-inline--long"> | 24 | <div class="layui-input-inline layui-input-inline--long"> |
| 25 | <input autocomplete="off" class="layui-input" id="monitor_keyword" | 25 | <input autocomplete="off" class="layui-input" id="monitor_keyword" |
| 26 | - name="repTitle" placeholder="标题搜索，支持内容模糊匹配" type="text"> | 26 | + name="repTitle" placeholder="请输入关键字" type="text"> |
| 27 | </div> | 27 | </div> |
| 28 | </div> | 28 | </div> |
| 29 | <div class="layui-inline"> | 29 | <div class="layui-inline"> |
| @@ -42,14 +42,8 @@ | @@ -42,14 +42,8 @@ | ||
| 42 | </select> | 42 | </select> |
| 43 | </div> | 43 | </div> |
| 44 | </div> | 44 | </div> |
| 45 | - <!-- <div class="layui-inline"> | ||
| 46 | - <div class="layui-input-inline"> | ||
| 47 | - <input type="radio" name="currIsRead" value="0" title="未读" lay-filter="workReport-currIsRead"> | ||
| 48 | - <input type="radio" name="currIsRead" value="1" title="已读" lay-filter="workReport-currIsRead"> | ||
| 49 | - </div> | ||
| 50 | - </div>--> | ||
| 51 | <div class="layui-inline"> | 45 | <div class="layui-inline"> |
| 52 | - <div class="layui-input-inline" style="width: auto"> | 46 | + <div class="layui-input-inline auto-width" style="border-style: none!important;" > |
| 53 | <input checked="checked" lay-filter="workReport-repType" name="repType" title="日报" type="radio" | 47 | <input checked="checked" lay-filter="workReport-repType" name="repType" title="日报" type="radio" |
| 54 | value="day"> | 48 | value="day"> |
| 55 | <input lay-filter="workReport-repType" name="repType" title="周报" type="radio" | 49 | <input lay-filter="workReport-repType" name="repType" title="周报" type="radio" |
| @@ -58,37 +52,40 @@ | @@ -58,37 +52,40 @@ | ||
| 58 | value="month"> | 52 | value="month"> |
| 59 | </div> | 53 | </div> |
| 60 | </div> | 54 | </div> |
| 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 date" data-period="today" | 55 | + <div class="layui-inline" > |
| 56 | + <div class="layui-input-inline" > | ||
| 57 | + <input autocomplete="off" class="layui-input" id="dateLimit" name="dateLimit" | ||
| 58 | + placeholder="其他日期范围" readonly type="text"> | ||
| 59 | + </div> | ||
| 60 | + </div> | ||
| 61 | + <div class="layui-inline layui-btn-group time-group" id="btns-workreport-time"> | ||
| 62 | + <button class="layui-btn layui-btn-primary layui-btn-sm 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-sm 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 active date" data-period="thisWeek" | 68 | + <button class="layui-btn layui-btn-primary layui-btn-sm 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-sm date" data-period="lastMonth" |
| 72 | type="button">上月 | 72 | type="button">上月 |
| 73 | </button> | 73 | </button> |
| 74 | - <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="thisMonth" | 74 | + <button class="layui-btn layui-btn-primary layui-btn-sm date" data-period="thisMonth" |
| 75 | type="button">本月 | 75 | type="button">本月 |
| 76 | </button> | 76 | </button> |
| 77 | - <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="thisQuarter" | 77 | + <button class="layui-btn layui-btn-primary layui-btn-sm date" data-period="thisQuarter" |
| 78 | type="button">本季度 | 78 | type="button">本季度 |
| 79 | </button> | 79 | </button> |
| 80 | - <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="" | 80 | + <button class="layui-btn layui-btn-primary layui-btn-sm date" data-period="" |
| 81 | type="button">全部 | 81 | type="button">全部 |
| 82 | </button> | 82 | </button> |
| 83 | </div> | 83 | </div> |
| 84 | - <div class="layui-inline" style="margin-left: 10px"> | ||
| 85 | - <div class="layui-input-inline" style="width: auto"> | ||
| 86 | - <input autocomplete="off" class="layui-input" id="dateLimit" name="dateLimit" | ||
| 87 | - placeholder="其他日期范围" readonly type="text"> | ||
| 88 | - </div> | ||
| 89 | - </div> | 84 | + |
| 90 | </div> | 85 | </div> |
| 86 | + | ||
| 91 | </form> | 87 | </form> |
| 88 | + | ||
| 92 | </div> | 89 | </div> |
| 93 | </div> | 90 | </div> |
| 94 | <div class="layui-card-echart" style="display: flex"> | 91 | <div class="layui-card-echart" style="display: flex"> |
| @@ -138,7 +135,7 @@ | @@ -138,7 +135,7 @@ | ||
| 138 | <!-- <div class="pie-chart" id="chart-noRead-report"></div>--> | 135 | <!-- <div class="pie-chart" id="chart-noRead-report"></div>--> |
| 139 | </div> | 136 | </div> |
| 140 | </div> | 137 | </div> |
| 141 | - <div class="layui-card-body " style="margin-top: 30px;"> | 138 | + <div class="layui-card-body " style="margin-top: 10px;"> |
| 142 | <div class="warn-btns layui-btn-group read-group"> | 139 | <div class="warn-btns layui-btn-group read-group"> |
| 143 | <button class="layui-btn layui-btn-sm layui-btn-primary isRead active" data-type="0"> | 140 | <button class="layui-btn layui-btn-sm layui-btn-primary isRead active" data-type="0"> |
| 144 | 未读 | 141 | 未读 |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | layui.config({ | 51 | layui.config({ |
| 52 | base: '../src/' //指定 layuiAdmin 项目路径，本地开发用 src，线上用 dist | 52 | base: '../src/' //指定 layuiAdmin 项目路径，本地开发用 src，线上用 dist |
| 53 | // ,version: '1.2.1'//运行环境用个固定版本号 | 53 | // ,version: '1.2.1'//运行环境用个固定版本号 |
| 54 | - , version: 'V6.0.0'//本地开发环境，避免改动后的文件未及时生效，所以用时间戳作为版本 | 54 | + , version: 'V6'//本地开发环境，避免改动后的文件未及时生效，所以用时间戳作为版本 |
| 55 | }).use('index'); | 55 | }).use('index'); |
| 56 | </script> | 56 | </script> |
| 57 | </body> | 57 | </body> |
| 1 | spring: | 1 | spring: |
| 2 | application: | 2 | application: |
| 3 | - name: zjweb | 3 | + name: mj-zhjk-web |
| 4 | server: | 4 | server: |
| 5 | - port: 8088 | 5 | + port: 28089 |
| 6 | ssl: | 6 | ssl: |
| 7 | enabled: false | 7 | enabled: false |
| 8 | key-alias: tomcat_https | 8 | key-alias: tomcat_https |
| @@ -12,6 +12,8 @@ server: | @@ -12,6 +12,8 @@ server: | ||
| 12 | key-password: Hg0801.. | 12 | key-password: Hg0801.. |
| 13 | url: | 13 | url: |
| 14 | gateway: http://127.0.0.1:7895 | 14 | gateway: http://127.0.0.1:7895 |
| 15 | +# gateway: http://192.168.0.75:28088 | ||
| 16 | +# gateway: http://192.168.0.196:7895 | ||
| 15 | inspection_web: http://localhost:8082 | 17 | inspection_web: http://localhost:8082 |
| 16 | assetsweb: http://localhost:8082 | 18 | assetsweb: http://localhost:8082 |
| 17 | mxgraph_editor: http://192.168.0.44:8085 | 19 | mxgraph_editor: http://192.168.0.44:8085 |
-
Please register or login to post a comment