Authored by 王涛

工作日志右上角柱状图,执行成功,有没有数据都隐藏加载图标

@@ -193,7 +193,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -193,7 +193,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
193 }, { 193 }, {
194 type: 'numbers', title: '序号' 194 type: 'numbers', title: '序号'
195 }, { 195 }, {
196 - field: 'repType', title: '汇报类型', align: 'center', 196 + field: 'repType', title: '汇报类型', align: 'center',
197 templet: function (d) { 197 templet: function (d) {
198 var typeName = '' 198 var typeName = ''
199 switch (d.repType) { 199 switch (d.repType) {
@@ -213,7 +213,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -213,7 +213,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
213 field: 'repTitle', title: '标题', align: 'center', minWidth: 200,event: 'serRead', 213 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>' 214 templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>'
215 }, { 215 }, {
216 - field: 'attachmentList', title: '附件数量', align: 'center', 216 + field: 'attachmentList', title: '附件数量', align: 'center',
217 templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-workReport-attachment">{{d.attachmentList.length}}</span></div>' 217 templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-workReport-attachment">{{d.attachmentList.length}}</span></div>'
218 }, { 218 }, {
219 field: 'currIsRead', title: '状态', align: 'center', 219 field: 'currIsRead', title: '状态', align: 'center',
@@ -253,11 +253,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -253,11 +253,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
253 return userName.toString(); 253 return userName.toString();
254 } 254 }
255 }, { 255 }, {
256 - field: 'createUserNickName', title: '上报人', align: 'center', 256 + field: 'createUserNickName', title: '上报人', align: 'center',
257 }, { 257 }, {
258 - field: 'manufacturerName', title: '厂商', align: 'center', 258 + field: 'manufacturerName', title: '厂商', align: 'center',
259 }, { 259 }, {
260 - field: 'createTime', title: '上报时间', align: 'center', 260 + field: 'createTime', title: '上报时间', align: 'center',
261 }]], 261 }]],
262 done: function () { 262 done: function () {
263 //获取附件列表 263 //获取附件列表
@@ -739,6 +739,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -739,6 +739,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
739 admin.req({ 739 admin.req({
740 url: url 740 url: url
741 }).done(function (response) { 741 }).done(function (response) {
  742 + // 执行成功,有没有数据都隐藏加载图标
  743 + echartObject.hideLoading();
742 if (response && response.map) { 744 if (response && response.map) {
743 xData = response.map.userList; 745 xData = response.map.userList;
744 yData = response.map.valueList; 746 yData = response.map.valueList;
@@ -823,7 +825,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -823,7 +825,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
823 }], 825 }],
824 series: series 826 series: series
825 } 827 }
826 - echartObject.hideLoading();  
827 echartObject.setOption(option) 828 echartObject.setOption(option)
828 } 829 }
829 }) 830 })
@@ -1001,7 +1002,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -1001,7 +1002,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
1001 readChart.setOption(option); 1002 readChart.setOption(option);
1002 }); 1003 });
1003 } 1004 }
1004 - 1005 +
1005 function setRead(workReportIds) { 1006 function setRead(workReportIds) {
1006 if (workReportIds.length == 0) { 1007 if (workReportIds.length == 0) {
1007 layer.msg('请至少选择一项未读的数据。', {icon: 0, time: 3000}); 1008 layer.msg('请至少选择一项未读的数据。', {icon: 0, time: 3000});
@@ -1055,4 +1056,4 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate @@ -1055,4 +1056,4 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
1055 // loadReportableChart(); 1056 // loadReportableChart();
1056 } 1057 }
1057 }); 1058 });
1058 -});  
  1059 +});