diff --git a/public/img/overview_rgb.svg b/public/img/overview_rgb.svg new file mode 100644 index 000000000..1a1257e23 --- /dev/null +++ b/public/img/overview_rgb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/pro_rgb.svg b/public/img/pro_rgb.svg new file mode 100644 index 000000000..2110c2115 --- /dev/null +++ b/public/img/pro_rgb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/user_rgb.svg b/public/img/user_rgb.svg new file mode 100644 index 000000000..e5cf24cf0 --- /dev/null +++ b/public/img/user_rgb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web_src/js/components/DataAnalysis.vue b/web_src/js/components/DataAnalysis.vue index 026c02bd1..ae536db28 100755 --- a/web_src/js/components/DataAnalysis.vue +++ b/web_src/js/components/DataAnalysis.vue @@ -3,7 +3,7 @@ - + 概览 @@ -13,14 +13,14 @@ - + 项目分析 - + 用户分析 @@ -121,6 +121,14 @@ /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%) + } \ No newline at end of file diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue index 817c1a12c..074f8e326 100755 --- a/web_src/js/components/ProAnalysis.vue +++ b/web_src/js/components/ProAnalysis.vue @@ -1085,6 +1085,12 @@ return data[0]+''+data[1]+''+data[2] } }, + goBack(){ + if( $("#pro_detail").is(':visible') ){ + document.getElementById("pro_main").style.display = "block"; + document.getElementById("pro_detail").style.display = "none"; + } + }, }, filters:{ @@ -1125,7 +1131,7 @@ return " " +value.user+ "" } - }, + }, }, @@ -1140,6 +1146,10 @@ this.radarOpenI = this.$echarts.init(document.getElementById('radar_openi')) this.echartsOITd = this.$echarts.init(document.getElementById('line_openi')) this.echartsSelectData = this.$echarts.init(document.getElementById('selectData')) + if (window.history && window.history.pushState) { + history.pushState(null, null, document.URL); + window.addEventListener('popstate', this.goBack, false); + } // window.onresize=function(){ // this.radarOpenI.resize(); // this.echartsOITd.resize();