Skip to content

Z
zhichan
Commit be5e1dfa by 蒋勇
Options

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

parents 3421bcec 5846b654
Showing with 215 additions and 33 deletions
ipop-web/app/base/service/impl/patentycSve.js
...@@ -8590,7 +8590,7 @@ class PatentycService extends ServiceBase { ...@@ -8590,7 +8590,7 @@ class PatentycService extends ServiceBase {
url = "http://118.24.142.85:81/ezGet.aspx?type=xlsx&guid=" + obj.uid; url = "http://118.24.142.85:81/ezGet.aspx?type=xlsx&guid=" + obj.uid;
} }
else if (obj.type == "html") { else if (obj.type == "html") {
url = 'http://118.24.142.85:81/ezPicture.aspx?guid=' + obj.uid; url = 'http://118.24.142.85:81/ezPictureL.aspx?guid=' + obj.uid;
} }
if (url) { if (url) {
return url; return url;
...@@ -8833,10 +8833,10 @@ class PatentycService extends ServiceBase { ...@@ -8833,10 +8833,10 @@ class PatentycService extends ServiceBase {
"arrt1":[], "arrt1":[],
"arrt2":[] "arrt2":[]
}; };
var max = 5; // var max = 5;
if (arr3.length < 5) { // if (arr3.length < 5) {
max = arr3.length; // max = arr3.length;
} // }
for (var i in arr1) { for (var i in arr1) {
if (arr3.indexOf(arr1[i]) > -1) { if (arr3.indexOf(arr1[i]) > -1) {
...@@ -8941,11 +8941,11 @@ class PatentycService extends ServiceBase { ...@@ -8941,11 +8941,11 @@ class PatentycService extends ServiceBase {
} }
rtnlist.arrt1.push(temp1) rtnlist.arrt1.push(temp1)
rtnlist.arrt2.push(temp2); rtnlist.arrt2.push(temp2);
max--; // max--;
}
if (max <= 0) {
break;
} }
// if (max <= 0) {
// break;
// }
} }
return rtnlist; return rtnlist;
} }
......
ipop-web/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
ipop-web/app/front/entry/public/css/patentyc.css
...@@ -562,7 +562,7 @@ hr { ...@@ -562,7 +562,7 @@ hr {
text-align:left; text-align:left;
} }
.patentanalysis-wrap{ .patentanalysis-wrap{
border-top:1px solid #e6e6e6; /* border-top:1px solid #e6e6e6; */
padding-left: 200px; padding-left: 200px;
} }
.patentanalysis-leftpart{ .patentanalysis-leftpart{
......
ipop-web/app/front/entry/public/js/index.js
...@@ -152,6 +152,8 @@ axios.get("/vue/comp/base").then(function(res){ ...@@ -152,6 +152,8 @@ axios.get("/vue/comp/base").then(function(res){
homeType: true, homeType: true,
navarr:[ navarr:[
{ {
name:'首页'
},{
name:'智能检索' name:'智能检索'
},{ },{
name:'智能分析' name:'智能分析'
...@@ -225,8 +227,10 @@ axios.get("/vue/comp/base").then(function(res){ ...@@ -225,8 +227,10 @@ axios.get("/vue/comp/base").then(function(res){
}, },
}), }),
created(){ created(){
/*let navarr = [ let navarr = [
{ {
name:'首页'
},{
name:'智能检索' name:'智能检索'
},{ },{
name:'智能分析' name:'智能分析'
...@@ -258,28 +262,35 @@ axios.get("/vue/comp/base").then(function(res){ ...@@ -258,28 +262,35 @@ axios.get("/vue/comp/base").then(function(res){
name: '更多', name: '更多',
obj: [] obj: []
}; };
let clientWidth = document.body.clientWidth - 400;
for(let i=0; i<navarr.length; i++) { for(let i=0; i<navarr.length; i++) {
if ((i * 124) <= document.body.clientWidth) { if ((i * 124) <= clientWidth) {
that.navarr.push(navarr[i]) that.navarr.push(navarr[i])
}else { }else {
a.obj.push(navarr[i]) a.obj.push(navarr[i].name)
}
if (a.obj.length > 0) {
that.navarr.push(a)
} }
}; };
if (a.obj.length > 0) {
that.navarr.push(a)
};
$(window).resize(function(){ $(window).resize(function(){
for(var i=0; i<navarr.length; i++) { that.navarr = [];
if ((i * 124) <= document.body.clientWidth) { let a = {
name: '更多',
obj: []
};
let clientWidth = document.body.clientWidth - 400;
for(let i=0; i<navarr.length; i++) {
if ((i * 124) <= clientWidth) {
that.navarr.push(navarr[i]) that.navarr.push(navarr[i])
}else { }else {
a.obj.push(navarr[i]) a.obj.push(navarr[i].name)
}
if (a.obj.length > 0) {
that.navarr.push(a)
} }
};
if (a.obj.length > 0) {
that.navarr.push(a)
} }
})*/ })
var url = window.location.href; var url = window.location.href;
var arr1 = url.split("/#"); var arr1 = url.split("/#");
var titleValue = ""; var titleValue = "";
......
ipop-web/app/front/vues/pages/enterprisecontrast/enterprisecontrast.css
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
text-stroke:1px rgba(255,0,0,1); text-stroke:1px rgba(255,0,0,1);
} }
.con_left { .con_left {
margin-top: 5.3vh; margin-top: 3vh;
float: left; float: left;
width: 46.8%; width: 46.8%;
height: 78vh; height: 78vh;
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
z-index: -1; z-index: -1;
} }
.con_right { .con_right {
margin-top: 5.3vh; margin-top: 3vh;
float: right; float: right;
width: 46.8%; width: 46.8%;
height: 78vh; height: 78vh;
...@@ -216,4 +216,18 @@ ...@@ -216,4 +216,18 @@
height: 21.3vh; height: 21.3vh;
background: url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_4197159746069577320201511455773图层6 拷贝.png') no-repeat; background: url('https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_4197159746069577320201511455773图层6 拷贝.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
}
.fenye_lhd {
width: 150px;
position: absolute;
bottom: 10px;
left: calc(50% - 75px);
font-size: 16px;
display: flex;
flex-direction: row;
justify-content: space-between;
z-index: 9999;
}
.fenye_lhd span {
cursor: pointer;
} }
\ No newline at end of file
ipop-web/app/front/vues/pages/enterprisecontrast/enterprisecontrast.html
...@@ -67,5 +67,8 @@ ...@@ -67,5 +67,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="fenye_lhd">
<span @click="shang">上一页</span>{{pageSize/5 + 1}}/{{Math.ceil(arrt1.length / 5)}}<span @click="xia">下一页</span>
</div>
<div class="bar_lhd"></div> <div class="bar_lhd"></div>
</div> </div>
\ No newline at end of file
ipop-web/app/front/vues/pages/enterprisecontrast/enterprisecontrast.js
...@@ -11,7 +11,11 @@ ...@@ -11,7 +11,11 @@
'background:linear-gradient(270deg,rgba(252,219,0,1) 0%,rgba(247,181,0,1) 100%);','background:linear-gradient(270deg,rgba(121,237,220,1) 0%,rgba(28,240,154,1) 100%);' 'background:linear-gradient(270deg,rgba(252,219,0,1) 0%,rgba(247,181,0,1) 100%);','background:linear-gradient(270deg,rgba(121,237,220,1) 0%,rgba(28,240,154,1) 100%);'
], ],
arr1: [], arr1: [],
arr2: [] arr2: [],
pageSize: 0,
arrLength: 0,
arrt1: [],
arrt2: []
} }
}, },
mounted:function(){ mounted:function(){
...@@ -32,6 +36,24 @@ ...@@ -32,6 +36,24 @@
params:{entName: this.name2} params:{entName: this.name2}
}); });
}, },
shang() {
if (this.pageSize > 0) {
this.pageSize = this.pageSize - 5;
this.arr1 = this.arrt1.slice(this.pageSize, this.pageSize + 5);
this.arr2 = this.arrt2.slice(this.pageSize, this.pageSize + 5);
}else {
console.log('没有了')
}
},
xia() {
if (this.arrLength > (this.pageSize + 5)) {
this.pageSize = this.pageSize + 5;
this.arr1 = this.arrt1.slice(this.pageSize, this.pageSize + 5);
this.arr2 = this.arrt2.slice(this.pageSize, this.pageSize + 5);
}else {
console.log('没有了')
}
},
analysisInfo(){ analysisInfo(){
var obj={company1:"", company2: '', keyword1: '', keyword2: ''}; var obj={company1:"", company2: '', keyword1: '', keyword2: ''};
if(this.name1 && this.name2 && this.text1 && this.text2){ if(this.name1 && this.name2 && this.text1 && this.text2){
...@@ -46,8 +68,13 @@ ...@@ -46,8 +68,13 @@
this.$root.getReq("web/patentycCtl/competitionAnalysisContex",obj).then(d=>{ this.$root.getReq("web/patentycCtl/competitionAnalysisContex",obj).then(d=>{
console.log(d); console.log(d);
if(d && d.status==0){ if(d && d.status==0){
this.arr1 = d.data.arrt1; this.arrLength = d.data.arrt1.length;
this.arr2 = d.data.arrt2; this.arrt1 = d.data.arrt1;
this.arrt2 = d.data.arrt2;
this.arr1 = d.data.arrt1.slice(this.pageSize, this.pageSize + 5);
this.arr2 = d.data.arrt2.slice(this.pageSize, this.pageSize + 5);
} }
this.$root.hideMask(); this.$root.hideMask();
}).catch(e=>{ }).catch(e=>{
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.css
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.yuan {
display: inline-block;
width: 4px;
height: 4px;
border-radius: 50%;
background-color: #fff;
margin-right: 10px;
}
.activeMenu8-title { .activeMenu8-title {
width: 100%; width: 100%;
line-height: 60px; line-height: 60px;
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.html
<div class="patentanalysis"> <div class="patentanalysis">
<div class="patentanalysis-wrap"> <div class="patentanalysis-wrap">
<div class="patentanalysis-leftpart"> <div class="patentanalysis-leftpart">
<el-menu :default-active="activeMenu" style="border-right: solid 1px #ffffff" @select="handleSelect"> <!-- <el-menu :default-active="activeMenu" style="border-right: solid 1px #ffffff" @select="handleSelect">
<el-menu-item v-for="(item,index) in dimensionList" :index="index" :key="index" class="patentanalysis-menu" > <el-menu-item v-for="(item,index) in dimensionList" :index="index" :key="index" class="patentanalysis-menu" >
<!-- <i class="el-icon-menu"></i> --> <i class="el-icon-menu"></i>
<span slot="title" >{{item.name}}</span> <span slot="title" >{{item.name}}</span>
</el-menu-item> </el-menu-item>
</el-menu> -->
<el-menu
default-active="activeMenu"
class="el-menu-vertical-demo"
@select="handleSelect"
background-color="#1e1e28"
text-color="#fff"
style="height: 100%;"
active-text-color="#00C1DE">
<el-menu-item index="0">
<i class="el-icon-news"></i>
<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> </el-menu>
</div> </div>
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.js
...@@ -476,7 +476,99 @@ ...@@ -476,7 +476,99 @@
"rgb(33,150,243)","rgb(76,175,80)","rgb(205,220,57)","rgb(255,235,59)","rgb(255,193,7)", "rgb(33,150,243)","rgb(76,175,80)","rgb(205,220,57)","rgb(255,235,59)","rgb(255,193,7)",
"rgb(255,152,0)","rgb(255,87,34)","rgb(121,85,72)","rgb(158,158,158)","rgb(96,125,139)" "rgb(255,152,0)","rgb(255,87,34)","rgb(121,85,72)","rgb(158,158,158)","rgb(96,125,139)"
], ],
dimensionList: [ dimensionListObj:[
{
name: "申请人分析",
list: [
{ code: "", name: "申请人排名" },
{ code: "", name: "申请人归属国分布" },
{ code: "", name: "申请人IPC分布" },
{ code: "", name: "申请人专利类型分布" },
{ code: "", name: "申请人专利法律效力" },
{ code: "", name: "申请人发明授权率" },
{ code: "", name: "申请人申请趋势分析" }
]
},
{
name: "发明人分析",
list: [
{ code: "", name: "发明人排名" },
{ code: "", name: "主要发明人技术构成" },
{ code: "", name: "主要发明人专利类型分布" },
{ code: "", name: "主要发明人专利法律效力" },
{ code: "", name: "主要发明人申请趋势" },
{ code: "", name: "主要发明人公开趋势" },
]
},
{
name: "区域分析",
list: [
{ code: "", name: "申请人归属国分布" },
{ code: "", name: "全国专利分布" },
{ code: "", name: "各国专利分布" },
{ code: "", name: "外国在华申请分布" },
{ code: "", name: "主要国家IPC分布" },
{ code: "", name: "主要国家申请趋势" },
]
},
{
name: "技术结构分析",
list: [
{ code: "", name: "专利IPC分析" },
{ code: "", name: "外观设计分类分析" },
{ code: "", name: "外国在华专利IPC分布" },
{ code: "", name: "技术领先国家IPC分布" },
{ code: "", name: "发明专利IPC分布" },
{ code: "", name: "主要IPC趋势分析" },
]
},
{
name: "趋势分析",
list: [
{ code: "", name: "申请趋势" },
{ code: "", name: "公开趋势" },
{ code: "", name: "授权趋势" },
]
},
{
name: "法律状态分析",
list: [
{ code: "", name: "各专利类型分布" },
{ code: "", name: "法律效力分布" },
{ code: "", name: "当前法律状态分布" },
{ code: "", name: "授权状态分布" },
{ code: "", name: "各专利类型申请趋势" },
{ code: "", name: "各专利类型公开趋势" },
]
},
{
name: "代理人/机构分析",
list: [
{ code: "", name: "代理机构排名" },
{ code: "", name: "代理机构专利申请趋势" },
{ code: "", name: "代理机构专利类型分布" },
{ code: "", name: "代理机构发明授权率" },
{ code: "", name: "代理机构IPC分布" },
{ code: "", name: "代理人排名" },
{ code: "", name: "主要代理人专利类型分布" },
]
},
],
dimensionList2: [
{
name: "智能报告",
icon: 'el-icon-tickets'
},
{
name: "智能可视化",
icon: 'el-icon-view'
},
{
name: "智能报表",
icon: 'el-icon-document'
}
],
dimensionList:[
{ {
name: "首页", name: "首页",
}, },
...@@ -563,7 +655,7 @@ ...@@ -563,7 +655,7 @@
name: "分析可视化", name: "分析可视化",
} }
], ],
activeMenu: 0, activeMenu: '0',
menuItem: "0", menuItem: "0",
echartActive: "0", echartActive: "0",
ipcActive: "3", ipcActive: "3",
...@@ -2733,7 +2825,8 @@ ...@@ -2733,7 +2825,8 @@
} }
}, },
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
this.activeMenu = key; console.log(key, keyPath);
this.activeMenu = key.toString();
this.menuItem = "0"; this.menuItem = "0";
this.echartActive = "0"; this.echartActive = "0";
this.ipcActive = "3"; this.ipcActive = "3";
......
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