Skip to content

Z
zhichan
Commit 9d696608 by 宋毅
Options

修改政策页面

parent a74c5230
Showing with 53 additions and 153 deletions
igirl-web/app/base/db/metadata/apps/platform.js
...@@ -135,7 +135,7 @@ module.exports = { ...@@ -135,7 +135,7 @@ module.exports = {
"code": "policyquery", "code": "policyquery",
"bizCode": "policyquery", "bizCode": "policyquery",
"istop": true, "istop": true,
"label": "政策列表", "label": "政策查询",
"icon": "", "icon": "",
"isMenu": true, "isMenu": true,
"bizConfig": null, "bizConfig": null,
......
igirl-web/app/front/vues/pages/moreservice/policy/moreservice.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
font-size:50px; font-size:50px;
font-family:PingFangSC; font-family:PingFangSC;
font-weight:400; font-weight:400;
color:#fff;">商标政策早知道，就上政企遇</div> color:#fff;">科技产业政策早知道，就上政企遇</div>
<div class="meihua-inquire-input"> <div class="meihua-inquire-input">
<div class="lists"> <div class="lists">
......
igirl-web/app/front/vues/pages/moreservice/policy/moreservice.js
...@@ -142,18 +142,22 @@ ...@@ -142,18 +142,22 @@
if(this.type == "政策推荐"){ if(this.type == "政策推荐"){
this.$root.pushx({ this.$root.pushx({
title: "政策推荐", title: "政策推荐",
name: "/recommen" name: "/recommen",
params: {
tminput: this.state2
}
}); });
}else if(this.type == "政策查询"){ }else if(this.type == "政策查询"){
this.$root.pushx({ this.$root.pushx({
title: "政策列表", title: "政策查询",
name: "/policyquery" name: "/policyquery",
params: {
tminput: this.state2
}
}); });
} }
} }
if (this.state2 != '') { if (this.state2 != '') {
var obj = { var obj = {
name: this.state2 name: this.state2
}; };
...@@ -164,10 +168,10 @@ ...@@ -164,10 +168,10 @@
this.show2 = true; this.show2 = true;
this.listArr = d.data.rows; this.listArr = d.data.rows;
}else { }else {
this.$message({ /*this.$message({
message: '无搜索结果', message: '无搜索结果',
type: 'warning' type: 'warning'
}); });*/
} }
} }
}).catch(e=>{ }).catch(e=>{
......
igirl-web/app/front/vues/pages/moreservice/policyShop/moreservice.html
...@@ -4,140 +4,25 @@ ...@@ -4,140 +4,25 @@
<div style="display: inline-block;"> <div style="display: inline-block;">
<div class="normal-input-tabs"> <div class="normal-input-tabs">
<div :style="inputTabsKey == 1 ? \'background:rgba(81,163,245,1);color:#fff\' : \' \'" <div :style="inputTabsKey == 1 ? \'background:rgba(81,163,245,1);color:#fff\' : \' \'"
@click="inputTabsKey = 1">商标</div> @click="inputTabsKey = 1">政策查询</div>
<div :style="inputTabsKey == 2 ? \'background:rgba(81,163,245,1);color:#fff\' : \' \'" <div :style="inputTabsKey == 2 ? \'background:rgba(81,163,245,1);color:#fff\' : \' \'"
@click="inputTabsKey = 2">专利</div> @click="inputTabsKey = 2">政策推荐</div>
<div :style="inputTabsKey == 3 ? \'background:rgba(81,163,245,1);color:#fff\' : \' \'"
@click="inputTabsKey = 3">公司核名</div>
</div> </div>
<div v-if="inputTabsKey == 1" style="display: inline-block;border:2px solid rgba(81,163,245,1);"> <div v-if="inputTabsKey == 1" style="display: inline-block;border:2px solid rgba(81,163,245,1);">
<el-autocomplete v-model="mark" :fetch-suggestions="querySearch" placeholder="请输入商标名称、申请号、申请人等信息" <el-autocomplete v-model="mark" :fetch-suggestions="querySearch" placeholder="请输入要查询的关键字"
style="color:#DE3883;width:700px;" @keyup.enter.native="indexsearch" @select="handleSelect"> style="color:#DE3883;width:700px;" @keyup.enter.native="indexsearch" @select="handleSelect">
<div style="padding:12px 0;width: 20px;height:20px;" slot="suffix">
<label for="uploads">
<i class="iconfont" style="color: #108EE9 ;padding-right: 10px;cursor:pointer;">&#xe630;</i>
</label>
<input type="file" id="uploads" style="height:0;width:0;"
accept="image/png, image/jpeg, image/gif, image/jpg" @change="uploadImg($event, 1)">
</div>
<el-button class="leibie-btn" style="border: none;" slot="append" @click="checkClick">全部类别
<i class="iconfont cqtm-down">
&#xe664;
</i>
</el-button>
<el-button class="search-btn1" slot="append" @click="indexsearch" <el-button class="search-btn1" slot="append" @click="indexsearch"
style="color: white;border: 1px solid #51A3F5;background: #51A3F5 !important"> style="color: white;border: 1px solid #51A3F5;background: #51A3F5 !important">
检索 检索
</el-button> </el-button>
<!-- <el-button class="search-btn2" style="color: white" slot="append" @click="intelligentassessClick">智能评估</el-button> -->
</el-autocomplete> </el-autocomplete>
<el-card v-if="f"
style="font-size:13px;height:auto;text-align:left;padding-bottom: 20px;position: absolute;width:700px;z-index: 9999;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll1" @change="handleCheckAllChange">
全选
</el-checkbox>
<el-checkbox-group v-model="checkedNcl" @change="handleCheckedNclChange">
<ul style="list-style:none; padding:0;margin:0;text-align:left;overflow: hidden;">
<li v-for="n in ncl" :key="n" style="float:left;width:125px">
<el-checkbox :label="n">{{n}}</el-checkbox>
</li>
</ul>
</el-checkbox-group>
</el-card>
</div> </div>
<div class="normal-inquire-input-patent" v-if="inputTabsKey == 2"> <div class="normal-inquire-input-patent" v-if="inputTabsKey == 2">
<el-input v-model="patentInput" placeholder="请输入您要检索的专利名称、申请号、申请人等内容" style="color:#DE3883;width:704px"> <el-input v-model="patentInput" placeholder="请输入要查询的关键字" style="color:#DE3883;width:704px">
<el-button class="leibie-btn" slot="append" @click="checkPatentClick">数据范围
<i class="el-icon-arrow-down">
</i>
</el-button>
<el-button class="search-btn1" slot="append" style="color: white" @click="search1"> <el-button class="search-btn1" slot="append" style="color: white" @click="search1">
检索 检索
</el-button> </el-button>
</el-input> </el-input>
<div v-if="b2" style="z-index:9999; position: absolute; top: 90px;">
<el-card
style="width:700px;font-size:13px;height:auto;text-align:left;padding-bottom: 20px;position: absolute">
<el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange">
全部数据
</el-checkbox>
<div class="line"></div>
<el-row style="height:25px;">
<div style="width:200px;display:inline-block;">
<el-checkbox v-model="checkAll1" @change="handleCheckAllChange1"
:indeterminate="isIndeterminate1">
中国
</el-checkbox>
</div>
<div style="width:440px;display:inline-block;">
<el-checkbox-group v-model="checked" @change="handleCheckedCitiesChange1">
<el-checkbox v-for="city1 in cities1" :label="city1" :key="city1">{{city1}}
</el-checkbox>
</el-checkbox-group>
</div>
</el-row>
<div class="line"></div>
<el-row style="height:50px;">
<div style="width:200px;display:inline-block;">
<el-checkbox v-model="checkAll2" @change="handleCheckAllChange2"
:indeterminate="isIndeterminate2">
主要国家/地区/组织
</el-checkbox>
</div>
<div style="width:440px;display:inline-block;">
<el-checkbox-group v-model="checkedmain" @change="handleCheckedCitiesChange2">
<el-checkbox v-for="city2 in cities2.slice(0,5)" :label="city2" :key="city2">
{{city2}}</el-checkbox>
</el-checkbox-group>
<el-checkbox-group v-model="checkedmain" @change="handleCheckedCitiesChange2"
style="margin-top:10px;">
<el-checkbox v-for="city2 in cities2.slice(5,10)" :label="city2" :key="city2">
{{city2}}</el-checkbox>
</el-checkbox-group>
</div>
</el-row>
<div class="line"></div>
<el-row style="height:50px;">
<div style="width:200px;display:inline-block;">
<el-checkbox v-model="checkAll3" @change="handleCheckAllChange3"
:indeterminate="isIndeterminate3">
其他国家/地区/组织
</el-checkbox>
</div>
<div style="width:440px;display:inline-block;">
<el-checkbox-group v-model="checkedother" @change="handleCheckedCitiesChange3">
<el-checkbox v-for="city3 in cities3.slice(0,4)" :label="city3" :key="city3">
{{city3}}</el-checkbox>
</el-checkbox-group>
<el-checkbox-group v-model="checkedother" @change="handleCheckedCitiesChange3"
style="margin-top:10px;">
<el-checkbox v-for="city3 in cities3.slice(4,6)" :label="city3" :key="city3">
{{city3}}</el-checkbox>
</el-checkbox-group>
</div>
</el-row>
</el-card>
</div>
</div>
<div class="normal-inquire-input" v-if="inputTabsKey == 3">
<div class="normal-input-value">
<el-select style="width:15%" v-model="value1" placeholder="请选择城市">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-input style="width:50%" v-model="input" placeholder="请输入您的公司名称"></el-input>
<el-select style="width:15%" v-model="value2" placeholder="请选择行业">
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-select style="width:15%" v-model="value3" placeholder="请选择类型">
<el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="normal-input-buttom" @click="searchResult">获取核名结果</div>
</div> </div>
</div> </div>
<div class="normal-header-a1"> <div class="normal-header-a1">
......
igirl-web/app/front/vues/pages/moreservice/policyShop/moreservice.js
...@@ -553,13 +553,19 @@ ...@@ -553,13 +553,19 @@
if (typeof val == 'string') { if (typeof val == 'string') {
this.patentInput = val; this.patentInput = val;
} }
this.total = 0; if (!this.patentInput) {
this.currentpage = 1; this.$message.warning("输入的搜索关键字不能为空");
/*清楚勾选的痕迹*/ return false;
this.checkAllAnalysis = false; };
this.checkListAnalysis = []; this.patentInput = this.patentInput.replace(/\s+/g, "");
this.multipleSelection = []; console.log(this.patentInput,"this.patentInput................");
this.search(); return this.$root.pushx({
title: "",
name: "/recommen",
params: {
tminput: this.patentInput
}
});
}, },
search(){ search(){
if (!this.patentInput) { if (!this.patentInput) {
...@@ -697,25 +703,16 @@ ...@@ -697,25 +703,16 @@
$('#wave-container').css('display', 'none'); $('#wave-container').css('display', 'none');
this.aitmrate = false; this.aitmrate = false;
this.ainclonerate = []; this.ainclonerate = [];
/*if (this.isNull(this.mark)){
this.$message.warning("请输入目标");
}*/
if (this.isNull(this.mark)) { if (this.isNull(this.mark)) {
this.$message.warning("请输入目标"); this.$message.warning("请输入要查询的关键字");
} else { } else {
/*this.mark = this.mark.replace(/(^\s*)|(\s*$)/g, "");*/
this.mark = this.mark.replace(/\s+/g, ""); this.mark = this.mark.replace(/\s+/g, "");
this.localstoragesb(this.mark); console.log(this.mark,"this.mark................");
console.log(this.mark);
console.log(this.checkedNcl);
var re = /^[0-9]+.?[0-9]*$/;
return this.$root.pushx({ return this.$root.pushx({
title: "", title: "",
name: "/bycquerytm", name: "/policyquery",
params: { params: {
tminput: this.mark, tminput: this.mark
checkedNcl: this.checkedNcl
} }
}); });
} }
...@@ -885,7 +882,7 @@ ...@@ -885,7 +882,7 @@
params: { itemCode: i.code } params: { itemCode: i.code }
}); });
} else { } else {
window.open(window.location.href.split("#")[0] + "#/servicedetails?isDirectJump=1&sdsId=" + i.id) window.open(window.location.href.split("?")[0] + "#/servicedetails?isDirectJump=1&sdsId=" + i.id)
} }
}, },
enterCard(k, key) { enterCard(k, key) {
......
igirl-web/app/front/vues/pages/policyquery/policyquery.js
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
return { return {
tminput: '',
total: 0, total: 0,
state2: '', state2: '',
show2: false, show2: false,
...@@ -212,7 +213,13 @@ ...@@ -212,7 +213,13 @@
}] }]
} }
}, },
created:function(){
this.tminput = this.$router.history.current.query.tminput;
if (this.tminput) {
this.zctext = decodeURIComponent(this.tminput);
/*this.indexsearch();*/
}
},
methods: { methods: {
rgba() { rgba() {
var color = this.colorList[Math.floor(Math.random()*this.colorList.length)]; var color = this.colorList[Math.floor(Math.random()*this.colorList.length)];
......
igirl-web/app/front/vues/pages/recommen/recommen.js
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
return { return {
tminput: '',
total: 0, total: 0,
state2: '', state2: '',
show2: false, show2: false,
...@@ -212,7 +213,13 @@ ...@@ -212,7 +213,13 @@
}] }]
} }
}, },
created:function(){
this.tminput = this.$router.history.current.query.tminput;
if (this.tminput) {
this.zctext = decodeURIComponent(this.tminput);
/*this.indexsearch();*/
}
},
methods: { methods: {
rgba() { rgba() {
var color = this.colorList[Math.floor(Math.random()*this.colorList.length)]; var color = this.colorList[Math.floor(Math.random()*this.colorList.length)];
......
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