monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ed842d56c4772b632b9eea1d6c4e355d94202348 2 parents e86e7088 88fef631

Merge branch 'master-mj-joke' into 'master-mj' 

chore:1、迁移工作日志，禅道#2326；2、迁移工作日志查看，禅道#2327

chore:1、迁移工作日志，禅道#2326；2、迁移工作日志查看，禅道#2327

See merge request !1106
Inline Side-by-side
Showing 4 changed files with 72 additions and 33 deletions
@@ -14,7 +14,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -14,7 +14,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
14 14
15 //对外暴露的接口 15 //对外暴露的接口
16 exports('workReportAdd', function (data) { 16 exports('workReportAdd', function (data) {
17 - var accessToken = session.getToken()['access_token'] 17 + // var accessToken = session.getToken()['access_token']
  18 + var accessToken = common.getMjToken();
18 var userSelect = {} 19 var userSelect = {}
19 var currentDate = {} 20 var currentDate = {}
20 var uploadInst = {} 21 var uploadInst = {}
@@ -27,7 +28,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -27,7 +28,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
27 var historywarningTable = {} 28 var historywarningTable = {}
28 29
29 var viewType = data && data.viewType ? data.viewType : ''; 30 var viewType = data && data.viewType ? data.viewType : '';
30 -  
31 init() 31 init()
32 $('#workReport_type').val(data.repType) 32 $('#workReport_type').val(data.repType)
33 33
@@ -90,7 +90,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -90,7 +90,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
90 delete data['select'] 90 delete data['select']
91 params.workReport = JSON.stringify(data) 91 params.workReport = JSON.stringify(data)
92 admin.req({ 92 admin.req({
93 - url: domainName + '/api-web/workreport/save?access_token=' + accessToken, 93 + url: domainName + '/api-web/workreport/save?accessToken=' + accessToken,
94 data: JSON.stringify(params), 94 data: JSON.stringify(params),
95 type: 'post', 95 type: 'post',
96 contentType: "application/json; charset=utf-8", 96 contentType: "application/json; charset=utf-8",
@@ -108,7 +108,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -108,7 +108,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
108 repTitle: '', 108 repTitle: '',
109 isRead: '', 109 isRead: '',
110 repType: '', 110 repType: '',
111 - createTime: '' 111 + createTime: 'today'
112 }, 112 },
113 }); 113 });
114 $("#workReport-form-save-id").removeAttr("disabled"); 114 $("#workReport-form-save-id").removeAttr("disabled");
@@ -186,7 +186,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -186,7 +186,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
186 186
187 url = domainName + '/api-web/home/alarm/getAlarm' 187 url = domainName + '/api-web/home/alarm/getAlarm'
188 188
189 - getAlarmInfo(where, cols, url) 189 + getAlarmInfo(where,cols, url)
  190 +
  191 +
  192 + /**
  193 + * 非新增日报时，切换到日报时回填告警信息
  194 + * @author joke
  195 + * */
  196 + function getAlarmCount(url) {
  197 + admin.req({
  198 + url: url+'?page=1&limit=10&dateTime='+$('#add-workReport-form').find("input[name='createTime']").val(),
  199 + success: function (res) {
  200 + if (res && res.map){
  201 + var str = `共有${res.map.totalCount}条告警，手动处理${res.map.manualCount}条，自动处理${res.map.autoCount}条，` +
  202 + `未处理${res.map.alarmCount}条`;
  203 + $('#add-workReport-form').find("input[name='alarmStatic']").val(str);
  204 + }
  205 + }
  206 + })
  207 + }
190 208
191 //表单赋值 209 //表单赋值
192 function fromAssignment() { 210 function fromAssignment() {
@@ -283,6 +301,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -283,6 +301,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
283 , cols: [cols] 301 , cols: [cols]
284 , done: function (res, curr, count) { 302 , done: function (res, curr, count) {
285 303
  304 + //指标名称点击事件
  305 + $('[data-warn-zbmc]').unbind("click").on('click', function () {
  306 + var name = $(this).data("name");
  307 + var params = {
  308 + resId: $(this).data("resid"),
  309 + kpiId: $(this).data("kpi"),
  310 + flag: $(this).data("flag"),
  311 + name: name,
  312 + warning: $(this).data("warning"),
  313 + ident: $(this).data("ident"),
  314 + trend: $(this).data("trend")
  315 + };
  316 + let win = window.parent;
  317 + if (win) {
  318 + window.parent.postMessage({
  319 + type: 'resKpiTrendChart',
  320 + message: {'title':name,'params':params}
  321 + }, '*')
  322 + }
  323 + });
286 } 324 }
287 }) 325 })
288 } 326 }
@@ -315,7 +353,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -315,7 +353,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
315 var fileName = [] 353 var fileName = []
316 uploadInst = upload.render({ 354 uploadInst = upload.render({
317 elem: '#attachment', //绑定元素 355 elem: '#attachment', //绑定元素
318 - url: common.domainName + '/api-web/workreport/upload', 356 + url: common.domainName + '/api-web/workreport/upload?accessToken='+accessToken,
319 data: param, 357 data: param,
320 multiple: true, 358 multiple: true,
321 auto: false, //选择文件后不自动上传 359 auto: false, //选择文件后不自动上传
@@ -350,7 +388,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -350,7 +388,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
350 //初始化用户下拉列表框 388 //初始化用户下拉列表框
351 function initUserSelect() { 389 function initUserSelect() {
352 $.ajax({ 390 $.ajax({
353 - url: domainName + '/api-user/users/getAll?access_token=' + accessToken, 391 + url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
  392 + // url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
354 success: function (res) { 393 success: function (res) {
355 userSelect = xmSelect.render({ 394 userSelect = xmSelect.render({
356 el: '.reportUser', 395 el: '.reportUser',
@@ -365,7 +404,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -365,7 +404,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
365 filterable: true, 404 filterable: true,
366 layVerify: 'required', 405 layVerify: 'required',
367 layVerType: 'msg', 406 layVerType: 'msg',
368 - data: res, 407 + data: res.data.rows,
369 }) 408 })
370 initGroupUserDefault() 409 initGroupUserDefault()
371 //赋值 410 //赋值
@@ -376,8 +415,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -376,8 +415,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
376 415
377 //初始化组负责人对应的组员 416 //初始化组负责人对应的组员
378 function initGroupUserDefault() { 417 function initGroupUserDefault() {
379 - $.ajax({  
380 - url: domainName + '/api-web/workreport/getUserByAdmin?theirType=1&access_token=' + accessToken, 418 + admin.req({
  419 + url: domainName + '/api-web/workreport/getUserByAdmin?theirType=1',
381 success: function (res) { 420 success: function (res) {
382 if (!res.str) { 421 if (!res.str) {
383 return; 422 return;
@@ -395,29 +434,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -395,29 +434,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
395 function initFromType(repType) { 434 function initFromType(repType) {
396 switch (repType) { 435 switch (repType) {
397 case 'day': 436 case 'day':
398 - $('.work_finish').text('今日完成工作')  
399 - $('.work_conclusion').text('未完成工作')  
400 - $('.work_help').text('需要协调工作') 437 + $('.work_finish').html('<label>今日完成工作<span style="color: red">*</span></label>')
  438 + $('.work_conclusion').html('<label>未完成工作<span style="color: red">*</span></label>')
  439 + $('.work_help').html('<label>需要协调工作<span style="color: red">*</span></label>')
401 $('.plan').hide() 440 $('.plan').hide()
402 $('.reportAlarm').show() 441 $('.reportAlarm').show()
403 $('.report_alarmStatic').show() 442 $('.report_alarmStatic').show()
404 getAlarmInfo(where, cols, url) 443 getAlarmInfo(where, cols, url)
  444 + if (data.repType != 'day'){
  445 + getAlarmCount(url)
  446 + }
405 break 447 break
406 case 'week': 448 case 'week':
407 - $('.work_finish').text('本周完成工作')  
408 - $('.work_conclusion').text('本周工作总结') 449 + $('.work_finish').html('<label>本周完成工作<span style="color: red">*</span></label>')
  450 + $('.work_conclusion').html('<label>本周工作总结<span style="color: red">*</span></label>')
409 $('.plan').show() 451 $('.plan').show()
410 - $('.work_plan').text('下周工作计划')  
411 - $('.work_help').text('需要协调与帮助') 452 + $('.work_plan').html('<label>下周工作计划<span style="color: red">*</span></label>')
  453 + $('.work_help').html('<label>需要协调与帮助<span style="color: red">*</span></label>')
412 $('.reportAlarm').hide() 454 $('.reportAlarm').hide()
413 $('.report_alarmStatic').hide() 455 $('.report_alarmStatic').hide()
414 break 456 break
415 case 'month': 457 case 'month':
416 - $('.work_finish').text('本月完成工作')  
417 - $('.work_conclusion').text('本月工作总结') 458 + $('.work_finish').html('<label>本月完成工作<span style="color: red">*</span></label>')
  459 + $('.work_conclusion').html('<label>本月工作总结<span style="color: red">*</span></label>')
418 $('.plan').show() 460 $('.plan').show()
419 - $('.work_plan').text('下月工作计划')  
420 - $('.work_help').text('需要协调与帮助') 461 + $('.work_plan').html('<label>下月工作计划<span style="color: red">*</span></label>')
  462 + $('.work_help').html('<label>需要协调与帮助<span style="color: red">*</span></label>')
421 $('.reportAlarm').hide() 463 $('.reportAlarm').hide()
422 $('.report_alarmStatic').hide() 464 $('.report_alarmStatic').hide()
423 break 465 break
@@ -10,7 +10,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -10,7 +10,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
10 10
11 exports('workReportView', function () { 11 exports('workReportView', function () {
12 var sessions = layui.sessions; 12 var sessions = layui.sessions;
13 - var accessToken = sessions.getToken().access_token; 13 + var accessToken = common.getMjToken();
14 var domainName = common.domainName; 14 var domainName = common.domainName;
15 var companyChart = echarts.init(document.getElementById('chart-company-report')); 15 var companyChart = echarts.init(document.getElementById('chart-company-report'));
16 var noReadChart = echarts.init(document.getElementById('chart-noRead-report')); 16 var noReadChart = echarts.init(document.getElementById('chart-noRead-report'));
@@ -184,7 +184,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -184,7 +184,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
184 elem: '#table-workreport-view', 184 elem: '#table-workreport-view',
185 url: domainName + '/api-web/workreport/page', 185 url: domainName + '/api-web/workreport/page',
186 where: conditions, 186 where: conditions,
187 - height: 'full-180', 187 + height: 'full-400',
188 page: { 188 page: {
189 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'], 189 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
190 theme: '#1E9FFF' 190 theme: '#1E9FFF'
@@ -327,10 +327,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -327,10 +327,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
327 327
328 }); 328 });
329 $.ajax({ 329 $.ajax({
330 - url: domainName + '/api-user/users/getAll',  
331 - data: {  
332 - access_token: accessToken  
333 - }, 330 + url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
334 success: function (response) { 331 success: function (response) {
335 var options = "<option value=''>=选择汇报人=</option>"; 332 var options = "<option value=''>=选择汇报人=</option>";
336 $.each(response, function (i, v) { 333 $.each(response, function (i, v) {
@@ -928,7 +925,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -928,7 +925,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
928 //未读统计报表导出 925 //未读统计报表导出
929 $('#notReportExportBtn').unbind().on('click', function () { 926 $('#notReportExportBtn').unbind().on('click', function () {
930 var conditions = form.val('form-workreport-condition'); 927 var conditions = form.val('form-workreport-condition');
931 - var url = common.domainName + '/api-web/workreport/group/exportReportDetails?access_token=' + accessToken + '&createTime=' + createTime + '&viewMode=' + 'true' + '&dateLimit=' + dateLimit + '&repType=' + conditions.repType + '&createBy=' + conditions.createBy; 928 + var url = common.domainName + '/api-web/workreport/group/exportReportDetails?accessToken=' + accessToken + '&createTime=' + createTime + '&viewMode=' + 'true' + '&dateLimit=' + dateLimit + '&repType=' + conditions.repType + '&createBy=' + conditions.createBy;
932 window.open(url) 929 window.open(url)
933 }) 930 })
934 931
@@ -19,9 +19,9 @@ @@ -19,9 +19,9 @@
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">日期</label> 22 + <label class="layui-form-label">日期<span style="color: red">*</span></label>
23 <div class="layui-input-inline"> 23 <div class="layui-input-inline">
24 - <input class="layui-input" id="createTime" name="createTime" type="text"> 24 + <input class="layui-input" lay-verify="required" id="createTime" name="createTime" type="text">
25 </div> 25 </div>
26 </div> 26 </div>
27 </div> 27 </div>
@@ -121,13 +121,13 @@ @@ -121,13 +121,13 @@
121 121
122 <style> 122 <style>
123 #add-workReport-form .layui-form-label { 123 #add-workReport-form .layui-form-label {
124 - width: 120px; 124 + width: 130px;
125 /* padding: 8px 12px; */ 125 /* padding: 8px 12px; */
126 text-align: left !important; 126 text-align: left !important;
127 } 127 }
128 128
129 #add-workReport-form .layui-input-block { 129 #add-workReport-form .layui-input-block {
130 - margin-left: 120px !important; 130 + margin-left: 130px !important;
131 } 131 }
132 132
133 .tags { 133 .tags {
1 -<title>工作汇报</title> 1 +<title>工作日志</title>
2 <style type="text/css"> 2 <style type="text/css">
3 .layui-card-header .layui-icon { 3 .layui-card-header .layui-icon {
4 position: relative; 4 position: relative;