Skip to content

Z
zhichan
Commit db0b39ef by v_vjyjiang
Options

Merge branch 'ipop-web' of gitlab.gongsibao.com:jiangyong/zhichan into ipop-web

parents ad4f6bf0 a8dbd937
Showing with 55 additions and 22 deletions
ipop-web/app/front/vues/pages/iframehtml/iframehtml.js
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
} }
}, },
mounted:function(){ mounted:function(){
console.log(this.$root.currentUser, '调用方法');
var url = this.$router.history.current.query.url; var url = this.$router.history.current.query.url;
if(url){ if(url){
url = decodeURIComponent(url); url = decodeURIComponent(url);
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.html
...@@ -15,21 +15,28 @@ ...@@ -15,21 +15,28 @@
text-color="#fff" text-color="#fff"
style="height: 100%;" style="height: 100%;"
active-text-color="#00C1DE"> active-text-color="#00C1DE">
<el-menu-item index="0"> <el-menu-item index="0">
<i class="el-icon-news"></i> <i class="el-icon-news"></i>
<span slot="title">首页</span> <span slot="title">首页</span>
</el-menu-item>
<el-submenu index="1">
<template slot="title">
<i class="el-icon-date"></i>
<span>智能统计</span>
</template>
<el-menu-item v-for="(item,index) in dimensionListObj" :index="index + 1" :key="index + 1" ><i class="yuan"></i>{{item.name}}</el-menu-item>
</el-submenu>
<el-menu-item v-for="(item,index) in dimensionList2" :index="index + 8" :key="index + 8">
<i :class="item.icon"></i>
<span slot="title">{{item.name}}</span>
</el-menu-item> </el-menu-item>
<el-submenu index="1"> <el-submenu index="9">
<template slot="title"> <template slot="title">
<i class="el-icon-date"></i> <i class="el-icon-view"></i>
<span>智能统计</span> <span>智能可视化</span>
</template> </template>
<el-menu-item v-for="(item,index) in dimensionListObj" :index="index + 1" :key="index + 1" ><i class="yuan"></i>{{item.name}}</el-menu-item> <el-menu-item v-for="(item,index) in dimensionListObj1" :index="index + 10" :key="index + 10" ><i class="yuan"></i>{{item.name}}</el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item v-for="(item,index) in dimensionList2" :index="index + 8" :key="index + 8">
<i :class="item.icon"></i>
<span slot="title">{{item.name}}</span>
</el-menu-item>
</el-menu> </el-menu>
</div> </div>
...@@ -2234,6 +2241,7 @@ ...@@ -2234,6 +2241,7 @@
</div> </div>
</div> </div>
<div v-if="activeMenu==\'8\'" class="activeMenu8"> <div v-if="activeMenu==\'8\'" class="activeMenu8">
<div v-if="search">
<div v-if="echarts" style="min-width: 1200px;"> <div v-if="echarts" style="min-width: 1200px;">
<div class="activeMenu8-title"><i class="el-icon-setting"></i>分析报告设置</div> <div class="activeMenu8-title"><i class="el-icon-setting"></i>分析报告设置</div>
<div class="activeMenu8-main"> <div class="activeMenu8-main">
...@@ -2279,11 +2287,18 @@ ...@@ -2279,11 +2287,18 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-else class="no-result" style="text-align:center;margin-top: 200px">
<div class="zipImg"><span class="zipSpan" @click="tiaozhan"></span></div>
</div>
</div> </div>
<div v-if="activeMenu==\'9\'"> <div v-if="activeMenu >= \'10\'">
<div> <div v-if="search">
<iframe id="bdIframe" :src="srcIframe" frameborder="0" width="100%" height="1000"></iframe> <iframe id="bdIframe" :src="srcIframe" frameborder="0" width="100%" height="1000"></iframe>
</div> </div>
<div v-else class="no-result" style="text-align:center;margin-top: 200px">
<div class="zipImg"><span class="zipSpan" @click="tiaozhan"></span></div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.js
...@@ -560,14 +560,29 @@ ...@@ -560,14 +560,29 @@
icon: 'el-icon-tickets' icon: 'el-icon-tickets'
}, },
{ {
name: "智能可视化", name: "智能报表",
icon: 'el-icon-document'
}
],
dimensionListObj1:[
{
name: "主题分析",
icon: 'el-icon-tickets'
},
{
name: "演化分析",
icon: 'el-icon-view' icon: 'el-icon-view'
}, },
{ {
name: "智能报表", name: "关联分析",
icon: 'el-icon-document'
},
{
name: "合著分析",
icon: 'el-icon-document' icon: 'el-icon-document'
} }
], ],
method: '',
dimensionList:[ dimensionList:[
{ {
name: "首页", name: "首页",
...@@ -2846,7 +2861,9 @@ ...@@ -2846,7 +2861,9 @@
this.agentRank(); this.agentRank();
}else if (this.activeMenu == "8") { }else if (this.activeMenu == "8") {
this.returnsPage(); this.returnsPage();
}else if (this.activeMenu == "9") { }else if (this.activeMenu >= "10") {
console.log(this.dimensionListObj1[key - 10].name);
this.method = this.dimensionListObj1[key - 10].name;
this.ezReportUploadData(); this.ezReportUploadData();
setTimeout(()=> {this.reinitIframe()}, 3000); setTimeout(()=> {this.reinitIframe()}, 3000);
} }
...@@ -7042,7 +7059,7 @@ ...@@ -7042,7 +7059,7 @@
var params = { search: this.search, obj: this.obj }; var params = { search: this.search, obj: this.obj };
const loadingbyc = this.$loading({ const loadingbyc = this.$loading({
lock: true, lock: true,
text: 'Loading', text: 'Loading',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
...@@ -7067,7 +7084,7 @@ ...@@ -7067,7 +7084,7 @@
var params = { "uid": that.dataUid }; var params = { "uid": that.dataUid };
const loadingbyc = this.$loading({ const loadingbyc = this.$loading({
lock: true, lock: true,
text: 'Loading', text: '报告生成中...',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
...@@ -7094,7 +7111,7 @@ ...@@ -7094,7 +7111,7 @@
ezGetReport() { ezGetReport() {
var that=this; var that=this;
console.log("--------分析可视化后------------"); console.log("--------分析可视化后------------");
var params = { "uid": that.dataUid, "type": 'html' }; var params = { "uid": that.dataUid, "type": 'html', method: this.method };
this.$root.postReq("web/patentycCtl/ezGetReport",params).then(function (d) { this.$root.postReq("web/patentycCtl/ezGetReport",params).then(function (d) {
console.log("---------------------------------------------"); console.log("---------------------------------------------");
console.log(d); console.log(d);
......
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