Skip to content

Z
zhichan
Commit 5ea39fe6 by 王勇飞
Options

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

parents f24f684a 53be325c
Showing with 90 additions and 16 deletions
ipop-web/app/front/entry/main.ejs
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<body> <body>
<div id="app" v-loading="loading" class="app-main" style="visibility: hidden"> <div id="app" v-loading="loading" class="app-main" style="visibility: hidden">
<div id="header" :class="typeHome ? 'app-headerHome' : 'app-header'"> <div id="header" :class="typeHome ? 'app-headerHome' : 'app-header'">
<el-row style="border-bottom:none;padding: 0px"> <el-row style="border-bottom:none;padding: 0px;min-width: 1244px;">
<el-col :span="4" style="min-width:205px;text-align: center;"> <el-col :span="4" style="min-width:205px;text-align: center;">
<!-- <el-button type="text" style="font-size:24px;font-size: 0.24rem;" @click="navRoute('首页')">知识产权运营平台</el-button> --> <!-- <el-button type="text" style="font-size:24px;font-size: 0.24rem;" @click="navRoute('首页')">知识产权运营平台</el-button> -->
<img v-if="typeHome" style="margin-top: 14px;margin-left: 32px;cursor: pointer;" @click="NavIndexRoute('首页')" src="/imgs/home/logoimg1.png" alt=""> <img v-if="typeHome" style="margin-top: 14px;margin-left: 32px;cursor: pointer;" @click="NavIndexRoute('首页')" src="/imgs/home/logoimg1.png" alt="">
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.css
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.activeMenu8-main-right { .activeMenu8-main-right {
min-width: 190px;
min-height: 495px; min-height: 495px;
float: left; float: left;
margin-left: 30px; margin-left: 30px;
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.html
...@@ -2256,9 +2256,9 @@ ...@@ -2256,9 +2256,9 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="activeMenu==\'9\'" class="activeMenu8"> <div v-if="activeMenu==\'9\'">
<div style="min-width: 1200px;"> <div>
<iframe name="midFraim" id="midFraim" src="http://118.24.142.85:81/ezPicture.aspx?method=%E6%99%BA%E8%83%BD%E5%8F%AF%E8%A7%86%E5%8C%96&guid=5c85c50a-c57c-401c-b534-2a78facd0d0d" frameborder="0" width="100%"></iframe> <iframe id="bdIframe" :src="srcIframe" frameborder="0" width="100%" height="1000"></iframe>
</div> </div>
</div> </div>
</div> </div>
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.js
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
return { return {
dataUid: '735f9cd0-c103-11ea-9ecd-1d1c3e85a974',
timer: 0,
srcIframe: '',
echartsArr:[ echartsArr:[
{ {
echartsRef: 'echarts0', echartsRef: 'echarts0',
...@@ -2094,9 +2097,7 @@ ...@@ -2094,9 +2097,7 @@
} }
}, },
mounted: function() { mounted: function() {
window.onresize = function(){
this.changeMobsfIframe()
}
}, },
created: function() { created: function() {
console.log('wslhd'); console.log('wslhd');
...@@ -2109,13 +2110,6 @@ ...@@ -2109,13 +2110,6 @@
console.log(this.obj); console.log(this.obj);
}, },
methods: { methods: {
changeMobsfIframe(){
const mobsf = document.getElementById('midFraim');
const deviceWidth = document.body.clientWidth;
const deviceHeight = document.body.clientHeight;
console.log(mobsf,'????????????????????');
mobsf.height = (Number(deviceHeight)-0) + 'px';
},
tiaozhan() { tiaozhan() {
this.$root.pushx({ this.$root.pushx({
name:"/patentsimplesearch", name:"/patentsimplesearch",
...@@ -2760,9 +2754,18 @@ ...@@ -2760,9 +2754,18 @@
}else if (this.activeMenu == "8") { }else if (this.activeMenu == "8") {
this.returnsPage(); this.returnsPage();
}else if (this.activeMenu == "9") { }else if (this.activeMenu == "9") {
this.changeMobsfIframe(); this.ezReportUploadData();
setTimeout(()=> {this.reinitIframe()}, 3000);
} }
}, },
reinitIframe(){
var iframe = document.getElementById("bdIframe");
console.log(iframe);
const deviceHeight = document.documentElement.clientHeight;
iframe.style.height = (Number(deviceHeight)-70) + 'px';
console.log(deviceHeight)
},
/*同一纬度下不同角度的分析切换 */ /*同一纬度下不同角度的分析切换 */
styleset(index){ styleset(index){
if (this.menuItem == index) { if (this.menuItem == index) {
...@@ -6939,6 +6942,77 @@ ...@@ -6939,6 +6942,77 @@
} }
}); });
}, },
/*分析可视化*/
ezReportUploadData(){
var that=this;
console.log("--------分析可视化前------------");
var params = { search: this.search, obj: this.obj };
const loadingbyc = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.$root.postReq("web/patentycCtl/ezReportUploadData",params).then(function (d) {
console.log("---------------------------------------------");
console.log(d);
loadingbyc.close();
if(d.status == 0 && d.data){
that.dataUid=d.data.uid;
that.ReadyReport()
/*that.timer = setInterval(that.ReadyReport(), 1000);*/
}else{
that.$message.error('分析失败,请重试!');
that.agentRankShow=false;
}
});
},
ReadyReport() {
var that=this;
console.log("--------分析可视化中------------");
var params = { "uid": that.dataUid };
const loadingbyc = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.timer++;
console.log(this.timer,'ssssssssssssssssssssss');
this.$root.postReq("web/patentycCtl/ReadyReport",params).then(function (d) {
console.log("---------------------------------------------");
console.log(d);
if(d.status == 0){
loadingbyc.close();
/*clearInterval(that.timer);*/
that.ezGetReport()
}else{
if (that.timer == 20) {
loadingbyc.close();
return that.$message.error('分析失败,请重试!');
};
setTimeout(()=> {that.ReadyReport()}, 10000);
that.agentRankShow=false;
}
});
},
ezGetReport() {
var that=this;
console.log("--------分析可视化后------------");
var params = { "uid": that.dataUid, "type": 'html' };
this.$root.postReq("web/patentycCtl/ezGetReport",params).then(function (d) {
console.log("---------------------------------------------");
console.log(d);
if(d.status == 0){
that.srcIframe = d.data;
}else{
that.agentRankShow=false;
}
});
},
/*代理人/机构分析-代理机构专利申请趋势*/ /*代理人/机构分析-代理机构专利申请趋势*/
agentApplyTrend(){ agentApplyTrend(){
var that=this; var that=this;
......
ipop-web/package.json
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
"sequelize-cli": "^4.1.1", "sequelize-cli": "^4.1.1",
"serve-favicon": "^2.4.5", "serve-favicon": "^2.4.5",
"sha1": "^1.1.1", "sha1": "^1.1.1",
"soap": "^0.31.0",
"socket.io": "^2.1.1", "socket.io": "^2.1.1",
"uuid": "^3.2.1", "uuid": "^3.2.1",
"weixin-pay": "^1.1.7", "weixin-pay": "^1.1.7",
......
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