Skip to content

Z
zhichan
Commit 61d61b45 by 庄冰
Options

ui

parent 8cc9d65d
Showing with 41 additions and 7 deletions
gsb-marketplat-mag/app/base/service/impl/aggregation/datastatisticSve.js
...@@ -49,6 +49,14 @@ class DatastatisticService extends ServiceBase { ...@@ -49,6 +49,14 @@ class DatastatisticService extends ServiceBase {
row.customer_count = countObj.user_count; row.customer_count = countObj.user_count;
} }
} }
var zhl = 0;
if(!row["sub_count"] || row["sub_count"]==0 || !row["uv"] ||row["uv"]==0){
zhl = 0;
}else{
zhl = Number(row["sub_count"]) / Number(row["uv"])*100;
}
zhl = zhl.toFixed(2);
row.zhl = zhl+"%";
} }
} }
return apps; return apps;
...@@ -68,6 +76,7 @@ class DatastatisticService extends ServiceBase { ...@@ -68,6 +76,7 @@ class DatastatisticService extends ServiceBase {
* 通过诸葛io同步统计数据 * 通过诸葛io同步统计数据
*/ */
async synchronizeStatisticDataByZhugeIO(){ async synchronizeStatisticDataByZhugeIO(){
console.log("synchronizeStatisticDataByZhugeIO---------------"+new Date());
var channelList = await this.launchchannelDao.model.findAll({ var channelList = await this.launchchannelDao.model.findAll({
raw:true, raw:true,
attributes:["code","name"], attributes:["code","name"],
...@@ -121,7 +130,8 @@ class DatastatisticService extends ServiceBase { ...@@ -121,7 +130,8 @@ class DatastatisticService extends ServiceBase {
//获取事件触发次数 //获取事件触发次数
async getOccurrences(){ async getOccurrences(){
try { try {
var url = zhugeBaseUrl+"?metrics=occurrences&dimensions=$day,$utm_source"; var date = this.fun_date(-7);
var url = zhugeBaseUrl+"?metrics=occurrences&dimensions=$day,$utm_source&conditions=%7B%22$day%22:%5B%22%3E=%22,%22"+date+"%22%5D%7D";
var rtn = await this.zhugeClient.execGet(null,url); var rtn = await this.zhugeClient.execGet(null,url);
console.log(rtn,"rtn+++++++++++++++++++++++++++++++++++++") console.log(rtn,"rtn+++++++++++++++++++++++++++++++++++++")
this.logClient.pushlog("获取诸葛IO事件触发次数返回结果-getOccurrences",null, rtn, null); this.logClient.pushlog("获取诸葛IO事件触发次数返回结果-getOccurrences",null, rtn, null);
...@@ -144,7 +154,8 @@ class DatastatisticService extends ServiceBase { ...@@ -144,7 +154,8 @@ class DatastatisticService extends ServiceBase {
//获取活跃用户数量 //获取活跃用户数量
async getUsers(){ async getUsers(){
try { try {
var url = zhugeBaseUrl+"?metrics=users&dimensions=$day,$utm_source"; var date = this.fun_date(-7);
var url = zhugeBaseUrl+"?metrics=users&dimensions=$day,$utm_source&conditions=%7B%22$day%22:%5B%22%3E=%22,%22"+date+"%22%5D%7D";
var rtn = await this.zhugeClient.execGet(null,url); var rtn = await this.zhugeClient.execGet(null,url);
console.log(rtn,"rtn+++++++++++++++++++++++++++++++++++++") console.log(rtn,"rtn+++++++++++++++++++++++++++++++++++++")
// this.logClient.pushlog("获取诸葛IO活跃用户数量返回结果-getUsers",null, rtn, null); // this.logClient.pushlog("获取诸葛IO活跃用户数量返回结果-getUsers",null, rtn, null);
...@@ -163,9 +174,27 @@ class DatastatisticService extends ServiceBase { ...@@ -163,9 +174,27 @@ class DatastatisticService extends ServiceBase {
} }
} }
fun_date(aa){
var date1 = new Date(),
time1=date1.getFullYear()+"-"+(date1.getMonth()+1)+"-"+date1.getDate();//time1表示当前时间
var date2 = new Date(date1);
date2.setDate(date1.getDate()+aa);
var year = date2.getFullYear();
var month = date2.getMonth()+1;
if(month<10){
month="0"+month;
};
var day = date2.getDate();
if(day<10){
day="0"+day;
}
var time2 = year+"-"+month+"-"+day;
return time2;
}
} }
module.exports = DatastatisticService; module.exports = DatastatisticService;
// var task = new DatastatisticService(); // var task = new DatastatisticService();
// task.dateConvert2String(null).then(d=>{ // task.synchronizeStatisticDataByZhugeIO().then(d=>{
// console.log(d,"-----end--------------------"); // console.log(d,"-----end--------------------");
// }) // })
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/css/chunk-1b7a188a.c042fdb2.css 0 → 100644
.ivu-modal-wrap[data-v-50281c64]{z-index:9999!important}
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/css/chunk-42f44164.bd629bc4.css deleted 100644 → 0
.ivu-modal-wrap[data-v-05be87f2]{z-index:9999!important}
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/css/chunk-492de752.6014cc43.css 0 → 100644
.ivu-modal-wrap{z-index:9999!important}
\ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta content=yes name=apple-mobile-web-app-capable><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/ccc.png><link rel=stylesheet href=//at.alicdn.com/t/font_1996389_21r6b2e5cqci.css><title></title><link href=/css/chunk-04497344.c9ab9860.css rel=prefetch><link href=/css/chunk-07f86704.9c2d3004.css rel=prefetch><link href=/css/chunk-0c20b306.305956e2.css rel=prefetch><link href=/css/chunk-0c2187ca.de0e14cf.css rel=prefetch><link href=/css/chunk-0fb760a4.5c30cb40.css rel=prefetch><link href=/css/chunk-1021e4ee.17ba2048.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-29ebb6f1.d1f69246.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3008061c.6014cc43.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-35ecf338.10e74e31.css rel=prefetch><link href=/css/chunk-3cca9940.6014cc43.css rel=prefetch><link href=/css/chunk-42f44164.bd629bc4.css rel=prefetch><link href=/css/chunk-44b82a04.6014cc43.css rel=prefetch><link href=/css/chunk-450f24ef.90e6aed8.css rel=prefetch><link href=/css/chunk-48aa254a.d360cbd2.css rel=prefetch><link href=/css/chunk-5a40d679.305956e2.css rel=prefetch><link href=/css/chunk-6cc861f3.6014cc43.css rel=prefetch><link href=/css/chunk-9c997554.8e4ddbca.css rel=prefetch><link href=/css/chunk-9dc7e768.305956e2.css rel=prefetch><link href=/css/chunk-a142fab8.6014cc43.css rel=prefetch><link href=/css/chunk-a1670dde.70decc8e.css rel=prefetch><link href=/css/chunk-ca97e120.6014cc43.css rel=prefetch><link href=/css/chunk-cc77621c.8797b2b5.css rel=prefetch><link href=/js/chunk-04497344.0c8a3138.js rel=prefetch><link href=/js/chunk-07f86704.30a25bc6.js rel=prefetch><link href=/js/chunk-0c20b306.728fdf52.js rel=prefetch><link href=/js/chunk-0c2187ca.f9f84370.js rel=prefetch><link href=/js/chunk-0fb760a4.def58650.js rel=prefetch><link href=/js/chunk-1021e4ee.d40517f9.js rel=prefetch><link href=/js/chunk-14b9857b.ae43b7c1.js rel=prefetch><link href=/js/chunk-1f11ec07.b7a911e5.js rel=prefetch><link href=/js/chunk-29ebb6f1.3760df0c.js rel=prefetch><link href=/js/chunk-2c359864.f1f45686.js rel=prefetch><link href=/js/chunk-2d210f61.6e56960a.js rel=prefetch><link href=/js/chunk-3008061c.05756635.js rel=prefetch><link href=/js/chunk-3385141a.16d7705b.js rel=prefetch><link href=/js/chunk-35ecf338.331d513e.js rel=prefetch><link href=/js/chunk-3cca9940.912f824d.js rel=prefetch><link href=/js/chunk-42f44164.c4f61527.js rel=prefetch><link href=/js/chunk-44b82a04.fa770833.js rel=prefetch><link href=/js/chunk-450f24ef.c773d675.js rel=prefetch><link href=/js/chunk-48aa254a.64498aea.js rel=prefetch><link href=/js/chunk-5a40d679.97098616.js rel=prefetch><link href=/js/chunk-6cc861f3.38766ea9.js rel=prefetch><link href=/js/chunk-780401d4.2594e2ad.js rel=prefetch><link href=/js/chunk-9c997554.98400590.js rel=prefetch><link href=/js/chunk-9dc7e768.5dc43ead.js rel=prefetch><link href=/js/chunk-a142fab8.4d6dfdce.js rel=prefetch><link href=/js/chunk-a1670dde.7fb32135.js rel=prefetch><link href=/js/chunk-ca97e120.8fc3e405.js rel=prefetch><link href=/js/chunk-cc77621c.209c3f4a.js rel=prefetch><link href=/js/chunk-d710b6d2.9eff4b27.js rel=prefetch><link href=/css/app.e3db6847.css rel=preload as=style><link href=/css/chunk-vendors.a0428467.css rel=preload as=style><link href=/js/app.a2c0c31c.js rel=preload as=script><link href=/js/chunk-vendors.d7daa525.js rel=preload as=script><link href=/css/chunk-vendors.a0428467.css rel=stylesheet><link href=/css/app.e3db6847.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d7daa525.js></script><script src=/js/app.a2c0c31c.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta content=yes name=apple-mobile-web-app-capable><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/ccc.png><link rel=stylesheet href=//at.alicdn.com/t/font_1996389_21r6b2e5cqci.css><title></title><link href=/css/chunk-04497344.c9ab9860.css rel=prefetch><link href=/css/chunk-07f86704.9c2d3004.css rel=prefetch><link href=/css/chunk-0c20b306.305956e2.css rel=prefetch><link href=/css/chunk-0c2187ca.de0e14cf.css rel=prefetch><link href=/css/chunk-0fb760a4.5c30cb40.css rel=prefetch><link href=/css/chunk-1021e4ee.17ba2048.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-1b7a188a.c042fdb2.css rel=prefetch><link href=/css/chunk-29ebb6f1.d1f69246.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3008061c.6014cc43.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-35ecf338.10e74e31.css rel=prefetch><link href=/css/chunk-3cca9940.6014cc43.css rel=prefetch><link href=/css/chunk-44b82a04.6014cc43.css rel=prefetch><link href=/css/chunk-450f24ef.90e6aed8.css rel=prefetch><link href=/css/chunk-48aa254a.d360cbd2.css rel=prefetch><link href=/css/chunk-492de752.6014cc43.css rel=prefetch><link href=/css/chunk-5a40d679.305956e2.css rel=prefetch><link href=/css/chunk-6cc861f3.6014cc43.css rel=prefetch><link href=/css/chunk-9c997554.8e4ddbca.css rel=prefetch><link href=/css/chunk-9dc7e768.305956e2.css rel=prefetch><link href=/css/chunk-a142fab8.6014cc43.css rel=prefetch><link href=/css/chunk-a1670dde.70decc8e.css rel=prefetch><link href=/css/chunk-ca97e120.6014cc43.css rel=prefetch><link href=/css/chunk-cc77621c.8797b2b5.css rel=prefetch><link href=/js/chunk-04497344.0c8a3138.js rel=prefetch><link href=/js/chunk-07f86704.30a25bc6.js rel=prefetch><link href=/js/chunk-0c20b306.728fdf52.js rel=prefetch><link href=/js/chunk-0c2187ca.f9f84370.js rel=prefetch><link href=/js/chunk-0fb760a4.def58650.js rel=prefetch><link href=/js/chunk-1021e4ee.d40517f9.js rel=prefetch><link href=/js/chunk-14b9857b.ae43b7c1.js rel=prefetch><link href=/js/chunk-1b7a188a.f6cb8994.js rel=prefetch><link href=/js/chunk-1f11ec07.b7a911e5.js rel=prefetch><link href=/js/chunk-29ebb6f1.3760df0c.js rel=prefetch><link href=/js/chunk-2c359864.f1f45686.js rel=prefetch><link href=/js/chunk-2d210f61.6e56960a.js rel=prefetch><link href=/js/chunk-3008061c.05756635.js rel=prefetch><link href=/js/chunk-3385141a.16d7705b.js rel=prefetch><link href=/js/chunk-35ecf338.331d513e.js rel=prefetch><link href=/js/chunk-3cca9940.912f824d.js rel=prefetch><link href=/js/chunk-44b82a04.fa770833.js rel=prefetch><link href=/js/chunk-450f24ef.c773d675.js rel=prefetch><link href=/js/chunk-48aa254a.64498aea.js rel=prefetch><link href=/js/chunk-492de752.64771c0f.js rel=prefetch><link href=/js/chunk-5a40d679.97098616.js rel=prefetch><link href=/js/chunk-6cc861f3.38766ea9.js rel=prefetch><link href=/js/chunk-780401d4.2594e2ad.js rel=prefetch><link href=/js/chunk-9c997554.98400590.js rel=prefetch><link href=/js/chunk-9dc7e768.5dc43ead.js rel=prefetch><link href=/js/chunk-a142fab8.4d6dfdce.js rel=prefetch><link href=/js/chunk-a1670dde.7fb32135.js rel=prefetch><link href=/js/chunk-ca97e120.8fc3e405.js rel=prefetch><link href=/js/chunk-cc77621c.209c3f4a.js rel=prefetch><link href=/js/chunk-d710b6d2.9eff4b27.js rel=prefetch><link href=/css/app.e3db6847.css rel=preload as=style><link href=/css/chunk-vendors.a0428467.css rel=preload as=style><link href=/js/app.f7eaec54.js rel=preload as=script><link href=/js/chunk-vendors.d7daa525.js rel=preload as=script><link href=/css/chunk-vendors.a0428467.css rel=stylesheet><link href=/css/app.e3db6847.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d7daa525.js></script><script src=/js/app.f7eaec54.js></script></body></html>
\ No newline at end of file \ No newline at end of file
gsb-marketplat-mag/app/front/entry/public/js/app.a2c0c31c.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
gsb-marketplat-mag/app/front/entry/public/js/app.f7eaec54.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
gsb-marketplat-mag/app/front/entry/public/js/chunk-492de752.64771c0f.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-492de752"],{"391e":function(e,t,a){"use strict";var s=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},n=[],r=a("9ee1"),o=r["a"],c=a("9ca4"),i=Object(c["a"])(o,s,n,!1,null,null,null);t["a"]=i.exports},"894e":function(e,t,a){},"9ee1":function(e,t,a){"use strict";(function(e){a("163d");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var a=e("#framediv"),s=a.get()[0]||0,n=window.innerHeight-s.offsetTop-t.advalue;t.frameHeight=n,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("a336"))},c397:function(e,t,a){"use strict";a.r(t);var s=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var s=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,tblheight:s-120,metaName:"channel_data_statistic",packageName:"aggregation",modelName:"datastatistic",isMulti:"",savebefore:e.savebefore,editbefore:e.beforedit,addbefore:e.beforeadd},on:{formevent:e.onformevent,onexec:e.onexec}}),a("Drawer",{ref:"advsearchform",attrs:{placement:"right",closable:!1,"mask-closable":!1,width:"50"},model:{value:e.showsearchform,callback:function(t){e.showsearchform=t},expression:"showsearchform"}},[a("Card",{ref:"formcard",staticStyle:{"border-radius":"0px","padding-bottom":"60px",border:"none"},attrs:{"dis-hover":"",bordered:!1}},[a("p",{attrs:{slot:"title"},slot:"title"},[a("Icon",{attrs:{type:"ios-paper-outline"}}),e._v("高级查询 ")],1),a("Form",{ref:"advSearchForm",attrs:{model:e.searchModel,"label-position":"right"}},[a("FormItem",{attrs:{label:"渠道名称"}},[a("i-select",{staticStyle:{width:"200px"},attrs:{placeholder:"请选择渠道"},model:{value:e.searchModel.channel_code,callback:function(t){e.$set(e.searchModel,"channel_code",t)},expression:"searchModel.channel_code"}},e._l(e.channelList,(function(t){return a("Option",{key:t.code,attrs:{value:t.code}},[e._v(e._s(t.name))])})),1)],1),a("FormItem",{attrs:{label:"日期"}},[a("DatePicker",{staticStyle:{width:"200px"},attrs:{type:"daterange",placeholder:"请选择提交日期"},model:{value:e.searchModel.statistic_date,callback:function(t){e.$set(e.searchModel,"statistic_date",t)},expression:"searchModel.statistic_date"}})],1)],1),a("div",{staticClass:"form-footer",staticStyle:{width:"30%"}},[a("Button",{attrs:{type:"text"},on:{click:e.advsearch}},[e._v("搜索")]),a("Button",{attrs:{type:"text"},on:{click:e.advchildcancle}},[e._v("取消")])],1)],1)],1)]}}])})},n=[],r=a("06d3"),o=a("391e"),c=a("7e1e"),i={name:"channeldatastatistic_page",data:function(){return{channelList:[],showsearchform:!1,searchModel:{statistic_date:[]}}},components:{BizTable:r["a"],PageSpace:o["a"]},mounted:function(){this.getChannelList()},methods:{getChannelList:function(){var e=this;Object(c["h"])("/web/configmag/launchchannelCtl/gatAllChannelList").then((function(t){if(0==t.status){var a=t.data;e.channelList=a}}))},onformevent:function(e,t){},savebefore:function(e,t,a){return a(t)},beforeadd:function(e,t){return t({value:!0,message:null})},beforedit:function(e,t){return t({value:!0,message:null})},beforesave:function(e,t,a){return a(t)},onexec:function(e,t){"auth"==e&&this.$router.push({name:"role_auth",query:{roleid:t.id,rolecode:t.code}}),"advsearch"==e&&(this.showsearchform=!0)},formatCol:function(e,t,a){return("sub_count"!=t||e[t])&&("push_count"!=t||e[t])?"customer_count"==t?e[t]?"<span>"+e[t]+"</span>":"<span>0</span>":e[t]:"<span>0</span>"},advsearch:function(){this.$refs.bt.$refs.searchform.formModel.channel_name=this.searchModel.channel_name,this.$refs.bt.$refs.searchform.formModel.channel_code=this.searchModel.channel_code,this.$refs.bt.$refs.searchform.formModel.statistic_date=this.searchModel.statistic_date,this.showsearchform=!1,this.$refs.bt.fetchData()},advchildcancle:function(){this.showsearchform=!1,this.searchModel={statistic_date:[]},this.$refs.bt.fetchData()}}},l=i,h=(a("e706"),a("9ca4")),d=Object(h["a"])(l,s,n,!1,null,null,null);t["default"]=d.exports},e706:function(e,t,a){"use strict";var s=a("894e"),n=a.n(s);n.a}}]);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment