wangwei
/
aiforge
Not watched
1
0
Fork 0
Code
Releases 128 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

增加项目趋势分析

tags/v1.22.5.1^2
wangjr 4 years ago
parent
137ffbf189
commit
931f855753
12 changed files with 944 additions and 3330 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -1
      templates/explore/data_analysis.tmpl
  2. +53
    -149
      web_src/js/components/DataAnalysis.vue
  3. +0
    -158
      web_src/js/components/DataAnalysis1.vue
  4. +30
    -2
      web_src/js/components/ProAnalysis.vue
  5. +0
    -1336
      web_src/js/components/ProAnalysis1.vue
  6. +0
    -1154
      web_src/js/components/ProTend.vue
  7. +828
    -0
      web_src/js/components/ProTrend.vue
  8. +5
    -2
      web_src/js/components/UserAnalysis.vue
  9. +0
    -520
      web_src/js/components/UserAnalysis1.vue
  10. +5
    -0
      web_src/js/components/UserTrend.vue
  11. +0
    -1
      web_src/js/index.js
  12. +19
    -7
      web_src/js/router/index.js

+ 4
- 1
templates/explore/data_analysis.tmpl View File

@@ -8,8 +8,11 @@

<style>
.full.height {
display: flex;
flex-flow: column wrap;
padding-bottom:0px;
/* flex-grow: 1; */
padding-bottom: 53px;
/* padding-bottom: 53px; */
}

</style>

+ 53
- 149
web_src/js/components/DataAnalysis.vue View File

@@ -1,148 +1,45 @@
<!-- <template>
<div style="height:100%">
<el-tabs tab-position="left" v-model="activeName" style="height:100%" @tab-click="handleClick" >
<el-tab-pane label="概览" name="first" >
<span slot="label">
<el-image style="width: 13px; height: 13px" src="/img/overview_rgb.svg">
</el-image>
概览
</span>
<div >暂无内容.......</div>
<template>
<div style="height:100%; flex:1" >
<el-col :span="3" style="height:100%;padding-right:15px;">
<el-menu
default-active="this.$route.path"
class="el-menu-vertical-demo"
:router="true" style="height:100%; background-color: #F5F5F6;" >
<el-menu-item index="overview" >
<i class="ri-home-4-line"></i>
<span slot="title">概览</span>
</el-menu-item>
<el-submenu index="1">
<template slot="title">
<i class="ri-numbers-line"></i>
<span>项目分析</span>
</template>
<el-menu-item index="ProTrend">项目增长趋势分析</el-menu-item>
<el-menu-item index="ProAnalysis">详细数据</el-menu-item>
</el-submenu>
<el-submenu index="2">
<template slot="title">
<i class="ri-contacts-line"></i>
<span>用户分析</span>
</template>
<el-menu-item index="UserTrend">用户增长趋势分析</el-menu-item>
<el-menu-item index="UserAnalysis">活动分析</el-menu-item>
</el-submenu>
<el-menu-item index="BrainAnalysis">
<i class="ri-server-fill"></i>
<span slot="title">云脑分析(建设中..)</span>
</el-menu-item>
</el-menu>
</el-col>
<router-view> </router-view>
</div>
</template>

</el-tab-pane>
<el-tab-pane label="项目分析" name="second" id="second" >
<ProAnalysis ref='ProAnalysis'id="pro" v-if="isRouterAlive"></ProAnalysis>
<span slot="label">
<el-image style="width: 13px; height: 13px" src="/img/pro_rgb.svg">
</el-image>
项目分析
</span>
</el-tab-pane>
<el-tab-pane name="third" id='third' >
<span slot='label'>
<el-image style="width: 13px; height: 13px" src="/img/user_rgb.svg">
</el-image>
用户分析
</span>
<UserAnalysis ref='UserAnalysis' v-if="isRouterAlive1" id ="usr"></UserAnalysis>
</el-tab-pane>
<el-tab-pane name="four" id='four' >
<BrainAnalysis ref='BrainAnalysis'id="brain" v-if="isRouterAlive"></BrainAnalysis>
<span slot="label">
<el-image style="width: 13px; height: 13px" src="/img/pro_rgb.svg">
</el-image>
云脑分析（建设中..）
</span>
</el-tab-pane>
</el-tabs>
</div>
</template> -->
<template>
<div style="height:100%;padding-bottom: 60px;">
<el-col :span="3" style="height:100%;padding-right:20px;">
<el-menu
default-active="this.$route.path"
class="el-menu-vertical-demo"
:router="true" style="height:100%; background-color: #F5F5F6;" >
<el-menu-item index="overview" >
<i class="ri-home-4-line"></i>
<span slot="title">概览</span>
</el-menu-item>
<el-submenu index="1">
<template slot="title">
<el-image style="width: 13px; height: 13px" src="/img/pro_rgb.svg">
</el-image>
<span>项目分析</span>
</template>
<el-menu-item index="ProTend">项目增长趋势分析</el-menu-item>
<el-menu-item index="ProAnalysis">详细数据</el-menu-item>
</el-submenu>
<el-submenu index="2">
<template slot="title">
<i class="ri-user-line"></i>
<span>用户分析</span>
</template>
<el-menu-item index="UserAnalysis">用户增长趋势分析</el-menu-item>
<el-menu-item index="2-2">活动分析</el-menu-item>
</el-submenu>
<el-menu-item index="demo">
<i class="ri-server-fill"></i>
<span slot="title">云脑分析</span>
</el-menu-item>
</el-menu>
</el-col>
<router-view> </router-view>
</div>
</template>
<script>

// import ProAnalysis from './ProAnalysis.vue'
// import UserAnalysis from './UserAnalysis.vue'
// import BrainAnalysis from './BrainAnalysis.vue'

// export default {

// components:{
// 'ProAnalysis':ProAnalysis,
// 'UserAnalysis':UserAnalysis,
// 'BrainAnalysis':BrainAnalysis,
// },
// data() {
// return {
// activeName:"second",
// loading:true,
// loading1:true,
// isRouterAlive: true,
// isRouterAlive1: true,
// isSecond:true,
// isThird:false,
// }
// },
// methods:{
// handleClick(tab, event){
// if(tab.name=="second"){
// this.reload()

// this.isSecond = true
// this.isThird = false
// this.$refs.ProAnalysis.getAllProList("all",7)
// }
// if(tab.name=="third"){

// this.reload1()
// this.isSecond = false
// this.isThird = true

// this.$refs.UserAnalysis.getUpdateTime()
// this.$refs.UserAnalysis.getUserList("all_usr",7)

// }

// },
// reload () {
// this.isRouterAlive = false
// this.$nextTick(() => (this.isRouterAlive = true))
// },
// reload1 () {
// this.isRouterAlive1 = false
// this.$nextTick(() => (this.isRouterAlive1 = true))
// }

// },
// }
</script>

<style scoped>
<style scoped>
/deep/ .is-active{
color: #238BFC ;
background-color: #FFFF ;
color: #238BFC ;
}
/deep/ .ui-container{
background-color: #FFFF;
@@ -184,12 +81,19 @@
.el-menu-item.is-active {
color: #409eff;
background-color: #FFFFFF !important;
}
/* .el-menu-item.el-image{
filter:grayscale(100%)
}
.el-menu-item.is-active.el-image{
filter:grayscale(0%) ;
} */
/deep/ .el-submenu.is-active .el-submenu__title {
color: #409eff
}
/deep/ .el-submenu.is-active .el-submenu__title i{
color: #409eff
}
/deep/ .el-menu, .el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .el-menu--horizontal>.el-submenu .el-submenu__title:hover {
background-color: #F5F5F6;
}
/deep/ .el-pagination {
padding-bottom: 30px;
}

</style>
</style>

+ 0
- 158
web_src/js/components/DataAnalysis1.vue View File

@@ -1,158 +0,0 @@
<template>
<!-- <div style="height:100%"> -->
<!-- <el-tabs tab-position="left" v-model="activeName" style="height:100%" @tab-click="handleClick" >
<el-tab-pane label="概览" name="first" >
<span slot="label">
<el-image style="width: 13px; height: 13px" src="/img/overview_rgb.svg">
</el-image>
概览
</span>
<div >暂无内容.......</div>

</el-tab-pane>
<el-tab-pane label="项目分析" name="second" id="second" >
<ProAnalysis ref='ProAnalysis'id="pro" v-if="isRouterAlive"></ProAnalysis>
<span slot="label">
<el-image style="width: 13px; height: 13px" src="/img/pro_rgb.svg">
</el-image>
项目分析
</span>
</el-tab-pane>
<el-tab-pane name="third" id='third' >
<span slot='label'>
<el-image style="width: 13px; height: 13px" src="/img/user_rgb.svg">
</el-image>
用户分析
</span>
<UserAnalysis ref='UserAnalysis' v-if="isRouterAlive1" id ="usr"></UserAnalysis>
</el-tab-pane>
<el-tab-pane name="four" id='four' >
<BrainAnalysis ref='BrainAnalysis'id="brain" v-if="isRouterAlive"></BrainAnalysis>
<span slot="label">
<el-image style="width: 13px; height: 13px" src="/img/pro_rgb.svg">
</el-image>
云脑分析（建设中..）
</span>
</el-tab-pane>


</el-tabs> -->
<el-col :span="21" style="float: right;padding-left:10px">
<ProAnalysis></ProAnalysis>
</el-col>
<!-- </div> -->
</template>
<script>
import ProAnalysis from './ProAnalysis.vue'
export default {

components:{
'ProAnalysis':ProAnalysis,
},
}
</script>
<!--
<script>
import ProAnalysis from './ProAnalysis.vue'
import UserAnalysis from './UserAnalysis.vue'
import BrainAnalysis from './BrainAnalysis.vue'

export default {

components:{
'ProAnalysis':ProAnalysis,
'UserAnalysis':UserAnalysis,
'BrainAnalysis':BrainAnalysis,
},
data() {
return {
activeName:"second",
loading:true,
loading1:true,
isRouterAlive: true,
isRouterAlive1: true,
isSecond:true,
isThird:false,
}
},
methods:{
handleClick(tab, event){
if(tab.name=="second"){
this.reload()

this.isSecond = true
this.isThird = false
this.$refs.ProAnalysis.getAllProList("all",7)
}
if(tab.name=="third"){

this.reload1()
this.isSecond = false
this.isThird = true

this.$refs.UserAnalysis.getUpdateTime()
this.$refs.UserAnalysis.getUserList("all_usr",7)

}

},
reload () {
this.isRouterAlive = false
this.$nextTick(() => (this.isRouterAlive = true))
},
reload1 () {
this.isRouterAlive1 = false
this.$nextTick(() => (this.isRouterAlive1 = true))
}

},
}
</script>
<style scoped>
/deep/ .is-active{
color: #238BFC ;
background-color: #FFFF ;
}
/deep/ .ui-container{
background-color: #FFFF;
}
/deep/ .el-tabs--left .el-tabs__header.is-left{
background-color:#F5F5F6;
width: 12.43%;
}
.el-tabs--left .el-tabs__header.is-left
html,
body,
/deep/ .el-container {
padding: 0px;
margin: 0px;
height: 100%;
}
/deep/ .el-tabs--left .el-tabs__item.is-left {
text-align: left;
}
/deep/ .el-tabs__item {
padding: 0px 20px 0px 20px;
}
/deep/ .el-tabs__item.is-active .el-image{
filter:none
}
/deep/ .el-tabs__item:hover .el-image{
filter:none
}
/deep/ .el-image{
filter:grayscale(100%)
}
</style> -->

+ 30
- 2
web_src/js/components/ProAnalysis.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="el-col el-col-21" style="padding-left:10px " >
<div class="el-col el-col-21" style="padding-right:10px " >
<div id = "pro_main">
<div style="margin-top: 10px;">
<b class="pro_item">项目分析</b> <span class="update_time">数据更新时间：</span> <span style="font-size: 12px;">{{lastUpdatedTime}}&nbsp/&nbsp从{{recordBeginTime}}开始统计</span>
@@ -59,6 +59,7 @@
>
</el-table-column>
<el-table-column
fixed
label="项目名称中文"
align="left"
prop="name"
@@ -922,12 +923,24 @@
type : 'category',
boundaryGap: false,
data : xdata_openI,
axisLine: {
show: false, //x轴线消失
},
axisTick:{
show:false//刻度隐藏
}
}
],
yAxis : [
{
type : 'value',
axisLine: {
show: false, //x轴线消失
},
axisTick:{
show:false//刻度隐藏
}
}
],
@@ -1028,12 +1041,24 @@
{
type : 'category',
data : xdata,
axisLine: {
show: false, //x轴线消失
},
axisTick:{
show:false//刻度隐藏
}
}
],
yAxis : [
{
type : 'value',
type : 'value',
axisLine: {
show: false, //x轴线消失
},
axisTick:{
show:false//刻度隐藏
}
}
],
series : [
@@ -1298,6 +1323,9 @@
/deep/ .el-range-separator{
width: 20% !important;
}
/deep/ .el-pagination {
padding-bottom: 30px;
}

.colorChange {
background-color: #1684FC;


+ 0
- 1336
web_src/js/components/ProAnalysis1.vue
File diff suppressed because it is too large
View File


+ 0
- 1154
web_src/js/components/ProTend.vue
File diff suppressed because it is too large
View File


+ 828
- 0
web_src/js/components/ProTrend.vue View File

@@ -0,0 +1,828 @@
<template>
<div class="el-col el-col-21" style="padding-right:10px ">
<div id='pro_tend' >
<div style="margin-top: 10px;">
<b class="pro_item">项目分析</b> <span class="update_time">数据更新时间：</span> <span style="font-size: 12px;">{{lastUpdatedTime}}&nbsp/&nbsp从{{recordBeginTime}}开始统计</span>
</div>
<div style="margin-top:20px">
<el-row>
<el-col :span='1' class ='item_list_first'>
<el-row class="item_title_h">
&nbsp;
</el-row>
<el-row class="item_h">
昨天
</el-row>
<el-row class="item_h">
今天
</el-row>
</el-col>
<el-col span='23' >
<el-col :span='3' class ='item_list'>
<el-row class="item_title_h">
项目
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numReposAdd}}
</el-row>
<el-row class="item_h">
{{ tableDataSummary.numRepos}}
</el-row>
</el-col>
<el-col :span='3' >
<el-row class ='item_list_p item_title_h'>
公开
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoPublicAdd}}
</el-row >
<el-row class="item_h">
{{tableDataSummary.numRepoPublic}}
</el-row>
</el-col>
<el-col :span='3' class ='item_list'>
<el-row class="item_title_h">
私有
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoPrivateAdd}}
</el-row>
<el-row class="item_h">
{{tableDataSummary.numRepoPrivate}}
</el-row>
</el-col>
<el-col :span='3'>
<el-row class ='item_list_p item_title_h'>
自建
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoSelfAdd}}
</el-row >
<el-row class="item_h">
{{tableDataSummary.numRepoSelf}}
</el-row>
</el-col>
<el-col :span='3' >
<el-row class ='item_list_p item_title_h'>
派生
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoForkAdd}}
</el-row >
<el-row class="item_h">
{{tableDataSummary.numRepoFork}}
</el-row>
</el-col>
<el-col :span='3' class ='item_list '>
<el-row class="item_title_h">
镜像
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoMirrorAdd}}
</el-row>
<el-row class="item_h">
{{tableDataSummary.numRepoMirror}}
</el-row>
</el-col>
<el-col :span='3'>
<el-row class ='item_list_p item_title_h'>
组织
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoOrgAdd}}
</el-row>
<el-row class="item_h">
{{tableDataSummary.numRepoOrg}}
</el-row>
</el-col>
<el-col :span='2'>
<el-row class="item_title_h">
个人
</el-row>
<el-row class="item_h num_color">
{{tableDataSummary.numRepoNotOrgAdd}}
</el-row>
<el-row class="item_h">
{{tableDataSummary.numRepoNotOrg}}
</el-row>
</el-col>
</el-col>
</el-row>
</div>
<div style="margin-top: 20px;">
<span class="sta_iterm">统计周期：</span>
<button type="button" class='btnFirst' id ="yesterday" v-bind:class="{colorChange:1==dynamic}" @click="resetPage(),getPeriodProList('yesterday',1)">昨天</button>
<button type="button" class='btn' id = "current_week" v-bind:class="{colorChange:2==dynamic}" @click="resetPage(),getPeriodProList('current_week',2)">本周</button>
<button type="button" class='btn' id = "current_month" v-bind:class="{colorChange:3==dynamic}" @click="resetPage(),getPeriodProList('current_month',3)">本月</button>
<button type="button" class='btn' id = "last_month" v-bind:class="{colorChange:4==dynamic}" @click="resetPage(),getPeriodProList('last_month',4)">上月</button>
<button type="button" class='btn' id = "monthly" v-bind:class="{colorChange:5==dynamic}" @click="resetPage(),getPeriodProList('monthly',5)">近30天</button>
<button type="button" class='btn' id = "current_year" v-bind:class="{colorChange:6==dynamic}" @click="resetPage(),getPeriodProList('current_year',6)">今年</button>
<button type="button" class='btnLast' id = "all" v-bind:class="{colorChange:7==dynamic}" @click="resetPage(),getPeriodProList('all',7)">所有</button>
<span style="margin-left: 20px;">
<el-date-picker
v-model="value_time"
prefix-icon="el-icon-time"
@change="resetPage(),getPeriodProList('',0)"
type="daterange"
size='small'
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</span>
<span style="float:right; margin-right: 20px;">
<div style="display:inline-block;margin-left: 20px; ">
<a class="el-icon-download" v-if="tableData!=''" :href= "'../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi'" ></a>
<i class="el-icon-download" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
<!-- <span ><a id = "download_file" :href= "'../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi'" >下载报告</a> </span> -->
<span >
<a id = "download_file" v-if="tableData!=''" :href= "'../api/v1/projectboard/summary/download?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime">下载报告</a>
<a id = "download_file" v-else="tableData=''" href= "#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'>下载报告</a>
</span>
</div>
</span>
</div>
<div class="item_echart" id ='linecharts'>
<div style="margin: 15px 10px 30px;">
<label for="label" @change='clickCheckBox'>
<input type="checkbox" class="checkboxchart" name="checkboxchart" checked="checked" value="新增项目"/> 新增项目
<input type="checkbox" class="checkboxchart" name="checkboxchart" checked="checked" value="新增公开项目"/>新增公开项目
<input type="checkbox" class="checkboxchart" name="checkboxchart" checked="checked" value="新增私有项目"/>新增私有项目
<input type="checkbox" class="checkboxchart" name="checkboxchart" value="新增自建项目"/>新增自建项目
<input type="checkbox" class="checkboxchart" name="checkboxchart" value="新增派生项目"/>新增派生项目
<input type="checkbox" class="checkboxchart" name="checkboxchart" value="新增镜像项目"/>新增镜像项目
<input type="checkbox" class="checkboxchart" name="checkboxchart" value="累计项目"/>累计项目
</label>
</div>
<div id ="selectData" style="height: 300px;">

</div>

</div>
<div style="margin-top: 30px;">
<el-table
:data="tableData.slice((page-1)*pageSize,page*pageSize)"
style="width: 100%"
:header-cell-style="tableHeaderStyle"
:cell-style='cellStyle'>
<el-table-column
label="日期"
align="left"
prop="creatTime"
>
</el-table-column>
<el-table-column
label="新增项目"
align="center"
prop="numReposAdd"
>
</el-table-column>
<el-table-column
label="累计项目"
align="center"
prop="numRepos"
>
</el-table-column>
<el-table-column
prop="numRepoPublicAdd"
label="新增公开项目"
align="center">
</el-table-column>
<el-table-column
prop="numRepoPrivateAdd"
label="新增私有项目"
align="center">
</el-table-column>
<el-table-column
prop="numRepoSelfAdd"
label="新增自建项目"
align="center">
</el-table-column>
<el-table-column
prop="numRepoForkAdd"
label="新增派生项目"
align="center">
</el-table-column>
<el-table-column
prop="numRepoMirrorAdd"
label="新增镜像项目"
align="center">
</el-table-column>
</el-table>
</div>
<div style="margin-top:50px;text-align:center">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page"
:page-size="pageSize"
:page-sizes="[5,10,20]"
layout="total, sizes,prev, pager, next,jumper"
:total="tableData.length">
</el-pagination>
</div>
</div>
</div>
</template>

<script>
// import barLabel from './basic/barLabel.vue';
const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;

import { export2Excel } from '../excel/util.js'
export default{
name:'ProAnalysis',
components: {
// barLabel,
},
data() {
return {
recordBeginTime:'',
lastUpdatedTime:'',
page:1,
pageSize:10,
params:{type:'monthly',page:1,pagesize:10,beginTime:'',endTime:''},
tableData: [],
tableDataSummary:{},
totalPage:0,
totalNum:0,
pickerOptions: {
},
value_time: '',
dynamic:5,
echartsSelectData:'',
option:'',
};
},
methods: {
// download_file(){
// this.params.type='all'
// },
popMark(){
alert("数据为空时，不能下载！")
},
exportData(){
// this.getOneProList(this.pro_id,'all',true,7)
// this.getOneProList(this.pro_id,'all',false,7)
// this.fileName()
if (this.tableData!=''){
this.page=1
var saveFileName = this.getFileName()
export2Excel(this.columns,this.tableData,saveFileName)
}else{
alert("数据为空时，不能下载！")
}
},
getFileName(){

var now = new Date(); // 当前日期
var nowDayOfWeek = now.getDay(); // 今天本周的第几天
var nowDay = now.getDate(); // 当前日
var nowMonth = now.getMonth(); // 当前月
var nowYear = now.getFullYear(); // 当前年
var today = this.saveFormatDate(nowYear,nowMonth+1,nowDay);
var tmp = new Date(now.setTime(now.getTime()-24*60*60*1000));
var yesterday = this.saveFormatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate());
var yesterday_tmp = this.formatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate())

var startDate=''
var endDate=''
var saveFileName = ''
if (typeof this.paramsID.type=="undefined" || this.paramsID.type=="null" || this.paramsID.type==""){
// startDate= this.saveFormatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate());
endDate = this.saveFormatDate(this.create_time_pro[1].getFullYear(),this.create_time_pro[1].getMonth() + 1,this.create_time_pro[1].getDate());
var tmp = this.formatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate())
startDate = this.comparedate(tmp,this.recordBeginTime)

console.log("comparedate:"+startDate)
saveFileName = this.alias+"_"+startDate+'_'+endDate
}else{
switch(this.paramsID.type){
case "yesterday":{
startDate = this.comparedate(yesterday_tmp,this.recordBeginTime)
endDate = startDate

saveFileName = this.alias+"_"+startDate+'_'+ endDate
break
}
case "current_week":{
var now = new Date(); // 当前日期
var nowDayOfWeek = now.getDay(); // 今天本周的第几天
var day = nowDayOfWeek || 7;
startDate = this.formatDate(now.getFullYear(), nowMonth+1, nowDay + 1 - day);
startDate = this.comparedate(startDate,this.recordBeginTime)

endDate = yesterday
saveFileName = this.alias+"_"+startDate+'_'+ endDate
break
}
case "current_month":{
startDate = this.formatDate(nowYear,nowMonth+1,1);
startDate = this.comparedate(startDate,this.recordBeginTime)

endDate = yesterday
saveFileName = this.alias+"_"+startDate+'_'+ endDate
break
}
case "last_month":{

let lastMonthDate = new Date(); // 上月日期
lastMonthDate.setDate(1);
lastMonthDate.setMonth(lastMonthDate.getMonth()-1);
let lastYear = lastMonthDate.getFullYear();
let lastMonth = lastMonthDate.getMonth();

startDate=this.formatDate(lastYear, lastMonth+1, 1);
startDate = this.comparedate(startDate,this.recordBeginTime)


var monthStartDate = new Date(lastYear, lastMonth, 1);
var monthEndDate = new Date(lastYear, lastMonth+1, 1);
var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)

endDate=this.saveFormatDate(lastYear, lastMonth+1, days); //月份从0开始，所以+1保存月份
saveFileName = this.alias+"_"+startDate+'_'+ endDate
break
}
case "monthly":{
var temp=new Date(now - 1000 * 60 * 60 * 24 * 30)
startDate = this.formatDate(temp.getFullYear(),temp.getMonth()+1,temp.getDate());
startDate = this.comparedate(startDate,this.recordBeginTime)

endDate = yesterday
saveFileName = this.alias+"_"+startDate+'_'+ endDate
break
}
case "current_year":{
startDate = this.formatDate(now.getFullYear(), 1, 1);
startDate = this.comparedate(startDate,this.recordBeginTime)

endDate = yesterday
saveFileName = this.alias+"_"+startDate+'_'+ endDate
break
}
case "all":{
console.log("e:"+today)
startDate = 'all'
endDate = yesterday
saveFileName = this.alias+'_所有'
break
}
}
}
return saveFileName

},
resetPage(){
this.page=1
this.params.page = 1
},
resetCurrentPage(){
this.page=1
},
handleSizeChange(val){
this.pageSize = val
},
handleCurrentChange(val){
this.page = val;
},
saveFormatDate(myyear,mymonth,myweekday) {
// var myyear = this.date.getFullYear();
// var mymonth = this.date.getMonth() + 1;
// var myweekday = this.date.getDate();
if (mymonth < 10) {
mymonth = "0" + mymonth;
}
if (myweekday < 10) {
myweekday = "0" + myweekday;
}
console.log((myyear +''+ mymonth +''+ myweekday))
return (myyear +''+ mymonth +''+ myweekday);
},
formatDate(myyear,mymonth,myweekday) {
// var myyear = this.date.getFullYear();
// var mymonth = this.date.getMonth() + 1;
// var myweekday = this.date.getDate();
if (mymonth < 10) {
mymonth = "0" + mymonth;
}
if (myweekday < 10) {
myweekday = "0" + myweekday;
}
return (myyear +'-'+ mymonth +'-'+ myweekday);
},
//获得某月的天数
getPeriodProList(type_val,index){
console.log("类型："+type_val)
this.dynamic = index
if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
this.params.type=''
this.params.beginTime=this.formatDate(this.value_time[0].getFullYear(),this.value_time[0].getMonth() + 1,this.value_time[0].getDate())
this.params.endTime=this.formatDate(this.value_time[1].getFullYear(),this.value_time[1].getMonth() + 1,this.value_time[1].getDate())
}else{
this.params.type=type_val
this.params.beginTime=''
this.params.endTime=''
this.value_time=[]
}
console.log("params:",this.params)
this.$axios.get('../api/v1/projectboard/summary/period',{
params:this.params
}).then((res)=>{
this.recordBeginTime=res.data.recordBeginTime
// this.lastUpdatedTime=res.data.creatTime
this.tableData = res.data.pageRecords
this.totalPage=res.data.totalPage
// this.totalNum = res.data.totalCount//this.totalPage*this.params.pagesize
// console.log("res.data:"+res.data)
this.drawSelectData()

})
},
getSummaryPro(){
this.$axios.get('../api/v1/projectboard/summary',{
}).then((res)=>{
this.tableDataSummary = res.data
this.lastUpdatedTime = res.data.creatTime
})
},
tableHeaderStyle({row,column,rowIndex,columnIndex}){
if(rowIndex===0){
return 'background:#f5f5f6;color:#606266'
}
},
cellStyle({row,column,rowIndex,columnIndex}){
if(rowIndex%2 === 1){
return 'background:#f5f5f6;color:#606266'
}
},
drawSelectData(){
// $("#selectData").removeAttr("selectData").empty();
var xdata=[]
var ydata_add_pro=[]
var ydata_add_public_pro=[]
var ydata_add_private_pro=[]
var ydata_add_self=[]
var ydata_add_fork=[]
var ydata_add_mirror=[]
var ydata_cumulative_pro=[]
// if ()
for(var i =0;i<this.tableData.length;i++){
xdata.push(this.tableData[this.tableData.length-1-i].creatTime);
ydata_add_pro.push(this.tableData[this.tableData.length-1-i].numReposAdd)
ydata_add_public_pro.push(this.tableData[this.tableData.length-1-i].numRepoPublicAdd)
ydata_add_private_pro.push(this.tableData[this.tableData.length-1-i].numRepoPrivateAdd)
ydata_add_self.push(this.tableData[this.tableData.length-1-i].numRepoSelfAdd)
ydata_add_fork.push(this.tableData[this.tableData.length-1-i].numRepoForkAdd)
ydata_add_mirror.push(this.tableData[this.tableData.length-1-i].numRepoMirrorAdd)
ydata_cumulative_pro.push(this.tableData[this.tableData.length-1-i].numRepos)
}
console.log("ydata_openI:"+ydata_add_pro)
console.log(xdata)
this.option = {
title : {
text: '',


textStyle: {
                fontSize: 12,
            },
left:'center',
top:'bottom',

subtext: '',

},
tooltip : {
trigger: 'axis',
backgroundColor:'rgba(255,255,255,0.8)',
color:'black',
borderWidth:'1',
borderColor:'gray',
textStyle:{
color:'black'
},
},
legend: {
data:['新增项目','新增公开项目','新增私有项目','新增自建项目','新增派生项目','新增镜像项目','累计项目'],
// orient: 'vertical',
// top:'top',　　
},
toolbox: {
show : false,
feature : {
mark : {show: true},
dataView : {show: false, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: false},
saveAsImage : {show: true}
}
},
calculable : true,
xAxis : [
{
type : 'category',
data : xdata,
axisLine: {
show: false, //x轴线消失
},
axisTick:{
show:false//刻度隐藏
}
}
],
yAxis : [
{
type : 'value',
axisLine: {
show: false, //y轴线消失
},
axisTick:{
show:false//刻度隐藏
}
}
],
series : [
{ name:"新增项目",
data: ydata_add_pro,
type: 'line',
areaStyle: {},
},
{
name:"新增公开项目",
data: ydata_add_public_pro,
type: 'line',
areaStyle: {},
},
{
name:"新增私有项目",
data: ydata_add_private_pro,
type: 'line',
areaStyle: {},
},
{
name:"新增自建项目",
data: ydata_add_self,
type: 'line',
areaStyle: {},
},
{
name:"新增派生项目",
data: ydata_add_fork,
type: 'line',
areaStyle: {},
},
{
name:"新增镜像项目",
data: ydata_add_mirror,
type: 'line',
areaStyle: {},
},
{
name:"累计项目",
data: ydata_cumulative_pro,
type: 'line',
areaStyle: {},
},

]
};
// this.echartsSelectData.resize()
this.echartsSelectData.setOption(this.option)
// setTimeout(function (){
// window.onresize = function () {
// this.echartsSelectData.resize;
// }
// },200)

// // 使用刚指定的选择项数据显示图表。
// var selectArr = this.echartsSelectData.getOption().legend[0].data;//legend所有值
// var checkboxs=document.getElementsByName('checkboxchart');
// $(".checkboxchart").click(function(){
// var obj = {};
// for(var i=0; i<checkboxs.length; i++){
// if(checkboxs[i].checked){
// obj[selectArr[i]] = true;
// }else{
// obj[selectArr[i]] = false;
// }
// }
// option.legend.selected = obj;
// this.echartsSelectData.setOption(option);
// });


},
clickCheckBox(){
// 使用刚指定的选择项数据显示图表。
var selectArr = this.echartsSelectData.getOption().legend[0].data;//legend所有值
var checkboxs=document.getElementsByName('checkboxchart');
// $(".checkboxchart").click(function(){
var obj = {};
for(var i=0; i<checkboxs.length; i++){
if(checkboxs[i].checked){
obj[selectArr[i]] = true;
}else{
obj[selectArr[i]] = false;
}
}
this.option.legend.selected = obj;
this.echartsSelectData.setOption(this.option);
// });

},
comparedate(date1,date2){
// console.log("date1:"+date1)
// console.log("date1:"+date2)
var oDate1 = new Date(date1);
var oDate2 = new Date(date2);
if(oDate1.getTime() < oDate2.getTime()){
var data = date2.split('-')
return data[0]+''+data[1]+''+data[2]
} else {
var data = date1.split('-')
return data[0]+''+data[1]+''+data[2]
}
},

},
filters:{
},


mounted() {

this.getPeriodProList("monthly",5);
this.getSummaryPro();
document.getElementById('selectData').style.width = document.getElementById('pro_tend').offsetWidth*0.8+'px'
this.echartsSelectData = this.$echarts.init(document.getElementById('selectData'))
},

watch:{
},

created() {
this.getSummaryPro();
this.getPeriodProList("monthly",5);
},
updated(){
if(document.querySelectorAll('img[avatar]').length!==0){
window.LetterAvatar.transform()
}
}
}
</script>

<style scoped>
.item_list_first{
border-right: 1px solid rgba(219,219,219,100);
padding-right: 10px;
}

.item_list{
border-right: 1px solid rgba(219,219,219,100);
padding:0px 10px;
}
.item_list_p{
border-right: 1px solid rgba(219,219,219,100);
padding:0px 10px;
}
.item_h{
line-height: 40px;
text-align: center;
}
.item_title_h{
line-height: 28px;
text-align: center;
}
.num_color{
color: #0366D6;
}

.pro_item{
font-size: 16px;
color: rgba(16, 16, 16, 100);
font-family: SourceHanSansSC-bold;
}
.sta_item{
font-size: 14px;
color: rgb(0 0 0);
font-family: SourceHanSansSC-bold;
}
.update_time{
line-height: 17px;
font-size: 12px;
color:rgba(187, 187, 187, 100);
margin-left: 10px;
}
.btnFirst{
line-height: 1.5;
margin: -3.5px;
border: 1px solid rgba(22, 132, 252, 100);
border-right: none;
background: #FFFF;
color: #1684FC;
width: 60px;
height: 30px;
border-radius:4px 0px 0px 4px;
}
.btn{
line-height: 1.5;
margin: -3.5px;
border: 1px solid rgba(22, 132, 252, 100);
border-right: none;
background: #FFFF;
color: #1684FC;
width: 60px;
height: 30px;
}
.btnLast{
line-height: 1.5;
margin: -3.5px;
border: 1px solid rgba(22, 132, 252, 100);
/* border-right: none; */
background: #FFFF;
color: #1684FC;
width: 60px;
height: 30px;
border-radius:0px 4px 4px 0px;
}
.btnFirst, .btn, .btnLast {
cursor: pointer;
}

