YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by mingdan.ge
Commit 3bfe31d950f65187301b4315e0204feb65a893aa 1 parent 3a8aa164

页面调整

Inline Side-by-side
Showing 3 changed files with 5 additions and 3 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 limit 1 28 limit 1
29 </select> 29 </select>
30 <select id="selectByConditions" resultType="com.yoho.service.model.union.response.UnionInvalidLogsBO" > 30 <select id="selectByConditions" resultType="com.yoho.service.model.union.response.UnionInvalidLogsBO" >
31 - select id, union_name as unionName, sum(invalid_num_ios) as invalidNumIos, hour, date, sum(invalid_num_android) as invalidNumAndroid 31 + select id,union_type as unionType, union_name as unionName, sum(invalid_num_ios) as invalidNumIos, hour, date, sum(invalid_num_android) as invalidNumAndroid
32 from union_invalid_logs 32 from union_invalid_logs
33 where 1=1 33 where 1=1
34 <if test="startDate!=null"> 34 <if test="startDate!=null">
@@ -466,6 +466,7 @@ @@ -466,6 +466,7 @@
466 unionName: '<span class="subtotal"></span>', 466 unionName: '<span class="subtotal"></span>',
467 totalCount: '<span class="subtotal">' + compute("totalCount") + '</span>', 467 totalCount: '<span class="subtotal">' + compute("totalCount") + '</span>',
468 idfaCount: '<span class="subtotal">' + compute("idfaCount") + '</span>', 468 idfaCount: '<span class="subtotal">' + compute("idfaCount") + '</span>',
  469 + invalidTotalCount: '<span class="subtotal">' + compute("invalidTotalCount") + '</span>',
469 idfaClick: '<span class="subtotal">0</span>', 470 idfaClick: '<span class="subtotal">0</span>',
470 imeiCount: '<span class="subtotal">' + compute("imeiCount") + '</span>', 471 imeiCount: '<span class="subtotal">' + compute("imeiCount") + '</span>',
471 imeiClick: '<span class="subtotal"></span>' 472 imeiClick: '<span class="subtotal"></span>'
@@ -476,6 +477,7 @@ @@ -476,6 +477,7 @@
476 unionName: '', 477 unionName: '',
477 totalCount:'<span class="subtotal">' + data.naturalTotalCount+ '</span>', 478 totalCount:'<span class="subtotal">' + data.naturalTotalCount+ '</span>',
478 idfaCount: '<span class="subtotal">' + data.naturalIdfaCount+ '</span>', 479 idfaCount: '<span class="subtotal">' + data.naturalIdfaCount+ '</span>',
  480 + invalidTotalCount: '<span class="subtotal"></span>',
479 idfaClick: '0', 481 idfaClick: '0',
480 imeiCount: '<span class="subtotal">' + data.naturalImeiCount+ '</span>', 482 imeiCount: '<span class="subtotal">' + data.naturalImeiCount+ '</span>',
481 imeiClick: '<span class="subtotal"></span>' 483 imeiClick: '<span class="subtotal"></span>'
@@ -21,12 +21,12 @@ @@ -21,12 +21,12 @@
21 width: 100, 21 width: 100,
22 align: "center" 22 align: "center"
23 }, { 23 }, {
24 - title: "ios激活数", 24 + title: "ios无效激活数",
25 field: "invalidNumIos", 25 field: "invalidNumIos",
26 width: 180, 26 width: 180,
27 align: "center" 27 align: "center"
28 }, { 28 }, {
29 - title: "安卓激活数", 29 + title: "安卓无效激活数",
30 field: "invalidNumAndroid", 30 field: "invalidNumAndroid",
31 width: 120, 31 width: 120,
32 align: "center" 32 align: "center"