monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d0eea80745149185dbe7ba950070ae48efe22546 2 parents 2c4fe8c7 e83186a8

Merge branch 'master-500-dev-yuanjp' into 'master-500-dev' 

资产维修和工作日志查看的问题解决



See merge request !458
Inline Side-by-side
Showing 8 changed files with 148 additions and 107 deletions
@@ -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 }, 178 },
179 allDone: function (obj) { 179 allDone: function (obj) {
180 //全部上传成功后 180 //全部上传成功后
181 - //saveForm() 181 + saveForm()
182 }, 182 },
183 error: function (index, upload) { 183 error: function (index, upload) {
184 // 上传失败 184 // 上传失败
@@ -192,13 +192,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -192,13 +192,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
192 192
193 // 初始化查看模式 193 // 初始化查看模式
194 function initViewMode() { 194 function initViewMode() {
195 - $('form[lay-filter="add-workReport-form"]').find('input, textarea').attr('readonly', true);  
196 - $('form[lay-filter="add-workReport-form"]').find('select').attr('disabled', true); 195 + $('form[lay-filter="add-repair-form"]').find('input, textarea').attr('readonly', true);
  196 + $('form[lay-filter="add-repair-form"]').find('select').attr('disabled', true);
197 $.each(xmSelect.get(), function (i, v) { 197 $.each(xmSelect.get(), function (i, v) {
198 v.update({disabled: true}); 198 v.update({disabled: true});
199 }); 199 });
200 $('#attachmentInput').parent().parent().parent().addClass('hide'); 200 $('#attachmentInput').parent().parent().parent().addClass('hide');
201 - $('#table-report-add-attachment').removeClass('hide'); 201 + $('#table-repair-add-attachment').removeClass('hide');
202 $('#form-item-repTitle').removeClass('hide'); 202 $('#form-item-repTitle').removeClass('hide');
203 //渲染附件表格 203 //渲染附件表格
204 var attachmentTable = table.render({ 204 var attachmentTable = table.render({
@@ -33,6 +33,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect'] @@ -33,6 +33,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect']
33 33
34 //保存 34 //保存
35 form.on('submit(config-form-save-id)',function () { 35 form.on('submit(config-form-save-id)',function () {
  36 + layer.load(3);
  37 + $("#config-form-save-id").attr("disabled","disabled");
36 var data = form.val('add-config-form') 38 var data = form.val('add-config-form')
37 delete data['select'] 39 delete data['select']
38 data.admin = adminSelect.getValue('valueStr') 40 data.admin = adminSelect.getValue('valueStr')
@@ -58,9 +60,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect'] @@ -58,9 +60,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect']
58 name: '', 60 name: '',
59 userName: '', 61 userName: '',
60 }) 62 })
  63 + $("#config-form-save-id").removeAttr("disabled");
61 initGroupSelect() 64 initGroupSelect()
62 }) 65 })
63 } else { 66 } else {
  67 + $("#config-form-save-id").removeAttr("disabled");
64 layer.msg(res.msg,{ 68 layer.msg(res.msg,{
65 offset: '15px', 69 offset: '15px',
66 icon: 7, 70 icon: 7,
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
12 var sessions = layui.sessions; 12 var sessions = layui.sessions;
13 var accessToken = sessions.getToken().access_token; 13 var accessToken = sessions.getToken().access_token;
14 var domainName = common.domainName; 14 var domainName = common.domainName;
15 - var companyChart = echarts.init(document.getElementById('chart-company-report')); 15 + var orgChart = echarts.init(document.getElementById('chart-org-report'));
16 var adjustTypeChart = echarts.init(document.getElementById('chart-adjustType-report')); 16 var adjustTypeChart = echarts.init(document.getElementById('chart-adjustType-report'));
17 var dateLimit = ""; 17 var dateLimit = "";
18 var createTime = ""; 18 var createTime = "";
@@ -425,7 +425,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -425,7 +425,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
425 }], 425 }],
426 series: series 426 series: series
427 }; 427 };
428 - companyChart.setOption(option) 428 + orgChart.setOption(option)
429 }); 429 });
430 } 430 }
431 431
@@ -34,16 +34,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess @@ -34,16 +34,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
34 form.on('submit(routeAdjust-form-save-id)', function (res) { 34 form.on('submit(routeAdjust-form-save-id)', function (res) {
35 var value = $('#attachmentInput').val(); 35 var value = $('#attachmentInput').val();
36 var adjustArr = adjustBak; 36 var adjustArr = adjustBak;
37 - if (value != '') {  
38 - $('#upload_btn').click();  
39 - } 37 +
40 if (adjustArr.length == 0) { 38 if (adjustArr.length == 0) {
41 layer.msg("请先添加线路详细信息"); 39 layer.msg("请先添加线路详细信息");
42 return; 40 return;
43 } else { 41 } else {
44 - saveForm() 42 + if (value != '') {
  43 + $('#upload_btn').click();
  44 + }else {
  45 + saveForm()
  46 + }
45 } 47 }
46 48
  49 +
47 }) 50 })
48 51
49 //保存 52 //保存
@@ -87,7 +90,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess @@ -87,7 +90,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
87 } 90 }
88 } 91 }
89 }) 92 })
90 - return false 93 + return false;
91 } 94 }
92 95
93 $("#routeAdjustDetail_create").on("click", function () { 96 $("#routeAdjustDetail_create").on("click", function () {
@@ -245,6 +248,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess @@ -245,6 +248,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
245 }, 248 },
246 allDone: function (obj) { 249 allDone: function (obj) {
247 //全部上传成功后 250 //全部上传成功后
  251 + saveForm();
248 }, 252 },
249 error: function (index, upload) { 253 error: function (index, upload) {
250 // 上传失败 254 // 上传失败
@@ -40,6 +40,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -40,6 +40,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
40 40
41 //保存 41 //保存
42 form.on('submit(workReport-form-save-id)', function (res) { 42 form.on('submit(workReport-form-save-id)', function (res) {
  43 + $("#workReport-form-save-id").attr("disabled","disabled");
43 var value = $('#attachmentInput').val() 44 var value = $('#attachmentInput').val()
44 if (value != '') { 45 if (value != '') {
45 $('#upload_btn').click() 46 $('#upload_btn').click()
@@ -83,7 +84,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -83,7 +84,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
83 layer.load(2) 84 layer.load(2)
84 var data = form.val('add-workReport-form') 85 var data = form.val('add-workReport-form')
85 var params = {} 86 var params = {}
86 -  
87 params.user = data.select 87 params.user = data.select
88 params.attachmentIds = attachmentIds.toString() 88 params.attachmentIds = attachmentIds.toString()
89 delete data['file'] 89 delete data['file']
@@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
111 createTime: '' 111 createTime: ''
112 }, 112 },
113 }); 113 });
  114 + $("#workReport-form-save-id").removeAttr("disabled");
114 }) 115 })
115 } else { 116 } else {
  117 + $("#workReport-form-save-id").removeAttr("disabled");
116 layer.msg(res.msg, { 118 layer.msg(res.msg, {
117 offset: '15px', 119 offset: '15px',
118 icon: 7, 120 icon: 7,
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
12 //对外暴露的接口 12 //对外暴露的接口
13 exports("workReportIndex", function () { 13 exports("workReportIndex", function () {
14 var accessToken = session.getToken()['access_token'] 14 var accessToken = session.getToken()['access_token']
15 - var createTime = '' 15 + var createTime = 'today'
16 var isRead = '' 16 var isRead = ''
17 var repType = '' 17 var repType = ''
18 18
1 /** 工作汇报查看 */ 1 /** 工作汇报查看 */
2 -layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate','element'], function (exports) { 2 +layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydate', 'element'], function (exports) {
3 var $ = layui.$; 3 var $ = layui.$;
4 var form = layui.form; 4 var form = layui.form;
5 var table = layui.table; 5 var table = layui.table;
@@ -15,48 +15,45 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -15,48 +15,45 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
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'));
17 var dateLimit = "" 17 var dateLimit = ""
18 - var createTime = "" 18 + var createTime = "today"
19 var type = '' 19 var type = ''
20 var urlRepType = '' 20 var urlRepType = ''
21 var manufacturerId = '' 21 var manufacturerId = ''
22 var reportDetailTable; 22 var reportDetailTable;
23 getUrlType() 23 getUrlType()
24 24
25 - if (type != '1') {  
26 - createTime = 'thisWeek';  
27 - } else {  
28 - $.each($("button.date"),function (i,e) {  
29 - var $dom = $(e);  
30 - if($dom.hasClass("active")){  
31 - $dom.removeClass("active")  
32 - }  
33 - })  
34 - $.each($("button.isRead"),function (i,e) {  
35 - var $dom = $(e);  
36 - if($dom.data("type") == '0'){  
37 - $dom.addClass("active")  
38 - }  
39 - })  
40 - $.each($('input[name="repType"]'),function (i,e) {  
41 - var $dom = $(e);  
42 - if($dom.val() == urlRepType){  
43 - $dom.attr('checked','checked');  
44 - }  
45 - })  
46 - } 25 + $.each($("button.date"), function (i, e) {
  26 + var $dom = $(e);
  27 + if ($dom.hasClass("active")) {
  28 + $dom.removeClass("active")
  29 + }
  30 + })
  31 + $.each($("button.isRead"), function (i, e) {
  32 + var $dom = $(e);
  33 + if ($dom.data("type") == '0') {
  34 + $dom.addClass("active")
  35 + }
  36 + })
  37 + $.each($('input[name="repType"]'), function (i, e) {
  38 + var $dom = $(e);
  39 + if ($dom.val() == urlRepType) {
  40 + $dom.attr('checked', 'checked');
  41 + }
  42 + })
  43 +
47 44
48 //日期范围选择 45 //日期范围选择
49 laydate.render({ 46 laydate.render({
50 elem: '#dateLimit' 47 elem: '#dateLimit'
51 - ,range: '~', 48 + , range: '~',
52 done: function (value) { 49 done: function (value) {
53 dateLimit = value 50 dateLimit = value
54 if (dateLimit == '') { 51 if (dateLimit == '') {
55 - $('[data-period="thisWeek"]').click() 52 + $('[data-period="today"]').click()
56 } else { 53 } else {
57 - $.each($("button.date"),function (i,e) { 54 + $.each($("button.date"), function (i, e) {
58 var $dom = $(e); 55 var $dom = $(e);
59 - if($dom.hasClass("active")){ 56 + if ($dom.hasClass("active")) {
60 $dom.removeClass("active") 57 $dom.removeClass("active")
61 } 58 }
62 }) 59 })
@@ -66,43 +63,43 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -66,43 +63,43 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
66 }); 63 });
67 64
68 form.render(); 65 form.render();
69 - // loadDailyChart();  
70 - // loadReportableChart(); 66 + // loadDailyChart();
  67 + // loadReportableChart();
71 loadCompanyReport(); 68 loadCompanyReport();
72 loadReadReport(); 69 loadReadReport();
73 loadWorkReportTable(); 70 loadWorkReportTable();
74 loadConditionSelect(); 71 loadConditionSelect();
75 var url = domainName + '/api-web/workreport/chart/noRead'; 72 var url = domainName + '/api-web/workreport/chart/noRead';
76 - loadNoReadChart(noReadChart,url,'未读'); 73 + loadNoReadChart(noReadChart, url, '未读');
77 74
78 // tab页切换事件 75 // tab页切换事件
79 element.on('tab(report-tab)', function (data) { 76 element.on('tab(report-tab)', function (data) {
80 - var name = '';  
81 - if (data.index == 0) {  
82 - url = domainName + '/api-web/workreport/chart/noRead'  
83 - name = '未读';  
84 - loadNoReadChart(noReadChart,url,name);  
85 - } else if (data.index == 1) {  
86 - url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit;  
87 - name = '未报';  
88 - var noReportChat = echarts.init(document.getElementById('chart-noReport-report'));  
89 - loadNoReadChart(noReportChat,url,name);  
90 - } else if (data.index == 2) {  
91 - url = domainName + '/api-web/workreport/chart/noHandlingAlarmsChart'  
92 - name = '未处理';  
93 - var noAlarmChart = echarts.init(document.getElementById('chart-noAlarm-report'));  
94 - loadNoReadChart(noAlarmChart,url,name);  
95 - } 77 + var name = '';
  78 + if (data.index == 0) {
  79 + url = domainName + '/api-web/workreport/chart/noRead'
  80 + name = '未读';
  81 + loadNoReadChart(noReadChart, url, name);
  82 + } else if (data.index == 1) {
  83 + url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit;
  84 + name = '未报';
  85 + var noReportChat = echarts.init(document.getElementById('chart-noReport-report'));
  86 + loadNoReadChart(noReportChat, url, name);
  87 + } else if (data.index == 2) {
  88 + url = domainName + '/api-web/workreport/chart/noHandlingAlarmsChart'
  89 + name = '未处理';
  90 + var noAlarmChart = echarts.init(document.getElementById('chart-noAlarm-report'));
  91 + loadNoReadChart(noAlarmChart, url, name);
  92 + }
96 }); 93 });
97 94
98 //监听Esc事件 95 //监听Esc事件
99 - $(document).keyup(function(event){  
100 - if(event.keyCode === 27 || event.keyCode === 96){ 96 + $(document).keyup(function (event) {
  97 + if (event.keyCode === 27 || event.keyCode === 96) {
101 layer.closeAll(); 98 layer.closeAll();
102 } 99 }
103 }); 100 });
104 101
105 - $("button.isRead").unbind().on("click",function () { 102 + $("button.isRead").unbind().on("click", function () {
106 var $dom = $(this); 103 var $dom = $(this);
107 $("button.isRead").removeClass("active") 104 $("button.isRead").removeClass("active")
108 $dom.addClass("active") 105 $dom.addClass("active")
@@ -111,9 +108,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -111,9 +108,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
111 108
112 // 日期方式选择 109 // 日期方式选择
113 $('#btns-workreport-time button').click(function () { 110 $('#btns-workreport-time button').click(function () {
114 - $.each($("button.date"),function (i,e) { 111 + $.each($("button.date"), function (i, e) {
115 var $dom = $(e); 112 var $dom = $(e);
116 - if($dom.hasClass("active")){ 113 + if ($dom.hasClass("active")) {
117 $dom.removeClass("active") 114 $dom.removeClass("active")
118 } 115 }
119 }) 116 })
@@ -163,16 +160,21 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -163,16 +160,21 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
163 // 加载工作汇报表格 160 // 加载工作汇报表格
164 function loadWorkReportTable() { 161 function loadWorkReportTable() {
165 var conditions = form.val('form-workreport-condition'); 162 var conditions = form.val('form-workreport-condition');
166 - $.each($("button.isRead"),function (i,e) { 163 + $.each($("button.isRead"), function (i, e) {
167 var $dom = $(e); 164 var $dom = $(e);
168 - if($dom.hasClass("active")){ 165 + if ($dom.hasClass("active")) {
169 conditions["currIsRead"] = $dom.data("type") 166 conditions["currIsRead"] = $dom.data("type")
170 } 167 }
171 }) 168 })
172 - if(manufacturerId!=''){ 169 + if (manufacturerId != '') {
173 conditions.manufacturerName = manufacturerId; 170 conditions.manufacturerName = manufacturerId;
174 } 171 }
175 - Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit}); 172 + Object.assign(conditions, {
  173 + access_token: accessToken,
  174 + createTime: createTime,
  175 + viewMode: 'true',
  176 + dateLimit: dateLimit
  177 + });
176 table.render({ 178 table.render({
177 elem: '#table-workreport-view', 179 elem: '#table-workreport-view',
178 url: domainName + '/api-web/workreport/page', 180 url: domainName + '/api-web/workreport/page',
@@ -210,7 +212,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -210,7 +212,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
210 return typeName 212 return typeName
211 } 213 }
212 }, { 214 }, {
213 - field: 'repTitle', title: '标题', align: 'center', minWidth: 200,event: 'serRead', 215 + field: 'repTitle', title: '标题', align: 'center', minWidth: 200, event: 'serRead',
214 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>' 216 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>'
215 }, { 217 }, {
216 field: 'attachmentList', title: '附件数量', align: 'center', 218 field: 'attachmentList', title: '附件数量', align: 'center',
@@ -225,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -225,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
225 } 227 }
226 } 228 }
227 }, { 229 }, {
228 - field: 'reportUserList', title: '未读人员', align: 'center',minWidth:'200', 230 + field: 'reportUserList', title: '未读人员', align: 'center', minWidth: '200',
229 templet: function (d) { 231 templet: function (d) {
230 var userName = []; 232 var userName = [];
231 $.each(d.reportUserList, function (i, v) { 233 $.each(d.reportUserList, function (i, v) {
@@ -233,13 +235,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -233,13 +235,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
233 userName.push(v.nickName) 235 userName.push(v.nickName)
234 } 236 }
235 }); 237 });
236 - if(userName.length === 0){ 238 + if (userName.length === 0) {
237 userName = ['无'] 239 userName = ['无']
238 } 240 }
239 return userName.toString(); 241 return userName.toString();
240 } 242 }
241 }, { 243 }, {
242 - field: 'reportUserList', title: '已读人员', align: 'center',minWidth:'200', 244 + field: 'reportUserList', title: '已读人员', align: 'center', minWidth: '200',
243 templet: function (d) { 245 templet: function (d) {
244 var userName = []; 246 var userName = [];
245 $.each(d.reportUserList, function (i, v) { 247 $.each(d.reportUserList, function (i, v) {
@@ -247,7 +249,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -247,7 +249,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
247 userName.push(v.nickName) 249 userName.push(v.nickName)
248 } 250 }
249 }); 251 });
250 - if(userName.length === 0){ 252 + if (userName.length === 0) {
251 userName = ['无'] 253 userName = ['无']
252 } 254 }
253 return userName.toString(); 255 return userName.toString();
@@ -262,16 +264,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -262,16 +264,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
262 done: function () { 264 done: function () {
263 //获取附件列表 265 //获取附件列表
264 $('.view-workReport-attachment').on('click', function () { 266 $('.view-workReport-attachment').on('click', function () {
265 - common.openWin('workreport/list', '附件', {id: $(this).data('id'), type: 'attachment'}, ['确定', '取消']); 267 + common.openWin('workreport/list', '附件', {
  268 + id: $(this).data('id'),
  269 + type: 'attachment'
  270 + }, ['确定', '取消']);
266 }); 271 });
267 } 272 }
268 }); 273 });
269 } 274 }
270 275
271 //监听单元格事件 276 //监听单元格事件
272 - table.on('tool(table-workreport-view)', function(obj){ 277 + table.on('tool(table-workreport-view)', function (obj) {
273 var data = obj.data; 278 var data = obj.data;
274 - if(obj.event === 'serRead'){ 279 + if (obj.event === 'serRead') {
275 280
276 var id = data['id']; 281 var id = data['id'];
277 var repType = data['repType']; 282 var repType = data['repType'];
@@ -286,7 +291,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -286,7 +291,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
286 loadReadReport(); 291 loadReadReport();
287 } 292 }
288 }); 293 });
289 - common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view'}, ['关闭'], function f() { 294 + common.openWin('workreport/add', '查看', {
  295 + id: id,
  296 + repType: repType,
  297 + viewType: 'view'
  298 + }, ['关闭'], function f() {
290 return true; 299 return true;
291 }, null, null, { 300 }, null, null, {
292 success: function () { 301 success: function () {
@@ -306,7 +315,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -306,7 +315,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
306 options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" 315 options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
307 }); 316 });
308 $('#slt-workreport-group').html(options); 317 $('#slt-workreport-group').html(options);
309 - if(manufacturerId!=''){ 318 + if (manufacturerId != '') {
310 $('#slt-workreport-group').val(manufacturerId) 319 $('#slt-workreport-group').val(manufacturerId)
311 } 320 }
312 form.render(); 321 form.render();
@@ -331,7 +340,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -331,7 +340,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
331 // 加载最近日报汇报统计图表 340 // 加载最近日报汇报统计图表
332 function loadDailyChart() { 341 function loadDailyChart() {
333 var conditions = form.val('form-workreport-condition'); 342 var conditions = form.val('form-workreport-condition');
334 - Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit}); 343 + Object.assign(conditions, {
  344 + access_token: accessToken,
  345 + createTime: createTime,
  346 + viewMode: 'true',
  347 + dateLimit: dateLimit
  348 + });
335 admin.req({ 349 admin.req({
336 url: domainName + '/api-web/workreport/chart/daily', 350 url: domainName + '/api-web/workreport/chart/daily',
337 data: conditions 351 data: conditions
@@ -411,8 +425,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -411,8 +425,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
411 }], 425 }],
412 dataZoom: [ 426 dataZoom: [
413 { 427 {
414 - type:"slider",  
415 - realtime:true, 428 + type: "slider",
  429 + realtime: true,
416 height: 25, 430 height: 25,
417 start: 5, 431 start: 5,
418 end: 55 432 end: 55
@@ -427,7 +441,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -427,7 +441,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
427 // 日报/周报/月报 应报已报统计 441 // 日报/周报/月报 应报已报统计
428 function loadReportableChart() { 442 function loadReportableChart() {
429 var conditions = form.val('form-workreport-condition'); 443 var conditions = form.val('form-workreport-condition');
430 - Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit}); 444 + Object.assign(conditions, {
  445 + access_token: accessToken,
  446 + createTime: createTime,
  447 + viewMode: 'true',
  448 + dateLimit: dateLimit
  449 + });
431 admin.req({ 450 admin.req({
432 url: domainName + '/api-web/workreport/chart/reptype', 451 url: domainName + '/api-web/workreport/chart/reptype',
433 data: conditions 452 data: conditions
@@ -514,7 +533,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -514,7 +533,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
514 // 各厂商应报已报情况 533 // 各厂商应报已报情况
515 function loadCompanyReport() { 534 function loadCompanyReport() {
516 var conditions = form.val('form-workreport-condition'); 535 var conditions = form.val('form-workreport-condition');
517 - Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: '',dateLimit:dateLimit}); 536 + Object.assign(conditions, {
  537 + access_token: accessToken,
  538 + createTime: createTime,
  539 + viewMode: '',
  540 + dateLimit: dateLimit
  541 + });
518 admin.req({ 542 admin.req({
519 url: domainName + '/api-web/workreport/chart/group', 543 url: domainName + '/api-web/workreport/chart/group',
520 data: conditions 544 data: conditions
@@ -544,8 +568,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -544,8 +568,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
544 textStyle: { 568 textStyle: {
545 color: '#555' 569 color: '#555'
546 }, 570 },
547 - formatter:function (data) {  
548 - return reportedList[data.dataIndex] +'/'+ data.value 571 + formatter: function (data) {
  572 + return reportedList[data.dataIndex] + '/' + data.value
549 } 573 }
550 }, 574 },
551 itemStyle: { 575 itemStyle: {
@@ -645,8 +669,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -645,8 +669,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
645 axisLabel: { 669 axisLabel: {
646 color: '#333', 670 color: '#333',
647 show: true, 671 show: true,
648 - interval:0,  
649 - rotate:25 672 + interval: 0,
  673 + rotate: 25
650 }, 674 },
651 axisLine: { 675 axisLine: {
652 lineStyle: { 676 lineStyle: {
@@ -707,8 +731,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -707,8 +731,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
707 series: series, 731 series: series,
708 dataZoom: [ 732 dataZoom: [
709 { 733 {
710 - type:"slider",  
711 - realtime:true, 734 + type: "slider",
  735 + realtime: true,
712 height: 25, 736 height: 25,
713 start: 5, 737 start: 5,
714 end: 55 738 end: 55
@@ -721,12 +745,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -721,12 +745,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
721 } 745 }
722 746
723 //点击弹出详情 747 //点击弹出详情
724 - companyChart.on('click',function (params) { 748 + companyChart.on('click', function (params) {
725 reportDetails(params.name) 749 reportDetails(params.name)
726 }) 750 })
727 751
728 //未读人员 752 //未读人员
729 - function loadNoReadChart(echartObject,url,name) { 753 + function loadNoReadChart(echartObject, url, name) {
730 var xData = "" 754 var xData = ""
731 var yData = "" 755 var yData = ""
732 echartObject.showLoading({ 756 echartObject.showLoading({
@@ -785,9 +809,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -785,9 +809,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
785 axisLabel: { 809 axisLabel: {
786 color: '#333', 810 color: '#333',
787 show: true, 811 show: true,
788 - interval:0,  
789 - rotate:19,  
790 - fontSize : 10 //更改坐标轴文字大小 812 + interval: 0,
  813 + rotate: 19,
  814 + fontSize: 10 //更改坐标轴文字大小
791 }, 815 },
792 axisLine: { 816 axisLine: {
793 lineStyle: { 817 lineStyle: {
@@ -838,7 +862,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -838,7 +862,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
838 area: ['70%', '60%'], 862 area: ['70%', '60%'],
839 content: '<div class="layui-card" style="margin-top: 30px;box-shadow:none"><div class="layui-card-body"><table id="reportDetails" lay-filter="reportDetails"></table></div></div>', 863 content: '<div class="layui-card" style="margin-top: 30px;box-shadow:none"><div class="layui-card-body"><table id="reportDetails" lay-filter="reportDetails"></table></div></div>',
840 btn: ['关闭'], 864 btn: ['关闭'],
841 - success: function(index, layero) { 865 + success: function (index, layero) {
842 reportDetailsTable(name) 866 reportDetailsTable(name)
843 }, 867 },
844 yes: function (index, layero) { 868 yes: function (index, layero) {
@@ -846,14 +870,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -846,14 +870,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
846 } 870 }
847 }); 871 });
848 } 872 }
849 - $("#notReportCountBtn").unbind().on("click",function () { 873 +
  874 + $("#notReportCountBtn").unbind().on("click", function () {
850 layer.open({ 875 layer.open({
851 title: ['汇报详细', 'font-size:18px;'], 876 title: ['汇报详细', 'font-size:18px;'],
852 type: 1, 877 type: 1,
853 area: ['70%', '60%'], 878 area: ['70%', '60%'],
854 content: '<div class="layui-card" style="margin-top: 30px;box-shadow:none"><div class="layui-card-body"><table id="reportDetails" lay-filter="reportDetails"></table></div></div>', 879 content: '<div class="layui-card" style="margin-top: 30px;box-shadow:none"><div class="layui-card-body"><table id="reportDetails" lay-filter="reportDetails"></table></div></div>',
855 btn: ['关闭'], 880 btn: ['关闭'],
856 - success: function(index, layero) { 881 + success: function (index, layero) {
857 reportDetailsTable(); 882 reportDetailsTable();
858 }, 883 },
859 yes: function (index, layero) { 884 yes: function (index, layero) {
@@ -861,6 +886,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -861,6 +886,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
861 } 886 }
862 }); 887 });
863 }) 888 })
  889 +
864 function reportDetailsTable(name) { 890 function reportDetailsTable(name) {
865 var conditions = form.val('form-workreport-condition'); 891 var conditions = form.val('form-workreport-condition');
866 if (name) conditions["name"] = name 892 if (name) conditions["name"] = name
@@ -887,15 +913,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -887,15 +913,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
887 }, { 913 }, {
888 field: 'readCount', title: '已报数量', align: 'center' 914 field: 'readCount', title: '已报数量', align: 'center'
889 }, { 915 }, {
890 - field: 'needReport', title: '未报数量', align: 'center',style:'color:red',templet:function (d) {  
891 - return d.needReport-d.readCount 916 + field: 'needReport', title: '未报数量', align: 'center', style: 'color:red', templet: function (d) {
  917 + return d.needReport - d.readCount
892 } 918 }
893 }]], 919 }]],
894 }) 920 })
895 } 921 }
896 922
897 //未读统计报表导出 923 //未读统计报表导出
898 - $('#notReportExportBtn').unbind().on('click',function () { 924 + $('#notReportExportBtn').unbind().on('click', function () {
899 var conditions = form.val('form-workreport-condition'); 925 var conditions = form.val('form-workreport-condition');
900 var url = common.domainName + '/api-web/workreport/group/exportReportDetails?access_token=' + accessToken + '&createTime=' + createTime + '&viewMode=' + 'true' + '&dateLimit=' + dateLimit + '&repType=' + conditions.repType + '&createBy=' + conditions.createBy; 926 var url = common.domainName + '/api-web/workreport/group/exportReportDetails?access_token=' + accessToken + '&createTime=' + createTime + '&viewMode=' + 'true' + '&dateLimit=' + dateLimit + '&repType=' + conditions.repType + '&createBy=' + conditions.createBy;
901 window.open(url) 927 window.open(url)
@@ -904,7 +930,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -904,7 +930,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
904 // 已读未读报表 930 // 已读未读报表
905 function loadReadReport() { 931 function loadReadReport() {
906 var conditions = form.val('form-workreport-condition'); 932 var conditions = form.val('form-workreport-condition');
907 - Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit}); 933 + Object.assign(conditions, {
  934 + access_token: accessToken,
  935 + createTime: createTime,
  936 + viewMode: 'true',
  937 + dateLimit: dateLimit
  938 + });
908 admin.req({ 939 admin.req({
909 url: domainName + '/api-web/workreport/chart/read', 940 url: domainName + '/api-web/workreport/chart/read',
910 data: conditions 941 data: conditions
@@ -1024,7 +1055,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -1024,7 +1055,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
1024 //获取url中的type值 1055 //获取url中的type值
1025 function getUrlType() { 1056 function getUrlType() {
1026 var href = window.location.href; 1057 var href = window.location.href;
1027 - href = href.substr(href.indexOf("#"),href.length); 1058 + href = href.substr(href.indexOf("#"), href.length);
1028 var url = href.split("/"); 1059 var url = href.split("/");
1029 if (url.length <= 1) { 1060 if (url.length <= 1) {
1030 return ""; 1061 return "";
@@ -1045,15 +1076,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -1045,15 +1076,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
1045 // 图表，表格重新加载 1076 // 图表，表格重新加载
1046 function reloadAllChange() { 1077 function reloadAllChange() {
1047 loadWorkReportTable(); 1078 loadWorkReportTable();
1048 - // loadDailyChart(); 1079 + // loadDailyChart();
1049 loadCompanyReport(); 1080 loadCompanyReport();
1050 loadReadReport(); 1081 loadReadReport();
1051 var url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit; 1082 var url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit;
1052 var name = '未报'; 1083 var name = '未报';
1053 var noReportChat = echarts.init(document.getElementById('chart-noReport-report')); 1084 var noReportChat = echarts.init(document.getElementById('chart-noReport-report'));
1054 - loadNoReadChart(noReportChat,url,name); 1085 + loadNoReadChart(noReportChat, url, name);
1055 // loadNoReadChart() 1086 // loadNoReadChart()
1056 - // loadReportableChart(); 1087 + // loadReportableChart();
1057 } 1088 }
1058 }); 1089 });
1059 }); 1090 });
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <div style="display: flex" class="layui-card-echart"> 20 <div style="display: flex" class="layui-card-echart">
21 <div style="flex-grow: 3;width: 65%!important;"> 21 <div style="flex-grow: 3;width: 65%!important;">
22 <h5 class="lay-row-title">按城市A统计</h5> 22 <h5 class="lay-row-title">按城市A统计</h5>
23 - <div class="pie-chart" id="chart-company-report" style="min-height: 240px"></div> 23 + <div class="pie-chart" id="chart-org-report" style="min-height: 240px"></div>
24 </div> 24 </div>
25 <div style="flex-grow: 3;width: 35%!important;"> 25 <div style="flex-grow: 3;width: 35%!important;">
26 <h5 class="lay-row-title">按调整要求统计</h5> 26 <h5 class="lay-row-title">按调整要求统计</h5>