/deep/ .el-table tbody tr:hover>td {
background-color:#D3D3D3!important;
opacity:1
}
/deep/ .el-table {
font-size: 12px;
}
/deep/ .el-range-separator{
width: 20% !important;
}
/deep/ .el-pagination {
padding-bottom: 30px;
}
.colorChange {
background-color: #1684FC;
color: #FFFF;
cursor: default;
}
.items{
text-align: center;
border-right:1px solid rgba(219, 219, 219, 100);
}
.item_l{
margin-right: 5px;
border:1px solid rgba(219, 219, 219, 100);
height: 370px;
width: 100%;
}
.item_r{
margin-right:5px;
border:1px solid rgba(219, 219, 219, 100);
height: 370px;
overflow:auto
}
.item_echart{
margin-top: 10px;
margin-right: 5px;
border:1px solid rgba(219, 219, 219, 100);
height: 350px;
width: 100%;
}
.item_content{
color:#0366D6;
margin-top: 10px;
font-weight:bold;
}
</style>

+ 5
- 2
web_src/js/components/UserAnalysis.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="el-col el-col-21" style="padding-left:10px">
<div class="el-col el-col-21" style="padding-right:10px">
<div style="margin-top: 10px;">
<b class="pro_item">用户分析</b> <span class="update_time">数据更新时间：</span><span style="font-size: 12px;">{{lastUpdatedTime}} &nbsp/&nbsp从{{recordBeginTime}}开始统计</span>
</div>
@@ -54,6 +54,7 @@
>
</el-table-column>
<el-table-column
fixed
label="用户名"
align="left"
prop="Name"
@@ -510,7 +511,9 @@
/deep/ .el-range-separator{
width: 20% !important;
}

