|
|
@@ -205,11 +205,12 @@
|
|
205
|
205
|
|
|
206
|
206
|
//工厂投诉比，各质量问题占比，结构占比
|
|
207
|
207
|
var factoryLen = content.factory.length;
|
|
|
208
|
+ var cyclesNum = content.problem.length + content.product.length;
|
|
208
|
209
|
var factoryLenHalfCeil = Math.ceil(factoryLen / 2) ;
|
|
209
|
|
- for (var i=0,num=0,p=0; i < factoryLen; i+=2, num++){
|
|
|
210
|
+ for (var i=0,num=0,p=0; num < cyclesNum; i+=2, num++){
|
|
210
|
211
|
if (i === 0) {
|
|
211
|
212
|
$(".table").append('<tr>'+
|
|
212
|
|
- '<td rowspan="'+ factoryLenHalfCeil + '">工厂投诉占比</td>'+
|
|
|
213
|
+ '<td rowspan="'+ cyclesNum + '">工厂投诉占比</td>'+
|
|
213
|
214
|
'<td>' + content.factory[i].name + '</td>'+
|
|
214
|
215
|
'<td>' + content.factory[i].number + '</td>'+
|
|
215
|
216
|
'<td>' + content.factory[i].proportion + '</td>'+
|
|
|
@@ -221,7 +222,7 @@
|
|
221
|
222
|
'<td>' + content.problem[num].number + '</td>'+
|
|
222
|
223
|
'<td>' + content.problem[num].proportion + '</td>'+
|
|
223
|
224
|
'</tr>')
|
|
224
|
|
- } else if (i > 0) {
|
|
|
225
|
+ } else if (i > 0 && i < factoryLen) {
|
|
225
|
226
|
if (num < content.problem.length){
|
|
226
|
227
|
$(".table").append('<tr>'+
|
|
227
|
228
|
'<td>' + content.factory[i].name +'</td>'+
|
|
|
@@ -263,6 +264,48 @@
|
|
263
|
264
|
}
|
|
264
|
265
|
p += 1;
|
|
265
|
266
|
}
|
|
|
267
|
+ } else if ( i >= factoryLen) {
|
|
|
268
|
+ if (num < content.problem.length){
|
|
|
269
|
+ $(".table").append('<tr>'+
|
|
|
270
|
+ '<td></td>'+
|
|
|
271
|
+ '<td></td>'+
|
|
|
272
|
+ '<td></td>'+
|
|
|
273
|
+ '<td></td>'+
|
|
|
274
|
+ '<td></td>'+
|
|
|
275
|
+ '<td></td>'+
|
|
|
276
|
+ '<td colspan="2">' + content.problem[num].name + '</td>'+
|
|
|
277
|
+ '<td>' + content.problem[num].number + '</td>'+
|
|
|
278
|
+ '<td>' + content.problem[num].proportion + '</td>'+
|
|
|
279
|
+ '</tr>')
|
|
|
280
|
+ } else if (num >= content.problem.length) {
|
|
|
281
|
+ if(p === 0){
|
|
|
282
|
+ $(".table").append('<tr>'+
|
|
|
283
|
+ '<td></td>'+
|
|
|
284
|
+ '<td></td>'+
|
|
|
285
|
+ '<td></td>'+
|
|
|
286
|
+ '<td></td>'+
|
|
|
287
|
+ '<td></td>'+
|
|
|
288
|
+ '<td></td>'+
|
|
|
289
|
+ '<td rowspan="'+ content.product.length + '">结构占比</td>'+
|
|
|
290
|
+ '<td colspan="2">' + content.product[p].name + '</td>'+
|
|
|
291
|
+ '<td>' + content.product[p].number + '</td>'+
|
|
|
292
|
+ '<td>' + content.product[p].proportion + '</td>'+
|
|
|
293
|
+ '</tr>')
|
|
|
294
|
+ } else if (0 < p && p < content.product.length) {
|
|
|
295
|
+ $(".table").append('<tr>'+
|
|
|
296
|
+ '<td></td>'+
|
|
|
297
|
+ '<td></td>'+
|
|
|
298
|
+ '<td></td>'+
|
|
|
299
|
+ '<td></td>'+
|
|
|
300
|
+ '<td></td>'+
|
|
|
301
|
+ '<td></td>'+
|
|
|
302
|
+ '<td colspan="2">' + content.product[p].name + '</td>'+
|
|
|
303
|
+ '<td>' + content.product[p].number + '</td>'+
|
|
|
304
|
+ '<td>' + content.product[p].proportion + '</td>'+
|
|
|
305
|
+ '</tr>')
|
|
|
306
|
+ }
|
|
|
307
|
+ p += 1;
|
|
|
308
|
+ }
|
|
266
|
309
|
}
|
|
267
|
310
|
}
|
|
268
|
311
|
} else {
|
