Skip to content

Z
zhichan
Commit 06daead0 by huangjing
Options

hj

parent 657feb94
Showing with 27 additions and 74 deletions
Dockerfile
......@@ -3,7 +3,8 @@ FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2
MAINTAINER jy "jiangyong@gongsibao.com"
ADD igirl-web /apps/igirl-web/
WORKDIR /apps/igirl-web/
RUN cnpm install -S
RUN yum install gcc gcc-c++ -y
RUN cnpm install -S
CMD ["node","/apps/igirl-web/main.js"]
......
igirl-web/app/base/controller/impl/patentycCtl.js
......@@ -20,14 +20,19 @@ class PatentycCtl extends CtlBase {
async obtainreport(pobj,obj,req){
var result = await this.service.obtainreport(obj);
return System.getResult2(result,null);
}
}
async reportGeneration(pobj, obj, req) {//导出报告
var result = await this.service.reportGeneration(obj);
return System.getResult2(result, null);
};
//申请人分析-申请人排名
async applierRank(pobj, obj, req) {
var result = await this.service.applierRank(obj);
return System.getResult2(result, null);
};
//申请人分析-申请人归属国分析
async applierCity(pobj, obj, req) {
var result = await this.service.applierCity(obj);
......@@ -117,11 +122,6 @@ class PatentycCtl extends CtlBase {
return System.getResult2(result, null);
};
async reportGeneration(pobj, obj, req) {//导出报告
var result = await this.service.reportGeneration(obj);
return System.getResult2(result, null);
};
async mainCountryApplyTrend(pobj, obj, req) {//区域分析-主要国家申请趋势
var result = await this.service.mainCountryApplyTrend(obj);
return System.getResult2(result, null);
......@@ -471,7 +471,7 @@ class PatentycCtl extends CtlBase {
}
}
var pubstatus = "";
if (patentinfo1.data.hits[i]._source.pub_status != null) {
if (patentinfo1.data.hits[i]._source.pub_status != null){
pubstatus = patentinfo1.data.hits[i]._source.pub_status;
}
var item = {
......@@ -483,7 +483,7 @@ class PatentycCtl extends CtlBase {
applydate: patentinfo1.data.hits[i]._source.filing_time,
publishdate: publish_date,
articletype: patentinfo1.data.hits[i]._source.pub_type,
pubstatus: pubstatus
pubstatus:pubstatus
}
patent1.push(item);
}
......@@ -525,7 +525,7 @@ class PatentycCtl extends CtlBase {
applydate: patentinfo2.data.hits[i]._source.app_date,
publishdate: patentinfo2.data.hits[i]._source.pub_date,
articletype: patentinfo2.data.hits[i]._source.pub_type,
pubstatus: ""
pubstatus:""
}
patent2.push(item);
}
......@@ -980,7 +980,7 @@ class PatentycCtl extends CtlBase {
var pubstatus = "";
if (patentinfo1.data.hits[i]._source.pub_status != null) {
pubstatus = patentinfo1.data.hits[i]._source.pub_status;
}
}
var item = {
applynum: patentinfo1.data.hits[i]._source.filing_no,
publishnum: publish_num,
......@@ -1307,6 +1307,5 @@ class PatentycCtl extends CtlBase {
}
return System.getResult2(result, null);
}
}
module.exports = PatentycCtl;
igirl-web/app/front/entry/public/js/index.js
......@@ -1429,11 +1429,6 @@ var app = new Vue({
title: "登录",
name: "/login"
});
setTimeout(() => {
this.$refs.topmenu.fetchMetaData(() => {
});
}, 300);
}
if (k == "roleview") {
this.pushx({
......
igirl-web/app/front/vues/pages/login/login.js
......@@ -142,7 +142,7 @@
register(){
this.$root.pushx({
title: "注册",
name: "/register"
name: "/register",
});
this.a=false;
this.b=false;
......@@ -242,7 +242,6 @@
var that=this;
var obj={
mobile:that.form1.mobile,
// password:that.form1.password,
};
that.$refs.form1.validate(valid=>{
if(valid){
......
igirl-web/app/front/vues/pages/pay/pay.html
......@@ -14,6 +14,6 @@
<el-input v-model="email" placeholder="请输入内容" type="email"></el-input>
</div>
<h3>实付金额：<span>{{money}}元</span></h3>
<el-button type="primary" @click="btnClick();Subscribe()">去支付</el-button>
<el-button type="primary" @click="btnClick()">去支付</el-button>
</div>
</div>
\ No newline at end of file
igirl-web/app/front/vues/pages/pay/pay.js
......@@ -24,12 +24,9 @@
itemCode: "zcdy3gy",
userId: "",
poliyLevel: "",
city: "",
address: "",
Deparment: "",
industry: "",
BeginTime: "",
currentCompany: "",
userName: "",
period: "3个月",
};
},
......@@ -37,20 +34,11 @@
},
mounted: function () {
/*由policycondition.js传递*/
this.poliyLevel = this.$router.history.current.query.poliyLevel;
this.cities = this.$router.history.current.query.cities;
this.address = this.$router.history.current.query.address;
this.Department = this.$router.history.current.query.Department;
this.industry = this.$router.history.current.query.industry;
if (this.$store.state.currentUser) {
this.userName = this.$store.state.currentUser.userName;
this.userId = this.$store.state.currentUser.id;
console.log(this.userName, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxuser");
}
if (this.$store.state.currentCompany) {
this.currentCompany = this.$store.state.currentCompany.name;
}
console.log(this.$store.state.currentCompany, "BeginTimexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxcurrentCompany");
},
methods: {
timeClick(item, ind) {
......@@ -98,7 +86,13 @@
title: "订单支付",
name: "/orderpay",
params: {
orderNum: d.data.code
orderNum: d.data.code,
"poliyLevel":this.poliyLevel,
"address":this.address,
"Department":this.Department,
"industry":this.industry,
"email":this.email,
"period":this.period,
}
});
} else {
......@@ -106,41 +100,6 @@
}
})
},
Subscribe() {
axios.post('http://106.13.228.212:8010/gsb/Subscribe', {
/*axios.post('http://192.168.18.108:8009/gsb/Subscribe', {*/
"userId": this.userId,
"poliyLevel": this.poliyLevel,
"city": this.cities,
"Departments": this.Department,
"industry": this.industry,
"BeginTime": this.Date_new(new Date()),
/*"BeginTime": new Date(),*/
"Email": this.email,
"comanyname": this.currentCompany,
"username": this.userName,
"period": this.period,
"money": this.money,
}).then(d => {
console.log(d, "mysql----------------------");
console.log(money, "money----------------------");
console.log(String(this.cities), "string----------------------");
console.log(JSON.stringify(this.cities), "cities----------------------");
})
},
Date_new(str) {
/*let date = str || new Date(),*/
let date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hours = date.getHours(),
minutes = date.getMinutes();
second = date.getSeconds();
let a = `${year}-${month}-${day} ${hours}:${minutes}:${second}`;
return a
},
},
vname: "gsb-pay"
}
\ No newline at end of file
igirl-web/app/front/vues/pages/policycondition/policycondition.js
......@@ -266,7 +266,7 @@
name: "/pay",
params: {
"poliyLevel": this.level,
"cities": _arryCitys,
"address": _arryCitys,
"Department": this.checkedfabus,
"industry": this.checkedhangyes,
},
......
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