Skip to content

Z
zhichan
Commit 5c0b0f5d by 蒋勇
Options

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

parents 20606d21 41aa343f
Showing with 350 additions and 35 deletions
ipop-web/app/base/controller/impl/patentycCtl.js 100644 → 100755
......@@ -115,6 +115,36 @@ class PatentycCtl extends CtlBase {
}
}
async aminerpapers(pobj,obj,req){//热门文献
try{
var result = await this.service.aminerpapers(obj);
if (result){
return System.getResult2(result);
}
else{
return System.getErrResult2("返回结果为空");
}
}
catch(error){
return System.getErrResult2(error);
}
}
async aminerarticle(pobj,obj,req){//热门科技咨询
try{
var result = await this.service.aminerarticle(obj);
if (result){
return System.getResult2(result);
}
else{
return System.getErrResult2("返回结果为空");
}
}
catch(error){
return System.getErrResult2(error);
}
}
//智能组合分析-获取报告
async ezGetReport(pobj,obj,req){
if (obj.uid && obj.uid != 'undefined' && obj.type && obj.type != 'undefined'){
......
ipop-web/app/base/db/metadata/apps/platform.js
......@@ -119,6 +119,14 @@ module.exports = {
"path": ""
},
{
"code": "iframehtmlTabs",
"icon": "fa fa-search",
"label": "网页嵌入",
"bizCode": "iframehtmlTabs",
"bizConfig": null,
"path": ""
},
{
"code": "competitiveanalysis",
"icon": "fa fa-search",
"label": "竞争企业分析",
......@@ -138,6 +146,7 @@ module.exports = {
},
"bizs": {
"iframehtml": {"title": "网页嵌入", "config": null, "path": "/iframehtml", "comname": "iframehtml"},
"iframehtmlTabs": {"title": "网页嵌入", "config": null, "path": "/iframehtmlTabs", "comname": "iframehtmlTabs"},
"competitiveanalysis": {"title": "竞争企业分析", "config": null, "path": "/competitiveanalysis", "comname": "competitiveanalysis"},
"enterprisecontrast": {"title": "竞争企业分析", "config": null, "path": "/enterprisecontrast", "comname": "enterprisecontrast"},
"home": {"title": "首页", "config": null, "path": "/", "comname": "home"},
......
ipop-web/app/base/service/impl/patentycSve.js 100644 → 100755
......@@ -59,6 +59,64 @@ class PatentycService extends ServiceBase {
}
};
async aminerpapers(obj){//热门文献
try{
var size = obj.size == null ? 3 : obj.size;
var params = {
size: size,
offset: 0
};
var data=querystring.stringify(params);
var rc = System.getObject("util.restClient");
var rtn=await rc.execGet(data,"https://lab.aminer.cn/eitools/search/arxiv/papers/");
return JSON.parse(rtn.stdout);
}
catch(e){
console.log("eeeeeeeeeeeeeeeeeeeeee",e);
return null;
}
};
// async aminerpapers(obj){//热门文献
// try{
// var size = obj.size == null ? 3 : obj.size;
// var params = {
// size: size,
// offset: 0
// };
// var data=querystring.stringify(params);
// var rc = System.getObject("util.restClient");
// var rtn=await rc.execGet(data,"https://lab.aminer.cn/eitools/search/arxiv/papers");
// return JSON.parse(rtn.stdout);
// }
// catch{
// return null;
// }
// };
async aminerarticle(obj){//热门科技咨询
try{
var num = obj.num == null ? 3 : obj.num;
var params = {
//num: num,
//offset: 0
};
console.log("dataqqqqqqq",params);
var data=querystring.stringify(params);
console.log("datahhhhhh",data);
var rc = System.getObject("util.restClient");
var rtn=await rc.execGet(data,"https://nodeapi.aminer.cn/api/article/autoreco/" + num);
return JSON.parse(rtn.stdout);
}
catch(e){
console.log("eeeeeeeeeeeeeeeeeeeeee",e);
return null;
}
};
async patentrank(obj) {//专利价值评价
var pubno = obj.publishnum == null ? "" : obj.publishnum;
var country = "";
......@@ -8351,8 +8409,9 @@ class PatentycService extends ServiceBase {
var capilist = rearray[0];
//var capilist = [ {"match": {"filing_name": "区块链"}}];
if (capilist.length > 0) {
console.log("-----------------------------------------patentSearch");
var tms = await this.GsbByChinaPatentSearchApi.patentSearch(capilist);//获取查询结果
// console.log("-----------------------------------------" + JSON.stringify(tms));
console.log("-----------------------------------------" + JSON.stringify(tms));
if (tms.status == 0) {
//zuochuli
var noteStr = "";
......@@ -8509,7 +8568,8 @@ class PatentycService extends ServiceBase {
var rtn = await this.uploadData(client, args);
return rtn;
}
catch{
catch (e){
console.log("CATCH----------------",e);
return {};
}
}
......@@ -8591,6 +8651,13 @@ class PatentycService extends ServiceBase {
}
else if (obj.type == "html") {
url = 'http://118.24.142.85:81/ezPictureL.aspx?guid=' + obj.uid;
if (obj.method){
url = url + "&method=" + obj.method;
}
else{
url = url + "&method=智能可视化";
}
}
if (url) {
return url;
......@@ -9915,16 +9982,17 @@ class PatentycService extends ServiceBase {
module.exports = PatentycService;
// var task = new PatentycService();
// var list1 = ["用户设备","通信领域","通信技术","设备发送","指示信息","通信系统","通信方法","设备接收","对应关系","基站发送","终端发送","用户体验","配置信息","请求消息","数据传输方法","用户终端","网络侧","移动终端","通信设备","传输方法"];
// var list2 = ["用户体验","移动终端","用户设备","相关技术","网络侧","终端发送","用户终端","配置信息","指示信息","请求消息","对应关系","传输方法","基站发送","通信系统","数据传输方法","通信领域","通信技术","设备发送","响应消息","发送方法"];
// var r = task.getArrEqual(list1,list2);
// console.log("r----"+r);
// // var list1 = ["用户设备","通信领域","通信技术","设备发送","指示信息","通信系统","通信方法","设备接收","对应关系","基站发送","终端发送","用户体验","配置信息","请求消息","数据传输方法","用户终端","网络侧","移动终端","通信设备","传输方法"];
// // var list2 = ["用户体验","移动终端","用户设备","相关技术","网络侧","终端发送","用户终端","配置信息","指示信息","请求消息","对应关系","传输方法","基站发送","通信系统","数据传输方法","通信领域","通信技术","设备发送","响应消息","发送方法"];
// // var r = task.getArrEqual(list1,list2);
// // console.log("r----"+r);
// var obj = {
// "uid": "667b8300-c101-11ea-98dd-3142bd90eec4",
// "num": 4,
// "type": "html"
// };
// var d = task.ezGetReport(obj)
// console.log("dddddd---------" + d);
// var d = task.aminerarticle(obj)
// //var d = task.ezReportUploadData(obj);
// console.log("ffffffff---------" + JSON.stringify(d));
// (async () => {
// var task = new PatentycService();
......
ipop-web/app/config/localsettings.js
var settings={
redis:{
host: "43.247.184.32",
host: "121.36.3.35",
port: 8967,
password:"Gongsibao2018",
db: 11,
......
ipop-web/app/front/entry/main.ejs
......@@ -178,6 +178,9 @@
.el-tooltip__popper.is-light {
max-width: 80% !important;
}
.el-menu-item {
outline: none !important;
}
</style>
</head>
<body>
......@@ -186,7 +189,7 @@
<el-row style="border-bottom:none;padding: 0px;min-width: 1244px;">
<el-col :span="2" style="min-width:150px;text-align: center;">
<!-- <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/logoimg.png" alt="">
<img v-if="!typeHome" style="margin-top: 14px;cursor: pointer;" src="/imgs/home/logos.png" @click="NavIndexRoute('首页')" alt="">
</el-col>
<!-- <el-col :span="17" class="spechorizotal">
......
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/imgs/home/backgroundImg1.png
ipop-web/app/front/entry/public/imgs/home/backgroundImg1.png

92.9 KB | W: | H:

ipop-web/app/front/entry/public/imgs/home/backgroundImg1.png

92.1 KB | W: | H:

ipop-web/app/front/entry/public/imgs/home/backgroundImg1.png
ipop-web/app/front/entry/public/imgs/home/backgroundImg1.png
ipop-web/app/front/entry/public/imgs/home/backgroundImg1.png
ipop-web/app/front/entry/public/imgs/home/backgroundImg1.png
  • 2-up
  • Swipe
  • Onion skin
ipop-web/app/front/entry/public/imgs/home/icon6.png
ipop-web/app/front/entry/public/imgs/home/icon6.png

1.68 KB | W: | H:

ipop-web/app/front/entry/public/imgs/home/icon6.png

2.72 KB | W: | H:

ipop-web/app/front/entry/public/imgs/home/icon6.png
ipop-web/app/front/entry/public/imgs/home/icon6.png
ipop-web/app/front/entry/public/imgs/home/icon6.png
ipop-web/app/front/entry/public/imgs/home/icon6.png
  • 2-up
  • Swipe
  • Onion skin
ipop-web/app/front/entry/public/imgs/home/logoimg.png
ipop-web/app/front/entry/public/imgs/home/logoimg.png

4.03 KB | W: | H:

ipop-web/app/front/entry/public/imgs/home/logoimg.png

4.43 KB | W: | H:

ipop-web/app/front/entry/public/imgs/home/logoimg.png
ipop-web/app/front/entry/public/imgs/home/logoimg.png
ipop-web/app/front/entry/public/imgs/home/logoimg.png
ipop-web/app/front/entry/public/imgs/home/logoimg.png
  • 2-up
  • Swipe
  • Onion skin
ipop-web/app/front/entry/public/js/index.js
......@@ -414,8 +414,17 @@ axios.get("/vue/comp/base").then(function(res){
// window.open("https://www.cnuip.com/");
this.typeHome = false;
this.loadingHome = true;
var url = encodeURIComponent("https://www.cnuip.com/");
this.pushx({name:"/iframehtml",title:"知识产权运营",params:{url:url}});
var url = encodeURIComponent("http://101.132.173.37:8110/");
this.pushx({name:"/iframehtmlTabs",title:"知识产权运营",params:{url:url}});
setTimeout(()=>{
this.loadingHome = false;
},1500);
}else if(v== "智能分类"){
// window.open("https://www.cnuip.com/");
this.typeHome = false;
this.loadingHome = true;
var url = encodeURIComponent("http://125.34.170.146/");
this.pushx({name:"/iframehtml",title:"智能分类",params:{url:url}});
setTimeout(()=>{
this.loadingHome = false;
},1500);
......
ipop-web/app/front/vues/pages/home/home.css
......@@ -112,7 +112,7 @@
}
.banner-navs {
float: left;
width: 77%;
width: 100%;
display: flex;
}
.banner-navs-list {
......
ipop-web/app/front/vues/pages/home/home.html
......@@ -9,10 +9,10 @@
<div class="home-back" :style="homeBackArr[0]"></div>
<canvas id="canvas"></canvas>
<div class="home-banner-tabs">
<div class="banner-tabs-name">
<!-- <div class="banner-tabs-name">
<div class="name1">智能产品</div>
<div class="name2">Smart Products</div>
</div>
</div> -->
<div class="banner-navs">
<div class="banner-navs-list" v-for="item in bannerTabsArr" @click="navRoute(item.name)">
<div class="navs-list-img">
......@@ -21,7 +21,7 @@
<div class="navs-list-name">{{item.name}}</div>
</div>
</div>
<div @mouseenter="show2enter()" @mouseleave="show2leave()">
<!-- <div @mouseenter="show2enter()" @mouseleave="show2leave()">
<div class="banner-more">更多 <i class="el-icon-arrow-right"></i></div>
<transition name="el-zoom-in-bottom">
<div class="banner-more-pop-up" v-show="show2">
......@@ -30,7 +30,7 @@
<div class="banner-more-pop-up-item" @click="navRoute(\'智能采集\')">智能采集 <i class="el-icon-arrow-right"></i></div>
</div>
</transition>
</div>
</div> -->
</div>
</div>
<div class="home-content">
......@@ -43,10 +43,8 @@
<div class="content-item-tab">{{item.name}}</div>
</div>
<div class="content-item-article">
<div class="item-article-text"><span></span>美国最严技术出口管制，中国芯片大军转向欧罗</div>
<div class="item-article-text"><span></span>美国最严技术出口管制，中国芯片大军转向欧罗</div>
<div class="item-article-text"><span></span>美国最严技术出口管制，中国芯片大军转向欧罗</div>
<div class="item-article-more">更多 >></div>
<div class="item-article-text" v-for="list in item.itemArr" @click="details(list)"><span></span>{{list.title}}</div>
<div class="item-article-more" @click="clickMore(item)">更多 >></div>
</div>
</div>
</div>
......
ipop-web/app/front/vues/pages/home/home.js
......@@ -68,13 +68,43 @@
contentArr: [
{
img:'background: url(/imgs/home/nav1.png) no-repeat;',
name:'热门专利'
name:'热门专利',
url: 'https://patent.aminer.cn/#/push/patent',
itemArr:[
{
title: 'PrivNet: Safeguarding Private Attributes in Transfer Learning for Recommendation'
},{
title: 'PrivNet: Safeguarding Private Attributes in Transfer Learning for Recommendation'
},{
title: 'PrivNet: Safeguarding Private Attributes in Transfer Learning for Recommendation'
}
]
},{
img:'background: url(/imgs/home/nav2.jpg) no-repeat;',
name:'热门科技资讯'
name:'热门科技资讯',
url: 'https://patent.aminer.cn/#/push/news',
itemArr:[
{
title: ''
},{
title: ''
},{
title: ''
}
]
},{
img:'background: url(/imgs/home/nav3.jpg) no-repeat;',
name:'热门文献'
name:'热门文献',
url:'https://patent.aminer.cn/#/push/paper',
itemArr:[
{
title: ''
},{
title: ''
},{
title: ''
}
]
},
],
bannerTabsArr: [
......@@ -113,6 +143,18 @@
{
img:"/imgs/home/icon9.png",
name:'创新资源共享'
},
{
img:"/imgs/home/icon7.png",
name:'智能翻译'
},
{
img:"/imgs/home/icon8.png",
name:'智能分类'
},
{
img:"/imgs/home/icon9.png",
name:'智能采集'
}
],
tms:[],
......@@ -171,8 +213,37 @@
that.BannerHeight = window.innerHeight;
});
this.$root.typeHome = true;
this.aminerpapers();
this.aminerarticle();
},
methods:{
details(val) {
var b1 = '';
if (val.url) {
b1 = val.url[0].replace("https://arxiv.org", "http://xxx.itp.ac.cn");
}else {
b1 = `https://www.aminer.cn/research_report/${val._id}?download=false`;
}
console.log(b1);
this.$root.typeHome = false;
this.$root.loadingHome = true;
var url = encodeURIComponent(b1);
this.$root.pushx({name:"/iframehtml",title:val.title,params:{url:url}});
setTimeout(()=>{
this.$root.loadingHome = false;
},1500);
},
clickMore(val) {
this.$root.typeHome = false;
this.$root.loadingHome = true;
var url = encodeURIComponent(val.url);
this.$root.pushx({name:"/iframehtml",title:val.name,params:{url:url}});
setTimeout(()=>{
this.$root.loadingHome = false;
},1500);
},
show2enter() {
this.show2 = true;
},
......@@ -304,6 +375,26 @@
console.log(name);
this.$root.NavIndexRoute(name);
},
/*热门文献*/
aminerpapers(){
var self=this;
self.$root.postReq("/web/patentycCtl/aminerpapers",{}).then(function(d){
if(d.status==0){
self.contentArr[2].itemArr = d.data.data;
console.log(d,'dddd')
}
});
},
/*热门科技*/
aminerarticle(){
var self=this;
self.$root.postReq("/web/patentycCtl/aminerarticle",{}).then(function(d){
if(d.status==0){
self.contentArr[1].itemArr = d.data.data;
console.log(d,'aaa')
}
});
},
fetchloopplay:function(){
var self=this;
self.$root.postReq("/web/loopplayCtl/findAll",{}).then(function(d){
......
ipop-web/app/front/vues/pages/iframehtml/iframehtml.js
......@@ -2,11 +2,13 @@
template:'${tmpl}',
data:function(){
return {
url:"",
url:""
}
},
mounted:function(){
console.log(this.$root.currentUser, '调用方法');
var url = this.$router.history.current.query.url;
console.log(url);
if(url){
url = decodeURIComponent(url);
this.url = url;
......
ipop-web/app/front/vues/pages/iframehtmlTabs/iframehtmlTabs.html 0 → 100644
<div style="width:100%;height:100%;">
<div style="width:200px;height:100%;float: left;background-color: rgb(84, 92, 100);">
<el-menu
:default-active="0"
class="el-menu-vertical-demo"
@select="handleSelect"
background-color="#545c64"
text-color="#fff"
active-text-color="#ffd04b">
<el-menu-item v-for="(item, key) in urlTabs" :key="key" :index="key">
<i class="el-icon-menu"></i>
<span slot="title">{{item.name}}</span>
</el-menu-item>
</el-menu>
</div>
<div style="width:calc(100% - 200px);height:100%;float: left;">
<iframe style="width:100%;height:100%;" :src="url" frameborder="0"></iframe>
</div>
</div>
ipop-web/app/front/vues/pages/iframehtmlTabs/iframehtmlTabs.js 0 → 100644
{
template:'${tmpl}',
data:function(){
return {
url:"",
urlTabs:[
{
name: '知识产权运营',
/*url: 'https://www.cnuip.com/'*/
url: 'http://101.132.173.37:8110/'
},
{
name: '专利超市',
url: 'http://101.132.173.37:8110/goods/patent.html'
},{
name: '企业服务',
url: 'http://101.132.173.37:8110/goods/service_z01.html'
},{
name: '科技成果',
url: 'http://101.132.173.37:8110/achievement'
},{
name: '知产百科',
url: 'http://101.132.173.37:8110/article/baike/'
},{
name: '问专家',
url: 'http://101.132.173.37:8110/shop_3.html'
}
]
}
},
mounted:function(){
console.log(this.$root.currentUser, '调用方法');
var url = this.$router.history.current.query.url;
if(url){
url = decodeURIComponent(url);
this.url = url;
}
},
created:function(){
},
methods:{
handleSelect(val) {
console.log(val);
this.url = this.urlTabs[val].url
}
},
vname:"gsb-iframehtmlTabs"
}
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.html
......@@ -30,6 +30,13 @@
<i :class="item.icon"></i>
<span slot="title">{{item.name}}</span>
</el-menu-item>
<el-submenu index="9">
<template slot="title">
<i class="el-icon-view"></i>
<span>智能可视化</span>
</template>
<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-menu>
</div>
......@@ -2234,6 +2241,7 @@
</div>
</div>
<div v-if="activeMenu==\'8\'" class="activeMenu8">
<div v-if="search">
<div v-if="echarts" style="min-width: 1200px;">
<div class="activeMenu8-title"><i class="el-icon-setting"></i>分析报告设置</div>
<div class="activeMenu8-main">
......@@ -2280,10 +2288,17 @@
</div>
</div>
</div>
<div v-if="activeMenu==\'9\'">
<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 v-if="activeMenu >= \'10\'">
<div v-if="search">
<iframe id="bdIframe" :src="srcIframe" frameborder="0" width="100%" height="1000"></iframe>
</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>
......
ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.js
......@@ -2,6 +2,7 @@
template: '${tmpl}',
data: function() {
return {
Reporttype: false,
dataUid: '735f9cd0-c103-11ea-9ecd-1d1c3e85a974',
timer: 0,
srcIframe: '',
......@@ -560,14 +561,29 @@
icon: 'el-icon-tickets'
},
{
name: "智能可视化",
name: "智能报表",
icon: 'el-icon-document'
}
],
dimensionListObj1:[
{
name: "主题分析",
icon: 'el-icon-tickets'
},
{
name: "演化分析",
icon: 'el-icon-view'
},
{
name: "智能报表",
name: "关联分析",
icon: 'el-icon-document'
},
{
name: "合著分析",
icon: 'el-icon-document'
}
],
method: '',
dimensionList:[
{
name: "首页",
......@@ -2846,8 +2862,15 @@
this.agentRank();
}else if (this.activeMenu == "8") {
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;
if (this.Reporttype) {
this.ezGetReport()
}else {
this.ezReportUploadData();
}
setTimeout(()=> {this.reinitIframe()}, 3000);
}
},
......@@ -7067,7 +7090,7 @@
var params = { "uid": that.dataUid };
const loadingbyc = this.$loading({
lock: true,
text: 'Loading',
text: '报告生成中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
......@@ -7078,9 +7101,8 @@
console.log(d);
if(d.status == 0){
loadingbyc.close();
/*clearInterval(that.timer);*/
that.Reporttype = true;
that.ezGetReport()
}else{
if (that.timer == 20) {
loadingbyc.close();
......@@ -7094,7 +7116,7 @@
ezGetReport() {
var that=this;
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) {
console.log("---------------------------------------------");
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