/deep/ .el-pagination {
padding-bottom: 30px;
}
.colorChange {
background-color: #1684FC;
color: #FFFF;


+ 0
- 520
web_src/js/components/UserAnalysis1.vue View File

@@ -1,520 +0,0 @@
<template>
<div>
<div style="margin-top: 10px;">
<b class="pro_item">用户分析</b> <span class="update_time">数据更新时间：</span><span style="font-size: 12px;">{{lastUpdatedTime}} &nbsp/&nbsp从{{recordBeginTime}}开始统计</span>
</div>
<div style="margin-top: 20px;">
<span class="sta_iterm">统计周期：</span>
<button type="button" class='btnFirst' id ="yesterday_usr" v-bind:class="{colorChange:1==dynamic}" @click="resetPage(),getUserList('yesterday_usr',1)">昨天</button>
<button type="button" class='btn' id = "current_week_usr" v-bind:class="{colorChange:2==dynamic}" @click="resetPage(),getUserList('current_week_usr',2)">本周</button>
<button type="button" class='btn' id = "current_month_usr" v-bind:class="{colorChange:3==dynamic}" @click="resetPage(),getUserList('current_month_usr',3)">本月</button>
<button type="button" class='btn' id = "last_month_usr" v-bind:class="{colorChange:4==dynamic}" @click="resetPage(),getUserList('last_month_usr',4)">上月</button>
<button type="button" class='btn' id = "monthly_usr" v-bind:class="{colorChange:5==dynamic}" @click="resetPage(),getUserList('monthly_usr',5)">近30天</button>
<button type="button" class='btn' id = "current_year_usr" v-bind:class="{colorChange:6==dynamic}" @click="resetPage(),getUserList('current_year_usr',6)">今年</button>
<button type="button" class='btnLast' id = "all_usr" v-bind:class="{colorChange:7==dynamic}" @click="resetPage(),getUserList('all_usr',7)">所有</button>
<span style="margin-left: 20px;">
<el-date-picker
v-model="value_time"
prefix-icon="el-icon-time"
@change="resetPage(),getUserList('',0)"
type="daterange"
size='small'
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</span>
<span style="float:right; margin-right: 20px;" >
<a style="display:inline-block;margin-left: 20px; " id = 'download'>
<a class="el-icon-download" v-if="tableData!=''" :href= "this.dataUrl + '?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" ></a>
<i class="el-icon-download" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
<span >
<a v-if="tableData!=''" :href= "this.dataUrl + '?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" >下载报告</a>
<a v-else="tableData=''" href= "#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'>下载报告</a>
</span>
</a>
<span style="display:inline-block;margin-left: 20px; ">
<el-input size="small" placeholder="输入用户名搜索" v-model="search" class="input-with-select" @keyup.enter.native="searchName() "><i slot="suffix" class="el-input__icon el-icon-search" @click="searchName() "></i>
</el-input>
</span>
</span>
</div>
<div style="margin-top: 30px;">
<el-table
:data="tableData"
style="width: 100%"
:header-cell-style="tableHeaderStyle"
:cell-style='cellStyle'>
<el-table-column
label="ID"
prop="ID"
align="left"
stripe
>
</el-table-column>
<el-table-column
label="用户名"
align="left"
prop="Name"
width="100px">
<template slot-scope="scope">
<a :href="AppSubUrl +'../../../'+ scope.row.Name">{{scope.row.Name}} </a>
</template>
</el-table-column>
<el-table-column
prop="CodeMergeCount"
label="PR数"
align="center">
</el-table-column>
<el-table-column
prop="UserIndex"
label="用户指数"
width="120px"
align="center">
<template slot-scope="scope">
{{scope.row.UserIndex | rounding}}
</template>
</el-table-column>
<el-table-column
prop="CommitCount"
label="commit数"
align="center">
</el-table-column>
<el-table-column
prop="IssueCount"
label="提出任务数"
align="center">
</el-table-column>
<el-table-column
prop="CommentCount"
label="评论数"
align="center">
</el-table-column>
<el-table-column
prop="FocusRepoCount"
label="关注项目数"
align="center">
</el-table-column>
<el-table-column
prop="StarRepoCount"
label="点赞项目数"
align="center">
</el-table-column>

<el-table-column
prop="LoginCount"
label="登录次数"
align="center">
</el-table-column>
<el-table-column
prop="WatchedCount"
label="关注者数"
align="center">
</el-table-column>
<el-table-column
prop="CommitCodeSize"
label="commit代码行数"
width="115px"
align="center">
</el-table-column>
<el-table-column
prop="SolveIssueCount"
label="已解决任务数"
align="center">
</el-table-column>
<el-table-column
prop="EncyclopediasCount"
label="百科页面贡献次数"
width="130px"
align="center">
</el-table-column>
<el-table-column
prop="CreateRepoCount"
label="创建项目"
align="center">
</el-table-column>
<el-table-column
prop="CloudBrainTaskNum"
label="云脑任务数"
width="120px"
align="center">
</el-table-column>
<el-table-column
prop="CloudBrainRunTime"
label="云脑运行时间（小时）"
width="120px"
align="center">
<template slot-scope="scope">
{{scope.row.CloudBrainRunTime | roundingToHour}}
</template>
</el-table-column>
<el-table-column
prop="CommitDatasetNum"
label="上传（提交）数据集文件数"
width="120px"
align="center">
</el-table-column>
<el-table-column
prop="CommitModelCount"
label="提交模型数"
width="120px"
align="center">
</el-table-column>
<el-table-column
prop="RegistDate"
label="用户注册时间"
width="120px"
align="center">
<template slot-scope="scope">
{{scope.row.RegistDate | transformTimestamp}}
</template>
</el-table-column>
<el-table-column
prop="DataDate"
label="系统统计时间"
width="120px"
align="center">
</el-table-column>
</el-table>
</div>
<div style="margin-top:50px;text-align:center">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page"
:page-size="pageSize"
:page-sizes="[5,10,20]"
layout="total, sizes, prev, pager, next,jumper"
:total="totalNum">
</el-pagination>
</div>
</div>
</template>

<script>
import { export2Excel } from '../excel/util.js'
export default{
name:'UserAnalysis',
data() {
return {
type_val:'',
recordBeginTime:'',
lastUpdatedTime:'',
page:1,
pageSize:10,
params:{startDate:'',endDate:'',page:1,pageSize:10,userName:''},
tableData: [],
totalNum:0,
dataUrl:'../api/v1/query_user_static_page',
pickerOptions: {
},
value_time: '',
search:'',
data:'',
columns: [{title: 'ID',key: 'ID'},{title: '用户名',key: 'Name'},{title: 'PR数',key: 'CodeMergeCount'},{title: 'commit数',key:'CommitCount'},{title: '提出任务数',key: 'IssueCount'},{title: '评论数',key: 'CommentCount'},{title: '关注项目数',key: 'FocusRepoCount'},{title: '点赞项目数',key: 'StarRepoCount'},{title: '登录次数',key: 'LoginCount'},{title:'关注者数',key:'WatchedCount'},{title:'commit代码行数',key:'CommitCodeSize'},{title:'已解决任务数',key:'SolveIssueCount'},{title:'百科页面贡献次数',key:'EncyclopediasCount'},{title:'创建项目',key:'CreateRepoCount'},{title:'用户注册时间',key:'RegistDate'},{title:'云脑任务数',key:'CloudBrainTaskNum'},{title:'云脑运行时间（小时）',key:'CloudBrainRunTime'},{title:'上传（提交）数据集文件数',key:'CommitDatasetNum'},{title:'提交模型数',key:'CommitModelCount'},{title:'用户指数',key:'UserIndex'},{title:'系统统计时间',key:'CountDate'}],
blob:'',
fileName:'',
dynamic:7,

params_pro:{type:'all',page:1,pagesize:10,beginTime:'',endTime:'',q:'',sort:'openi'},
};
},
methods: {

popMark(){
alert("数据为空时，不能下载！")
},
exportData(){
// this.getUserList('all_usr',7)
var saveFileName = this.getFileName()
export2Excel(this.columns,this.tableData,saveFileName)
},
getFileName(){
var saveFileName=''
var Date=(this.params.startDate).split('-')
var startDate=Date[0]+''+Date[1]+''+Date[2]
Date=(this.params.endDate).split('-')
var endDate=Date[0]+Date[1]+Date[2]
saveFileName = '用户分析_'+this.search+''+startDate+'_'+endDate
if (this.type_val=='all_usr'){
saveFileName = '用户分析_'+this.search+'_all'
}
return saveFileName

},
handleCurrentChange(val){
this.params.page = val
this.page = val
this.getUserList(this.type_val,this.dynamic)

},
handleSizeChange(val){
this.params.pageSize = val
this.resetPage()
this.getUserList(this.type_val,this.dynamic)
},
resetPage(){
this.page=1
this.params.page = 1
},

formatDate(myyear,mymonth,myweekday) {
// var myyear = this.date.getFullYear();
// var mymonth = this.date.getMonth() + 1;
// var myweekday = this.date.getDate();
if (mymonth < 10) {
mymonth = "0" + mymonth;
}
if (myweekday < 10) {
myweekday = "0" + myweekday;
}
return (myyear + "-" + mymonth + "-" + myweekday);
},

// 获得某月的天数
getMonthDays(nowYear,month){
let monthStartDate = new Date(nowYear, month, 1);
let monthEndDate = new Date(nowYear, month + 1, 1);
let days = (monthEndDate - monthStartDate)/(1000 * 60 * 60 * 24);
return days;
},
getUpdateTime(){
this.$axios.get('../api/v1/projectboard/project',{
params:this.params_pro
}).then((res)=>{
this.recordBeginTime=res.data.recordBeginTime
this.lastUpdatedTime=res.data.lastUpdatedTime
})
},
getUserList(type_val,index){
this.type_val = type_val
this.dynamic = index;
var now = new Date(); // 当前日期
var nowDayOfWeek = now.getDay(); // 今天本周的第几天
var nowDay = now.getDate(); // 当前日
var nowMonth = now.getMonth(); // 当前月
var nowYear = now.getFullYear(); // 当前年
var today = this.formatDate(nowYear,nowMonth+1,nowDay);

let lastMonthDate = new Date(); // 上月日期
lastMonthDate.setDate(1);
lastMonthDate.setMonth(lastMonthDate.getMonth()-1);
let lastYear = lastMonthDate.getYear();
let lastMonth = lastMonthDate.getMonth();

this.dataUrl = '../api/v1/query_user_static_page';

if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
this.params.startDate= this.formatDate(this.value_time[0].getFullYear(),this.value_time[0].getMonth() + 1,this.value_time[0].getDate());
this.params.endDate = this.formatDate(this.value_time[1].getFullYear(),this.value_time[1].getMonth() + 1,this.value_time[1].getDate());
}else{
switch(type_val){
case "yesterday_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_yesterday';
break
}
case "current_week_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_current_week';
break
}
case "current_month_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_current_month';
break
}
case "last_month_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_last_month';
break
}
case "monthly_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_last30_day';
break
}
case "current_year_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_current_year';
break
}
case "all_usr":{
this.value_time=[]
this.dataUrl = '../api/v1/query_user_all';
break
}
}
};

