页面调整

@@ -28,7 +28,7 @@
     limit 1
   </select>
   <select id="selectByConditions" resultType="com.yoho.service.model.union.response.UnionInvalidLogsBO" >
-    select id, union_name as unionName, sum(invalid_num_ios) as invalidNumIos, hour, date, sum(invalid_num_android) as invalidNumAndroid
+    select id,union_type as unionType, union_name as unionName, sum(invalid_num_ios) as invalidNumIos, hour, date, sum(invalid_num_android) as invalidNumAndroid
     from union_invalid_logs
     where 1=1
     <if test="startDate!=null">

@@ -466,6 +466,7 @@
                     unionName: '<span class="subtotal"></span>',
                     totalCount: '<span class="subtotal">' + compute("totalCount") + '</span>',
                     idfaCount: '<span class="subtotal">' + compute("idfaCount") + '</span>',
+                    invalidTotalCount: '<span class="subtotal">' + compute("invalidTotalCount") + '</span>',
                     idfaClick: '<span class="subtotal">0</span>',
                     imeiCount: '<span class="subtotal">' + compute("imeiCount") + '</span>',
                     imeiClick: '<span class="subtotal"></span>'
@@ -476,6 +477,7 @@
                     unionName: '',
                     totalCount:'<span class="subtotal">' + data.naturalTotalCount+ '</span>',
                     idfaCount: '<span class="subtotal">' + data.naturalIdfaCount+ '</span>',
+                    invalidTotalCount: '<span class="subtotal"></span>',
                     idfaClick: '0',
                     imeiCount: '<span class="subtotal">' + data.naturalImeiCount+ '</span>',
                     imeiClick: '<span class="subtotal"></span>'

@@ -21,12 +21,12 @@
                 width: 100,
                 align: "center"
             }, {
-                title: "ios激活数",
+                title: "ios无效激活数",
                 field: "invalidNumIos",
                 width: 180,
                 align: "center"
             }, {
-                title: "安卓激活数",
+                title: "安卓无效激活数",
                 field: "invalidNumAndroid",
                 width: 120,
                 align: "center"