Skip to content

Z
zhichan
Commit ae775dad by 蒋勇
Options

d

parents 9a861903 a2852788
Showing with 394 additions and 133 deletions
igirl-web/app/base/api/impl/tmtransactionApi.js
......@@ -7,23 +7,91 @@ class TmtransactionApi extends ApiBase {
super();
this.trademarktransactionSve = System.getObject("service.trademarktransactionSve");
this.companyS = System.getObject("service.companySve");
this.utilstmtasktradeSve = System.getObject("service.utilstmtasktradeSve");
this.pytmreportSve = System.getObject("service.pytmreportSve");
this.mailClient = System.getObject("util.mailClient");
this.redisClient=System.getObject("util.redisClient");
};
//获取某类型的交易商标 post
async findByTmType(obj){
if(!obj.company_id){
async findByTmType(obj) {
if (!obj.company_id) {
//获取当前域名
var hostname = "jiaoyi.gongsibao.com";
// console.log("xccccccccccccccccccccccccccccccccccccccc", hostname);
//按照hostname去查找公司站点信息
var companytmp = await this.companyS.findOne({ domainname: hostname, isEnabled: true });
if(companytmp){
obj.company_id=companytmp.id;
if (companytmp) {
obj.company_id = companytmp.id;
}
}
try {
return this.trademarktransactionSve.findByTmType(obj);
} catch (error) {
return {code:-200,msg:"操作失败"};
return { code: -200, msg: "操作失败" };
}
}
async tmAuditData() {//商标交易录入es
try {
var kk = await this.utilstmtasktradeSve.opAuditData();
console.log(kk, "kk...................");
return kk;
} catch (e) {
//日志记录
logCtl.error({
optitle: "test_tmAuditData错误",
op: "/igirl-web/app/base/api/impl/testApi.js",
content: "error：" + JSON.stringify(e.stack),
clientIp: ""
});
console.log(e.stack, "ttttttttt...............");
}
}
async tmreport() {
var id = await this.redisClient.lpop("create_tmrepotCache");
console.log(id, "商标检索报告执行开始.................");
if (id) {
var info = await this.pytmreportSve.dao.findById(id);
console.log(info.dataValues);
if (info) {
var url = "http://43.247.184.92:8015/tmdoc/api/createdoc?mycompanyname=" + encodeURIComponent(info.companyname);
var rc = System.getObject("util.execClient");
var rtn = null;
try {
rtn = await rc.execGetTimeOut({}, url, 300000);
var j = rtn.stdout;
// var j="https://gsb-zc.oss-cn-beijing.aliyuncs.com/北京创知厚德科技有限公司_20190822014212_tmreport.docx"
// console.log("fanhui");
console.log(j);
if (j.indexOf("gsb-zc.oss-cn-beijing.aliyuncs.com") >= 0) {
var text = "企业监控报告";
var html = '<a href="' + j + '">企业监控报告</a>'
var mresult = this.mailClient.sendMsg(info.email, "企业监控报告", null, html, null, null, []); //发送成功后result的值:250 Data Ok: queued as freedom
}
info.dataValues.filepath = j;
info.dataValues.status = 1;
var result = await this.pytmreportSve.dao.model.update(info.dataValues, { where: { id: id } });
logCtl.info({
optitle: "商标检索报告执行结果",
op: "/igirl-web/app/base/db/task/CreatetmrepotTask.js",
content: "id=" + id + "执行结果：" + j,
clientIp: ""
});
return result;
} catch (e) {
console.log(e);
//日志记录
logCtl.error({
optitle: "商标检索报告执行结果-error",
op: "/igirl-web/app/base/db/task/CreatetmrepotTask.js",
content: e.stack,
clientIp: ""
});
return { code: -200, msg: "操作失败" };
}
}
}
}
}
......
igirl-web/app/base/db/models/trademarktransaction.js
......@@ -63,6 +63,8 @@ module.exports = (db, DataTypes) => {
this.setDataValue("trademark_type_name", uiconfig.config.pdict.tm_transaction_type[val]);
}
},
tm_regist_day:DataTypes.STRING(200),
tm_ncl_third:DataTypes.STRING(200),
}, {
paranoid: true,//假的删除
underscored: true,
......
igirl-web/app/base/service/impl/utilstlbankSve.js
......@@ -26,6 +26,7 @@ class utilsTlBankSve {
this.customerinfoDao = System.getObject("db.customerinfoDao");
this.moneyaccountDao = System.getObject("db.moneyaccountDao");
this.tlorderDao = System.getObject("db.tlorderDao");
this.centerChannelUrl = settings.centerChannelUrl();
}
......@@ -349,38 +350,53 @@ class utilsTlBankSve {
result = "回调cusorderid参数错误，没有_标识";
return result;
}
var tmpCompanyId = attachList.length == 2 ? attachList[1] : attachList[2];
var payParam = await this.companypayparamDao.getOneByCompanyId(tmpCompanyId, 1);
if (!payParam) {
result.return_msg = "回调公司没有对应的支付凭证";
return jsonBuilder.buildObject(result);
}
var signResult = await this.resultSign(parmas, payParam.pay_key);
if (signResult.code != 1) {
result = signResult.msg;
if (attachList[0] && attachList[0].substr(0, 3) == "qft") {
var p = {
"actionProcess": "actionProcess参数不",
"actionType": "receiveCallBackNotify",
"actionBody": { "parmas": parmas },
"client_ip": client_ip
};
var qftstr = await this.restClient.execPost(p, this.centerChannelUrl + "web/payment/paymentApi/springBoard");
var qftjson = JSON.parse(qftstr.stdout);
if(qftjson.status>-1){
result="success"
}
return result;
}
//解析支付参数
parmas.out_trade_no = attachList[0];
parmas.company_id = attachList.length == 2 ? attachList[1] : attachList[2];
parmas.other_company_id = attachList.length == 2 ? "0" : attachList[1];
//操作回调
if (parmas.other_company_id && Number(parmas.other_company_id) > 0) {
var otherPayParam = await this.companypayparamDao.getOneByCompanyId(parmas.other_company_id, 1);
if (!otherPayParam) {
result.return_msg = "回调其他公司公司没有对应的配置信息";
} else {
var tmpCompanyId = attachList.length == 2 ? attachList[1] : attachList[2];
var payParam = await this.companypayparamDao.getOneByCompanyId(tmpCompanyId, 1);
if (!payParam) {
result.return_msg = "回调公司没有对应的支付凭证";
return jsonBuilder.buildObject(result);
}
return await this.opOtherCompanyNotify(otherPayParam.notifyUrl, parmas, "通联回调");
}//是别的公司则进行回调别的接口信息
else {
var backResult = await this.opBackNotify(parmas, "通联回调");
if (backResult.code != 1) {
result = backResult.msg;
var signResult = await this.resultSign(parmas, payParam.pay_key);
if (signResult.code != 1) {
result = signResult.msg;
return result;
}
//解析支付参数
parmas.out_trade_no = attachList[0];
parmas.company_id = attachList.length == 2 ? attachList[1] : attachList[2];
parmas.other_company_id = attachList.length == 2 ? "0" : attachList[1];
//操作回调
if (parmas.other_company_id && Number(parmas.other_company_id) > 0) {
var otherPayParam = await this.companypayparamDao.getOneByCompanyId(parmas.other_company_id, 1);
if (!otherPayParam) {
result.return_msg = "回调其他公司公司没有对应的配置信息";
return jsonBuilder.buildObject(result);
}
return await this.opOtherCompanyNotify(otherPayParam.notifyUrl, parmas, "通联回调");
}//是别的公司则进行回调别的接口信息
else {
var backResult = await this.opBackNotify(parmas, "通联回调");
if (backResult.code != 1) {
result = backResult.msg;
return result;
}
return result;
}
return result;
}
} catch (e) {
logCtl.error({
......@@ -445,8 +461,8 @@ class utilsTlBankSve {
throw new Error(e.stack);
}
}
async opOtherCompanyNotify(sveItemCode,orderNo){
if(["zcdy3gy","zcdy6gy","zcdy1n"].indexOf(sveItemCode)>=0) {
async opOtherCompanyNotify(sveItemCode, orderNo) {
if (["zcdy3gy", "zcdy6gy", "zcdy1n"].indexOf(sveItemCode) >= 0) {
//TODO:操作别的公司回调
}
}
......@@ -514,7 +530,7 @@ class utilsTlBankSve {
var sqlWheres = { code: obj.out_trade_no };
var orderItem = await this.orderDao.model.findOne({
where: sqlWheres,
attributes: ["id", "code", "name","sveItemCode", "busPayOrderCode", "totalSum", "orderStatus", "orderPayStatus", "company_id", "createuser_id", "sveItemCode", "sveItemName", "subType"],
attributes: ["id", "code", "name", "sveItemCode", "busPayOrderCode", "totalSum", "orderStatus", "orderPayStatus", "company_id", "createuser_id", "sveItemCode", "sveItemName", "subType"],
include: [
{ model: this.orderDao.db.models.customerinfo, attributes: ["businessLicensePic", "customerType", "identityCardNo", "identityCardPic"] }
]
......@@ -525,7 +541,7 @@ class utilsTlBankSve {
return notifyResult;
}
//操作别的回调信息
this.opOtherCompanyNotify(orderItem.sveItemCode,obj.out_trade_no);
this.opOtherCompanyNotify(orderItem.sveItemCode, obj.out_trade_no);
if (Number(orderItem.totalSum * 100) != Number(obj.trxamt)) {
notifyResult.code = -450;
notifyResult.msg = "对应的订单支付金额不符";
......
igirl-web/app/base/service/impl/utilstmtasktradeSve.js
......@@ -12,6 +12,7 @@ class UtilsTmTaskTradeService {
this.tmTransactionUrl = settings.apiconfig.tmTransactionUrl();
this.trademarktransactionDao = System.getObject("db.trademarktransactionDao");
this.orderSve = System.getObject("service.orderSve");
this.tmNclUrl = settings.apiconfig.tmNclUrl();
}
async getAuditList(pageIndex, pageSize) {
//publish_status===:tm_transaction_publish_status": { "audit": "审核中", "fail": "审核不通过", "success": "审核通过", "uppershelf": "上架", "lowershelf": "下架" }
......@@ -37,7 +38,7 @@ class UtilsTmTaskTradeService {
async opAuditData() {
var self = this;
var rc = System.getObject("util.execClient");
var list = await self.getAuditList(1, 1000);
var list = await self.getAuditList(1, 101);
if (!list || list.rows.length == 0) {
return "no";
}
......@@ -81,7 +82,8 @@ class UtilsTmTaskTradeService {
"tm_end_day",
"ncl_two_codes",
"cn_count",
"en_name_count"
"en_name_count",
"regist_notice_day"
]
};
logCtl.info({
......@@ -169,8 +171,40 @@ class UtilsTmTaskTradeService {
if (putIndex < 0) {
return;
}
//商标小项查询
var params2 = {
"query": {
"term": {
"reg_num": esItem.tm_regist_num
}
},
"from": 0,
"size": 500,
"_source": [
"ncl_last"
]
};
var nclthird = [];
var esData2 = await self.returnResult(params2, this.tmNclUrl, "UtilsTmTaskTradeService", "opEsQuery");
if (esData2.status == 0 && esData2.data.length > 0) {
for (let l = 0; l < esData2.data.length; l++) {
if (esData2.data[l].ncl_last.indexOf(":") != -1) {
var sptirdncl = esData2.data[l].ncl_last.split(":")[1];
if (nclthird.indexOf(sptirdncl) < 0) {
nclthird.push(sptirdncl);
}
}
else {
if (nclthird.indexOf(esData2.data[l].ncl_last) < 0) {
nclthird.push(esData2.data[l].ncl_last);
}
}
}
}
var filterTmListr = auditData.filter(f => f.code === esItem.tm_regist_num );
var filterTmList = auditData.filter(f => f.code === esItem.tm_regist_num && f.ncl_one_code === esItem.ncl_one_codes);
if (filterTmList && filterTmList.length > 0) {
if ((!filterTmListr || filterTmListr.length ==0) &&(!filterTmList || filterTmList.length ==0)) {
var addParams = {
code: esItem.tm_regist_num,
ncl_one_code: esItem.ncl_one_codes,
......@@ -184,9 +218,11 @@ class UtilsTmTaskTradeService {
tm_structure_name: auditData[putIndex].tm_structure_name,
tm_introduction: auditData[putIndex].tm_introduction,
publish_status: "uppershelf",
createcompany_id: auditList[0].createcompany_id,
createuser_id: auditList[0].createuser_id,
createcompany_id: auditData[0].createcompany_id,
createuser_id: auditData[0].createuser_id,
notes: "add_new",
tm_regist_day: esItem.regist_notice_day,
tm_ncl_third: JSON.stringify(nclthird)
};
if (esItem.original_regist_notice_day && esItem.original_regist_notice_day != null) {
addParams.tm_start_day = self.convertDate(esItem.original_regist_notice_day);
......@@ -204,7 +240,9 @@ class UtilsTmTaskTradeService {
tm_applier: esItem.applicant_cn,
tm_group: JSON.stringify(esItem.ncl_two_codes),
pic_url: auditData[putIndex].pic_url || esItem.pic_url,
publish_status: "uppershelf"
publish_status: "uppershelf",
tm_regist_day: esItem.regist_notice_day,
tm_ncl_third: JSON.stringify(nclthird)
};
if (esItem.original_regist_notice_day && esItem.original_regist_notice_day != null) {
setField.tm_start_day = self.convertDate(esItem.original_regist_notice_day);
......
igirl-web/app/base/utils/execClient.js
......@@ -25,6 +25,8 @@ class ExecClient {
var data = JSON.stringify(subData);
var cmd = this.cmdPostPattern.replace(/\{data\}/g,
data).replace(/\{url\}/g, url);
cmd = cmd.replace(/,null/g, "");
console.log(cmd);
return cmd;
}
......
igirl-web/app/base/utils/restClient.js
......@@ -23,6 +23,7 @@ class RestClient {
var data = JSON.stringify(subData);
var cmd = this.cmdPostPattern.replace(/\{data\}/g,
data).replace(/\{url\}/g, url);
cmd = cmd.replace(/,null/g, "");
return cmd;
}
FetchPostCmd2(subData, url) {
......
igirl-web/app/config/settings.js
......@@ -47,6 +47,13 @@ var settings = {
return "http://43.247.184.94:9200/";
}
},
centerChannelUrl: function () {
if (this.env == "dev") {
return "http://192.168.18.34:4011/";
} else {
return "https://center-channel/";
}
},
apiconfig: {
zxyTransferAppId: function () {//智薪云应用id
// return "1103817785";//线上
......
igirl-web/app/front/entry/main.ejs
......@@ -787,6 +787,7 @@
<script src="/js/index.js"></script>
<script src="/js/echarts/echarts.min.js"></script>
<script src="/js/echarts/china.js"></script>
<script src="/js/echarts/world.js"></script>
<script src="/js/echarts/echarts-wordcloud.min.js"></script>
<script src="/js/echarts/echarts-wordcloud.js"></script>
<script>
......@@ -813,4 +814,4 @@
</body>
</html>
\ No newline at end of file
</html>
igirl-web/app/front/entry/mobile.ejs
......@@ -15,7 +15,7 @@
<link rel="stylesheet" href="/css/autocomplete.css">
<link rel="stylesheet" href="/css/ele/mintui-css/mint-ui.css">
<link rel="stylesheet" href="/css/mobile.css">
<link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_1358146_xbgxi6o3pl.css" />
<link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_1615199_u1lgski8bz.css" />
<script src="/js/vue/vue.min.js"></script>
<script src="/js/vue/vue-router.min.js"></script>
......
igirl-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.
igirl-web/app/front/entry/public/js/echarts/world.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-web/app/front/entry/public/js/mobile.js
......@@ -225,9 +225,9 @@ axios.get("/vue/comp/base").then(function (res) {
mitems: [
// code里的值控制活动时的样式..
// { "code": "waitsign", "text": "神盾", "icon": "fa fa-clock-o" },
{ "code": "mobilehome", "text": "首页", "icon": "mintui mintui-home" },
{ "code": "mobiledeal", "text": "交易", "icon": "mintui mintui-jiaoyi" },
{ "code": "mobilemy", "text": "我的", "icon": "mintui mintui-wode" },
{ "code": "mobilehome", "text": "首页", "icon": "zqq zqq-shouyeshouye" },
{ "code": "mobiledeal", "text": "交易", "icon": "zqq zqq-jiaoyiguanli" },
{ "code": "mobilemy", "text": "我的", "icon": "zqq zqq-wode" },
],
openid: null,
};
......
igirl-web/app/front/vues/pages/declare/declare.css
......@@ -445,14 +445,7 @@
font-weight:500;
color:rgba(153,153,153,1);
}
.policylist-conten-items img{
border: 1px dotted #999;
vertical-align: middle;
}
.policylistsitems img{
border: 1px dotted #999;
vertical-align: middle;
}
.zuo{
float: right;
margin-top: -10px;
......
igirl-web/app/front/vues/pages/managementmeasures/managementmeasures.css
......@@ -445,14 +445,7 @@
font-weight:500;
color:rgba(153,153,153,1);
}
.policylist-conten-items img{
border: 1px dotted #999;
vertical-align: middle;
}
.policylistsitems img{
border: 1px dotted #999;
vertical-align: middle;
}
.zuo{
float: right;
margin-top: -10px;
......
igirl-web/app/front/vues/pages/moreservice/policy/moreservice.html
......@@ -19,7 +19,9 @@
</div>
<div style="margin-top: 10px;"></div>
<div class="policy-input-value">
<el-input style="width:100%" v-model="state2" placeholder="输入您要查询的关键字"></el-input>
<div>
<el-input style="width:100%" v-model="state2" :placeholder="placeholderValue"></el-input>
</div>
<transition name="el-zoom-in-top">
<div class="inquire-lists" v-show="show2">
<div class="top"></div>
......
igirl-web/app/front/vues/pages/moreservice/policy/moreservice.js
......@@ -36,7 +36,8 @@
],
activeClass: 0,
resouclass: 0,
type: "政策查询"
type: "政策查询",
placeholderValue:"请输入关键字进行查询"
}
},
mounted:function(){
......@@ -224,9 +225,11 @@
getItme(index) {
this.activeClass = index;
if(index == 0 ){
this.type = "政策查询"
this.type = "政策查询",
this.placeholderValue = "请输入关键字进行查询"
}else{
this.type = "政策推荐"
this.type = "政策推荐",
this.placeholderValue = "请输入公司名称进行查询"
}
},
resouItem (item) {
......
igirl-web/app/front/vues/pages/patentdetail/patentdetail.css 0 → 100644
.layui-timeline {
padding-left: 50px;
}
.layui-timeline-item {
position: relative;
padding-bottom: 45px;
}
li {
list-style: none;
}
.layui-timeline-item:first-child::before {
display: block;
}
.layui-timeline-item:last-child::before {
content: '';
position: absolute;
left: 5px;
top: 0;
z-index: 0;
width: 0;
height: 100%;
}
.layui-timeline-item::before {
content: '';
position: absolute;
left: 5px;
top: 0;
z-index: 0;
width: 1px;
height: 100%;
}
.layui-timeline-item::before,
hr {
background-color: #e6e6e6;
}
.layui-timeline-axis {
position: absolute;
left: -5px;
top: 0;
z-index: 10;
width: 20px;
height: 20px;
line-height: 20px;
background-color: #fff;
color: rgb(16, 142, 233);
border-radius: 50%;
text-align: center;
cursor: pointer;
}
.layui-icon {
font-family: layui-icon !important;
font-size: 16px;
font-style: normal;
}
.layui-timeline-content {
padding-left: 30px;
}
.layui-text {
line-height: 22px;
font-size: 14px;
color: #666;
text-align:left;
}
.layui-timeline-title {
position: relative;
margin-bottom: 10px;
}
.patentdetail-title{
width: 1200px;
height: auto;
position: relative;
color: #000000;
margin: 25px auto;
text-align:left;
line-height:20px;
font-size:14px;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(153,153,153,1);
}
\ No newline at end of file
igirl-web/app/front/vues/pages/patentsimplesearch/patentsimplesearch.html
......@@ -13,7 +13,7 @@
检索
</el-button>
</el-input>
<div class="search-keywords">
<div style="margin-top:-20px">
<el-tabs v-model="activeName">
<el-tab-pane label="专利名称" name="patentname"></el-tab-pane>
<el-tab-pane label="申请号" name="applynum"></el-tab-pane>
......@@ -79,8 +79,8 @@
</div>
</div>
<div v-if="!a" class="search-warp-row01" >
<img class="patentyc-logo" src="/imgs/patentlogo.jpg" style="cursor:pointer" @click="logoclick"/>
<div v-if="!a" class="search-warp-row01">
<!-- <img class="patentyc-logo" src="/imgs/patentlogo.jpg" style="cursor:pointer" @click="logoclick"/> -->
<div class="search-input">
<div style="margin-top: 20px;" >
<el-input v-model="input" placeholder="请输入您要检索的专利名称、申请号、申请人等内容"
......@@ -93,7 +93,7 @@
检索
</el-button>
</el-input>
<div class="search-keywords" >
<div class="search-keywords" style="font-size:14px;">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="专利名称" name="patentname"></el-tab-pane>
<el-tab-pane label="申请号" name="applynum"></el-tab-pane>
......@@ -158,7 +158,7 @@
</div>
</div>
<div style="clear:both"></div>
<div class="selected-warp">
<div class="selected-warp" style="width:1050px;margin:18px auto">
<span style="color:#333333;">已选条件: </span>
<el-tag style="margin-left: 20px;font-size:10px;" size="mini"
class="item-text" :disable-transitions="false"
......@@ -176,11 +176,11 @@
<div class="leixing-warp">
<el-row slot="desc">
<el-col :span="3">
<span style="color: #999999;">专利类型(中国)：</span>
<span style="color: #999999;font-size:14px;">专利类型(中国)：</span>
</el-col>
<el-col class="item" v-for="o in datalist1.patenttype" :key="o" :span="3" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51)" @click="patenttypeclick(o)">
{{o.lable}}<var>({{o.num}})</var>
<el-button type="text" size="mini" style="color:rgb(48, 49, 51);font-size:14px;" @click="patenttypeclick(o)">
{{o.lable}}<var style="color:#999999">({{o.num}})</var>
</el-button>
</el-col>
</el-row>
......@@ -190,11 +190,11 @@
<div class="leixing-warp">
<el-row slot="desc">
<el-col :span="3">
<span style="color: #999999;">法律状态(中国)：</span>
<span style="color: #999999;font-size:14px;">法律状态(中国)：</span>
</el-col>
<el-col class="item1" v-for="o in datalist1.status" :key="o" :span="2" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51)" @click="statusclick(o)">
{{o.lable}}<var>({{o.num}})</var>
<el-col class="item1" v-for="o in datalist1.status" :key="o" :span="3" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51);font-size:14px;" @click="statusclick(o)">
{{o.lable}}<var style="color:#999999">({{o.num}})</var>
</el-button>
</el-col>
</el-row>
......@@ -204,30 +204,30 @@
<div class="leixing-warp">
<el-row slot="desc">
<el-col :span="2">
<span style="color: #999999;text-align:right">申请日期：</span>
<span style="color: #999999;text-align:right;font-size:14px;">申请日期：</span>
</el-col>
<el-col :span="21">
<el-row>
<el-col class="item1" v-for="o in datalist1.applydate.slice(0,8)" :key="o" :span="3" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51)" @click="applydateclick(o)">
{{o.lable}}<var>({{o.num}})</var>
<el-button type="text" size="mini" style="color:rgb(48, 49, 51);font-size:14px;" @click="applydateclick(o)">
{{o.lable}}<var style="color:#999999">({{o.num}})</var>
</el-button>
</el-col>
</el-row>
<el-row v-if="!isShow">
<el-col class="item1" v-for="o in datalist1.applydate.slice(8,100)" :key="o" :span="3" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51)" @click="applydateclick(o)">
{{o.lable}}<var>({{o.num}})</var>
<el-button type="text" size="mini" style="color:rgb(48, 49, 51);font-size:14px;" @click="applydateclick(o)">
{{o.lable}}<var style="color:#999999">({{o.num}})</var>
</el-button>
</el-col>
</el-row>
</el-col>
<el-col :span="1">
<el-button v-if="isShow" style="color:rgba(130,130,130,1);font-size:12px;border-radius:0px;border-bottom:none;"
<el-button v-if="isShow" style="color:rgba(130,130,130,1);font-size:14px;border-radius:0px;border-bottom:none;"
type="text" size="mini" @click="onclick">更多
<i class="el-icon-arrow-right"></i>
</el-button>
<el-button v-if="!isShow" style="color:rgba(130,130,130,1);font-size:12px;border-radius:0px;border-bottom:none;"
<el-button v-if="!isShow" style="color:rgba(130,130,130,1);font-size:14px;border-radius:0px;border-bottom:none;"
type="text" size="mini" @click="onclick">更多
<i class="el-icon-arrow-down" style="color:#108EE9"></i>
</el-button>
......@@ -240,30 +240,30 @@
<div class="leixing-warp">
<el-row slot="desc">
<el-col :span="2">
<span style="color: #999999;">公开日期：</span>
<span style="color: #999999;font-size:14px;">公开日期：</span>
</el-col>
<el-col :span="21">
<el-row>
<el-col class="item1" v-for="o in datalist1.publishdate.slice(0,8)" :key="o" :span="2" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51)" @click="publishdateclick(o)">
{{o.lable}}<var>({{o.num}})</var>
<el-col class="item1" v-for="o in datalist1.publishdate.slice(0,8)" :key="o" :span="3" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51);font-size:14px;" @click="publishdateclick(o)">
{{o.lable}}<var style="color:#999999">({{o.num}})</var>
</el-button>
</el-col>
</el-row>
<el-row v-if="!isShow2">
<el-col class="item1" v-for="o in datalist1.publishdate.slice(8,100)" :key="o" :span="3" >
<el-button type="text" size="mini" style="color:rgb(48, 49, 51)" @click="applydateclick(o)">
{{o.lable}}<var>({{o.num}})</var>
<el-button type="text" size="mini" style="color:rgb(48, 49, 51);font-size:14px;" @click="applydateclick(o)">
{{o.lable}}<var style="color:#999999">({{o.num}})</var>
</el-button>
</el-col>
</el-row>
</el-col>
<el-col :span="1">
<el-button v-if="isShow2" style="color:rgba(130,130,130,1);font-size:12px;border-radius:0px;border-bottom:none;"
<el-button v-if="isShow2" style="color:rgba(130,130,130,1);font-size:14px;border-radius:0px;border-bottom:none;"
type="text" size="mini" @click="onclick2">更多
<i class="el-icon-arrow-right"></i>
</el-button>
<el-button v-if="!isShow2" style="color:rgba(130,130,130,1);font-size:12px;border-radius:0px;border-bottom:none;"
<el-button v-if="!isShow2" style="color:rgba(130,130,130,1);font-size:14px;border-radius:0px;border-bottom:none;"
type="text" size="mini" @click="onclick2">更多
<i class="el-icon-arrow-down" style="color:#108EE9"></i>
</el-button>
......@@ -280,7 +280,7 @@
</div>
<div v-if="datalist2.length!=0">
<div class="total-warp">
<div class="total">
<div class="total" style="width:1200px">
<el-button type="text" size="small" style="color:#828282" disabled>共查到 <span
style="color:#108EE9">{{total}}条</span>
专利信息
......@@ -326,7 +326,7 @@
</template>
</el-table-column>
</el-table>
<el-footer class="footer-row" v-if="total>0">
<el-footer class="footer-row" v-if="total>0" style="margin-top:20px;">
<el-pagination
layout=" prev, pager, next, jumper,sizes,total"
......
igirl-web/app/front/vues/pages/policyquery/policyquery.css
......@@ -445,14 +445,7 @@
font-weight:500;
color:rgba(153,153,153,1);
}
.policylist-conten-items img{
border: 1px dotted #999;
vertical-align: middle;
}
.policylistsitems img{
border: 1px dotted #999;
vertical-align: middle;
}
.zuo{
float: right;
margin-top: -10px;
......@@ -604,4 +597,35 @@
text-overflow: ellipsis;
width: 85%;
overflow: hidden;
}
/**/
.policyQuery-zhengce-btn{
width: 98px;
height: 27px;
position: absolute;
border: 1px solid #118EE9;
background: #fff;
top: 20px;
right: 30px;
color: #118EE9;
cursor: pointer;
}
.policylist-content-list:hover>.policylist-conten-title>.policylist-baowei{
color: #118EE9 !important;
}
.policylist-content-list:hover>.policyQuery-zhengce-btn{
color: #fff !important;
background: #118EE9;
}
.lijizixunBtn{
width: 98px;
height: 27px;
position: absolute;
border: 1px solid #118EE9;
background: #118ee9;
top: 200px;
right: 60px;
color: #fff;
cursor: pointer;
}
\ No newline at end of file
igirl-web/app/front/vues/pages/policyquery/policyquery.html
......@@ -162,12 +162,12 @@
<!-- <div class="shuju">暂无数据</div> -->
</div>
</div>
<div v-else class="policylist-content-list" v-for="(i,k) in recommendationsArr">
<div class="policylist-conten-title" @click="articleDetails(i)">
<div v-else class="policylist-content-list" v-for="(i,k) in recommendationsArr" style="position:relative;cursor: pointer;" @click="articleDetails(i)">
<div class="policylist-conten-title">
<div style="margin-left: -10px;" v-if="i.app_status==0"> <span
style="dispaly:line-block;color:#fff;background-color: #B2B2B2;">申报已结束</span></div>
<div style="margin-left: -10px;" v-if="i.app_status==1"> <span
style="dispaly:line-block;color:#fff;background-color: #FFA940">开放申报中</span></div>
style="dispaly:line-block;color:#fff;background-color: #3ec051">开放申报中</span></div>
<div style="margin-left: -10px;" v-if="i.app_status==2"> <span
style="dispaly:line-block;color:#fff;background-color: #597EF7">即将申报</span></div>
<div class="policylist-baowei"> {{i.name}} </div>
......@@ -185,6 +185,7 @@
</span></p>
</div>
</div>
<button v-if="i.app_status==1"　class="policyQuery-zhengce-btn" @click.stop="showDrawer()">立即咨询</button>
</div>
</div>
......@@ -195,7 +196,7 @@
<div v-else></div>
</div>
<div class="policylist" v-if="!detailPageType">
<div class="policylist" v-if="!detailPageType" style="position:relative;">
<div class="policylist-header1" style="border:none;">
<div class="header-left">当前位置：<span @click="next">区域政策 > </span><span style="color: #108EE9;">政策详情</span>
</div>
......@@ -208,6 +209,7 @@
</div>
</div>
</div>
<button　v-if="statusDetail==1" class="lijizixunBtn" @click="showDrawer()">立即咨询</button>
<div class="henxian"></div>
<div class="policylist-essay">
<div class="essay-title">
......@@ -232,4 +234,37 @@
<img src="/imgs/gsb.png" alt=""> 扫一扫，关注iBOSS微信服务号，随时随地了解行业政策最新资讯
</div> -->
</div>
<el-dialog title="提交需求" :visible.sync="dialogFormVisible" center width="600px">
<el-form :model="form" ref="form" :rules="rules" style="margin-left:40px">
<div style="color:#606266;font-size:14px;font-weight:400;line-height:12px;margin-bottom:30px;margin-left:12px">
服务需求：政策咨询</div>
<el-form-item label="您的名字：" prop="name">
<el-input v-model="form.name" autocomplete="off" placeholder="请输入您的名字" style="width:360px"></el-input>
</el-form-item>
<el-form-item label="联系方式：" prop="mobile">
<el-input v-model="form.mobile" autocomplete="off" placeholder="请输入您的电话" style="width:360px"></el-input>
</el-form-item>
<el-form-item label="所属城市：" prop="city" style="margin-left:12px">
<el-cascader style="width:360px" expand-trigger="hover" :options="bigtype" v-model="form.city"
placeholder="请选择所属城市">
</el-cascader>
</el-form-item>
<el-form-item label="需求详情：" prop="notes" style="margin-left:12px">
<el-input v-model="form.notes" type="textarea" :rows="3" autocomplete="off" placeholder="请输入您的详细内容"
style="width:360px"></el-input>
</el-form-item>
<el-form-item>
<div style="width:100%;font-size:12px;color:#B2B2B2;margin-left:12px;font-family:Microsoft YaHei">
<i class="el-icon-info"></i>
提交需求后，我们专业代理人会及时与您联系，为您服务，请保持电话畅通。
</div>
</el-form-item>
<el-form-item>
<div style="width:100%;text-align:center;font-family:Microsoft YaHei;margin-left:-20px;">
<el-button type="primary" @click="submitneed">提交</el-button>
<el-button @click="dialogFormVisible=false">取消</el-button>
</div>
</el-form-item>
</el-form>
</el-dialog>
</div>
\ No newline at end of file
igirl-web/app/front/vues/pages/projectpublicity/projectpublicity.css
......@@ -445,14 +445,7 @@
font-weight:500;
color:rgba(153,153,153,1);
}
.policylist-conten-items img{
border: 1px dotted #999;
vertical-align: middle;
}
.policylistsitems img{
border: 1px dotted #999;
vertical-align: middle;
}
.zuo{
float: right;
margin-top: -10px;
......
igirl-web/app/front/vues/pages/recommen/recommen.css
......@@ -445,14 +445,7 @@
font-weight:500;
color:rgba(153,153,153,1);
}
.policylist-conten-items img{
border: 1px dotted #999;
vertical-align: middle;
}
.policylistsitems img{
border: 1px dotted #999;
vertical-align: middle;
}
.zuo{
float: right;
margin-top: -10px;
......
igirl-web/test2.js
var fs=require("fs");
var browserify = require("browserify");
var babelify = require("babelify");
browserify("/home/jy/dev/OMC/igirl-web/app/front/vues/allie/base/backbtn.vue")
.transform(babelify, {presets: ["@babel/preset-env"]})
.bundle()
.pipe(fs.createWriteStream("./vue2.js"));
\ No newline at end of file
var x=`
curl --user admines:adminGSBes. -k -H 'Content-type: application/json' -d '{"query":{"bool":{"must":[{"match":{"filing_name":"5G"}},null]}},"from":0,"size":1,"aggregations":{"types":{"terms":{"field":"country_name","size":20,"order":{"_count":"desc"}}}}}' http://43.247.184.94:9200/bigdata_patent_op/_search
`;
var m=x.replace(/,null/g,"");
console.log(m);
\ No newline at end of file
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