this.$axios.get(this.dataUrl,{
params:this.params
}).then((res)=>{
this.tableData = res.data.data
// console.log("res.data:"+res.data.data)
this.totalNum = res.data.count
})

},
searchName(){
this.params.userName = this.search
this.params.page = 1
this.page=1
this.getUserList(this.type_val, this.dynamic)

},
tableHeaderStyle({row,column,rowIndex,columnIndex}){
if(rowIndex===0){
return 'background:#f5f5f6;color:#606266'
}
},
cellStyle({row,column,rowIndex,columnIndex}){
if(rowIndex%2 === 1){
return 'background:#f5f5f6;color:#606266'
}
},

},
filters:{
rounding (value) {
return Number(value).toFixed(2)
},
roundingToHour (value) {
return (Number(value)/3600).toFixed(2)
},
transformTimestamp(timestamp){
let a = new Date(timestamp*1000);
const date = new Date(a);
const Y = date.getFullYear() + '/';
const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '/';
const D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate()) + ' ';
const h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours()) + ':';
const m = (date.getMinutes() <10 ? '0'+date.getMinutes() : date.getMinutes());// + ':' ;
// const s = (date.getSeconds() <10 ? '0'+date.getSeconds() : date.getSeconds()) ; // 秒
const dateString = Y + M + D + h + m ;//+ s;
return dateString;
},
},
mounted() {
// document.getElementById("all_usr").style.outline="none"
// document.getElementById("all_usr").focus()
this.getUpdateTime()
this.getUserList("all_usr",7)
},
created() {
},
watch:{
search(val){
if(!val){
this.params.userName = this.search
this.params.page = 1
this.page=1
this.getUserList(this.type_val, this.dynamic)
}
}
},
}
</script>

<style scoped>
.pro_item{
font-size: 16px;
color: rgba(16, 16, 16, 100);
font-family: SourceHanSansSC-bold;
}
.sta_item{
font-size: 14px;
color: rgb(0 0 0);
font-family: SourceHanSansSC-bold;
}
.update_time{
line-height: 17px;
font-size: 12px;
color:rgba(187, 187, 187, 100);
margin-left: 10px;
}
/* .btn{
line-height: 1.5;
margin: -3px;
border: 1px solid #409effd6;
background: #FFFF;
color: #409eff;
width: 60px;
height: 30px;
border-radius:4px ;
} */
.btnFirst{
line-height: 1.5;
margin: -3.5px;
border: 1px solid rgba(22, 132, 252, 100);
border-right: none;
background: #FFFF;
color: #1684FC;
width: 60px;
height: 30px;
border-radius:4px 0px 0px 4px;
}
.btn{
line-height: 1.5;
margin: -3.5px;
border: 1px solid rgba(22, 132, 252, 100);
border-right: none;
background: #FFFF;
color: #1684FC;
width: 60px;
height: 30px;
}
.btnLast{
line-height: 1.5;
margin: -3.5px;
border: 1px solid rgba(22, 132, 252, 100);
/* border-right: none; */
background: #FFFF;
color: #1684FC;
width: 60px;
height: 30px;
border-radius:0px 4px 4px 0px;
}
.btnFirst,.btn,.btnLast {
cursor: pointer;
}


/* .btn:focus,
.btn:active{
background-color:#409effd6 ;
} */
/* /deep/ .el-date-picker {
width: 220px;
} */
/deep/ .el-table {
font-size: 12px;
}
/deep/ .el-table tbody tr:hover>td {
background-color:#D3D3D3!important;
opacity:1
}
/deep/ .el-range-separator{
width: 20% !important;
}

.colorChange {
background-color: #1684FC;
color: #FFFF;
cursor: default;
}

</style>

+ 5
- 0
web_src/js/components/UserTrend.vue View File

@@ -0,0 +1,5 @@
<template>
<div class="el-col el-col-21" style="padding-right:10px ">

</div>
</template>

+ 0
- 1
web_src/js/index.js View File

@@ -38,7 +38,6 @@ import EditAboutInfo from './components/EditAboutInfo.vue';
// import Images from './components/Images.vue';
import EditTopics from './components/EditTopics.vue';
import DataAnalysis from './components/DataAnalysis.vue'
import DataAnalysis1 from './components/DataAnalysis1.vue'
import Contributors from './components/Contributors.vue'
import Model from './components/Model.vue';
import WxAutorize from './components/WxAutorize.vue'


+ 19
- 7
web_src/js/router/index.js View File

@@ -1,31 +1,43 @@
import Vue from 'vue'
import Router from 'vue-router'
import DataAnalysis1 from '../components/DataAnalysis1.vue'
import DataAnalysis from '../components/DataAnalysis.vue'
import ProAnalysis from '../components/ProAnalysis.vue'
import ProTend from '../components/ProTend.vue'
import ProTrend from '../components/ProTrend.vue'
import UserTrend from '../components/UserTrend.vue'
import UserAnalysis from '../components/UserAnalysis.vue'
import BrainAnalysis from '../components/BrainAnalysis.vue'
import Overview from '../components/Overview.vue'

const originalPush = Router.prototype.push

Router.prototype.push = function push(location) {
return originalPush.call(this, location).catch(err => err)
}
Vue.use(Router)

export default new Router({
routes:[
{
path:'/',
name:'ProAnalysis',
component:ProAnalysis,
},

{
path:'/overview',
name:'overview',
component:Overview,
},
{
path:'/ProTrend',
name:'ProTrend',
component:ProTrend,
},
{
path:'/ProAnalysis',
name:'ProAnalysis',
component:ProAnalysis,
},
{
path:'/ProTend',
name:'ProTend',
component:ProTend,
},
{
path:'/UserAnalysis',
name:'UserAnalysis',


Write Preview
Loading…
Cancel
Save