Skip to content

Z
zhichan
Commit a372502b by 尹亚亭
Options

bycnotice

parents ea5b2d15 fde79904
Showing with 618 additions and 188 deletions
channel-access/src/api/tmQuery.js
......@@ -20,23 +20,6 @@ export function getCompanyInfoNoUser(name) {
});
}
//申请人查询接口
export function findTrademarkzcr(name, pageSize, currentPage) {
return http.post(baseUrl, {
actionType: "findTrademarkzcr",
actionBody: {
regMan: name,
sqlbtabkey: "",
flzttabkey: "",
sqnftabkey: "",
zcrname: "",
xcl: [],
pageSize: pageSize,
currentPage: currentPage
}
});
}
// 近12期初审公告
export function noticequeryTMZCSQ() {
return http.post(baseUrl, {
......@@ -51,17 +34,7 @@ export function noticequeryTMZCSQ() {
export function noticequery(params) {
return http.post(baseUrl, {
actionType: "noticequery",
// actionBody: {
// noticenumber: "1656",
// applynumber: "",
// tmname: "大爱城控股",
// applier: "",
// noticetype: "TMZCSQ",
// nclNum: "all",
// // 公告列表检索接口
// pageSize: 20,
// currentPage: 1
// }
actionBody: params
});
}
......@@ -93,3 +66,19 @@ export function findTrademarkName(params) {
actionBody: params
});
}
//商标申请号查询接口
export function findTrademarkzchAccurate(params) {
return http.post(baseUrl, {
actionType: "findTrademarkzchAccurate",
actionBody: params
});
}
//商标申请人查询接口
export function findTrademarkzcr(params) {
return http.post(baseUrl, {
actionType: "findTrademarkzcr",
actionBody: params
});
}
channel-access/src/views/pages/bycnoticeindex/Bycnoticeindex.vue
......@@ -168,6 +168,7 @@
layout="prev, pager, next"
:page-size="20"
:total="count"
:current-page="noticequeryparams.currentPage"
@current-change="handleCurrentChange"
></el-pagination>
</div>
......@@ -324,18 +325,13 @@ export default {
this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind;
this.noticequeryparams.currentPage = 1;
console.log(this.noticequeryparams);
let result = await noticequery(this.noticequeryparams).then(res => {
console.log(res);
if (res.status == 0) {
if (res.data.rows.length == 0) {
// // 服务器端返回的数据为空
// this.$notify({
// title: "警告",
// message: "没有该商品",
// type: "warning"
// });
} else {
return res.data; // 返回请求成功的非空数据
}
......
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue
......@@ -148,94 +148,102 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss">
.noticepage {
// 企链 70px的footer ; 启服通的footer是377px
min-height: calc(100% - 70px);
}
/* 头部导航面包屑 */
.nav {
width: 1200px;
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
span {
font-weight: 500;
line-height: 20px;
font-size: 16px;
color: #03004c;
}
}
/* 查询选择表单 */
.choice-form {
background: #f7f8fc;
border: 1px solid #eff1f9;
width: 1198px;
height: 76px;
margin: 0 auto;
.first-row {
margin-top: 18px;
button.el-button {
background: #0989c5;
width: 80px;
height: 34px;
padding: 0;
box-sizing: border-box;
border-radius: 0;
line-height: 0;
.choice-form {
.el-input__inner {
border-radius: 0px;
}
}
.left-span {
margin-left: 20px;
height: 34px;
.has-gutter tr th {
background: #d6daeb;
}
.info-box {
width: 300px;
border-radius: 0px;
/* 头部导航面包屑 */
.nav {
width: 1200px;
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
span {
font-weight: 500;
line-height: 20px;
font-size: 16px;
color: #03004c;
}
}
.btn-size {
width: 60px;
height: 34px;
font-family: PingFangSC-Regular;
font-size: 14px;
/* 查询选择表单 */
.choice-form {
background: #f7f8fc;
border: 1px solid #eff1f9;
width: 1198px;
height: 76px;
margin: 0 auto;
.first-row {
margin-top: 18px;
button.el-button {
background: #0989c5;
width: 80px;
height: 34px;
padding: 0;
box-sizing: border-box;
border-radius: 0;
line-height: 0;
}
}
.left-span {
margin-left: 20px;
height: 34px;
}
.info-box {
width: 300px;
border-radius: 0px;
}
.btn-size {
width: 60px;
height: 34px;
font-family: PingFangSC-Regular;
font-size: 14px;
}
}
}
/* 最新12期初审公告 */
.record {
width: 1200px;
margin: 0 auto;
height: 40px;
span {
padding-left: 17px;
font-size: 14px;
color: rgb(130, 130, 130);
line-height: 40px;
/* 最新12期初审公告 */
.record {
width: 1200px;
margin: 0 auto;
height: 40px;
span {
padding-left: 17px;
font-size: 14px;
color: rgb(130, 130, 130);
line-height: 40px;
}
}
}
/* 商标表格 */
.brand-form-wrap {
width: 1198px;
margin: 0 auto;
border: 1px solid #d6daeb;
margin-bottom: 100px;
.brand-form {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
// 样式，，，
> .el-table__body-wrapper
> .el-table__body
> tbody
> .el-table__row
> .el-table_1_column_4
> .cell {
color: rgb(255, 90, 0);
/* 商标表格 */
.brand-form-wrap {
width: 1198px;
margin: 0 auto;
border: 1px solid #d6daeb;
margin-bottom: 100px;
.brand-form {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
// 样式，，，
}
.el-table__row {
td:nth-child(4) {
.cell {
color: #de2828;
}
}
}
}
}
......
channel-access/src/views/pages/jdbycquerytm/bomTable.vue
<template>
<div class="bomTable">
<div class="bomTable-item" v-for="(item, index) in data" :key="index">
<div
class="bomTable-item"
v-for="(item, index) in data"
:key="index"
@click="gotoDetail(item)"
>
<div class="bomTable-item-left">
<img :src="item.logo" alt="" />
</div>
......@@ -9,14 +14,32 @@
<h1>{{ item.sbmc }}</h1>
</div>
<div class="bomTable-item-right-container">
<p>法律状态：<span class="zhuceSpan">{{item.sbzt}}</span></p>
<p>国际分类：<span>{{item.gjflname}}</span></p>
<p>申请号：<span>{{item.sbzch}}</span></p>
<p>申请日期：<span>{{item.sqrq}}</span></p>
<p>初审公告日期：<span>{{item.csrq}}</span></p>
<p>注册公告日期：<span>{{item.zcrq}}</span></p>
<p>申请人：<span>{{item.zcr}}</span></p>
<p>商标群组：<span>{{item.sbqz}}</span></p>
<p>
法律状态：<span class="zhuceSpan">{{
item.sbzt ? item.sbzt : "---"
}}</span>
</p>
<p>
国际分类：<span>{{ item.gjflname ? item.gjflname : "---" }}</span>
</p>
<p>
申请号：<span>{{ item.sbzch ? item.sbzch : "---" }}</span>
</p>
<p>
申请日期：<span>{{ item.sqrq ? item.sqrq : "---" }}</span>
</p>
<p>
初审公告日期：<span>{{ item.csrq ? item.csrq : "---" }}</span>
</p>
<p>
注册公告日期：<span>{{ item.zcrq ? item.zcrq : "---" }}</span>
</p>
<p>
申请人：<span>{{ item.zcr ? item.zcr : "---" }}</span>
</p>
<p>
商标群组：<span>{{ item.sbq ? item.sbq : "---" }}</span>
</p>
</div>
</div>
</div>
......@@ -26,8 +49,17 @@
<script>
export default {
props: ["data"],
updated() {
console.log(this.data);
methods: {
gotoDetail(item) {
let routeData = this.$router.resolve({
name: "jdbycdetailtm",
query: {
sbzch: item.sbzch,
gjfl: item.gjfl
}
});
window.open(routeData.href, "_blank");
}
}
};
</script>
......@@ -41,14 +73,15 @@ export default {
.bomTable-item {
width: 100%;
padding: 30px 0;
border-bottom: 1px solid #D6DAEB;
border-bottom: 1px solid #d6daeb;
display: flex;
cursor: pointer;
}
}
.bomTable-item-left {
width: 160px;
height: 98px;
border: 1px solid #EFF1F9;
border: 1px solid #eff1f9;
margin-right: 25px;
img {
width: 100%;
......@@ -85,7 +118,7 @@ export default {
span {
color: #2f2f2f;
}
.zhuceSpan{
.zhuceSpan {
color: #108ee9;
}
}
......
channel-access/src/views/pages/jdbycquerytm/index.vue
<template>
<div class="jdbycquerytm">
<div class="jdbycquerytm-loading" v-loading="true" v-if="loading"></div>
<div class="jdbycquerytm-main">
<!-- 面包屑 -->
<div class="jdbycquerytm-top">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item to="/jdtrademark"
......@@ -9,6 +11,7 @@
<el-breadcrumb-item>商标检索</el-breadcrumb-item>
</el-breadcrumb>
</div>
<!-- 搜索框 -->
<div class="jdbycquerytm-serch">
<div class="jdbycquerytm-serch-left">
<span class="serchSpan">商标查询</span>
......@@ -16,15 +19,45 @@
placeholder="请输入内容"
suffix-icon="el-icon-camera"
v-model="serchName"
@keyup.enter.native="onKeyDown()"
>
</el-input>
<el-button>全部类别<i class="el-icon-arrow-down"></i></el-button>
<el-button type="primary">检索</el-button>
<div @mouseenter="classAll" class="classAll">
<el-button v-if="activeName == 'first' || activeName == 'second'"
>全部类别<i class="el-icon-arrow-down"></i
></el-button>
<div
class="classAllClass"
v-show="classAllClassFlag"
@mouseleave="classAllLeave"
>
<el-checkbox
:indeterminate="isIndeterminateClass"
v-model="checkAllClass"
@change="handleCheckAllChangeClass"
>全选</el-checkbox
>
<div style="margin: 15px 0;"></div>
<el-checkbox-group
v-model="checkedCitiesClass"
@change="handleCheckedCitiesChangeClass"
>
<el-checkbox
v-for="num in citiesClass"
:label="num"
:key="num"
>{{ num }}</el-checkbox
>
</el-checkbox-group>
</div>
</div>
<el-button type="primary" @click="serchNameList">检索</el-button>
</div>
<div class="jdbycquerytm-serch-right">
<el-button @click="$router.push('/bycnoticetm')">公告查询</el-button>
</div>
</div>
<!-- tabs选项 -->
<div class="jdbycquerytm-tabs">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="相同商标" name="first"></el-tab-pane>
......@@ -34,6 +67,7 @@
<el-tab-pane label="图形检索" name="fiveth"></el-tab-pane>
</el-tabs>
</div>
<!-- 已选条件 -->
<div
class="jdbycquerytm-condition"
v-if="
......@@ -46,9 +80,45 @@
<span class="selectedSpan">已选条件:</span>
<div class="selected-tags">
<!-- 已选条件 -->
<div class="selected-tags-tag" v-if="sqr.key">
{{ sqr.key }} <i class="el-icon-close" @click="nclRen({})"></i>
</div>
<div class="selected-tags-tag" v-if="sqlb.keyvalue">
{{ sqlb.keyvalue
}}<i class="el-icon-close" @click="nclClass({})"></i>
</div>
<div class="selected-tags-tag" v-if="flzt.keyvalue">
{{ flzt.keyvalue
}}<i class="el-icon-close" @click="nclFlzt({})"></i>
</div>
<div class="selected-tags-tag" v-if="sqnf.key">
{{ sqnf.key }}<i class="el-icon-close" @click="nclSqnf({})"></i>
</div>
</div>
</div>
<div class="jdbycquerytm-condition-ul">
<li v-if="activeName == 'fourth'">
<span class="titleSpan">申请人：</span>
<div class="li-item">
<div
v-for="(item, index) in nameCounts.slice(0, 50)"
:key="index"
>
<p @click="nclRen(item)">
{{ item.key }} <span>({{ item.keycount }})</span>
</p>
</div>
</div>
<p class="moreSpan" v-if="nameCounts.length > 5">
<span @click="showRen($event)">更多</span>
<i
@click="showRen($event)"
:class="
showRenType ? 'el-icon-arrow-down' : 'el-icon-arrow-right'
"
></i>
</p>
</li>
<li>
<span class="titleSpan">申请类别：</span>
<div class="li-item">
......@@ -58,7 +128,7 @@
</p>
</div>
</div>
<p class="moreSpan">
<p class="moreSpan" v-if="nclOptions.length > 6">
<span @click="showClass($event)">更多</span>
<i
@click="showClass($event)"
......@@ -72,25 +142,22 @@
<span class="titleSpan">法律状态：</span>
<div class="li-item">
<div v-for="(item, index) in statusCounts" :key="index">
<p>
<p @click="nclFlzt(item)">
{{ item.keyvalue }} <span>({{ item.keycount }})</span>
</p>
</div>
</div>
<!-- <p class="moreSpan">
<span>更多 <i class="el-icon-arrow-right"></i></span>
</p> -->
</li>
<li>
<span class="titleSpan">申请年份：</span>
<div class="li-item">
<div v-for="(item, index) in yearCounts" :key="index">
<p>
<p @click="nclSqnf(item)">
{{ item.key }} <span>({{ item.keycount }})</span>
</p>
</div>
</div>
<p class="moreSpan">
<p class="moreSpan" v-if="yearCounts.length > 11">
<span @click="showYear($event)">更多</span>
<i
@click="showYear($event)"
......@@ -120,19 +187,10 @@
}}</el-checkbox>
</el-checkbox-group>
</div>
<!-- <p class="moreSpan">
<span @click="showYear($event)">更多</span>
<i
@click="showYear($event)"
:class="
showYearType ? 'el-icon-arrow-down' : 'el-icon-arrow-right'
"
></i>
</p> -->
</li>
</div>
</div>
<!-- -->
<!-- 已查信息个数 -->
<div class="jdbycquerytm-total">
<p>
共查到<span>{{ dataCount }}</span
......@@ -142,19 +200,26 @@
<span><i class="el-icon-download">导出数据</i></span>
</div>
</div>
<!-- -->
<!-- 商标数据列表 -->
<BomTable :data="dataList" v-if="dataList.length != 0" />
<!-- -->
<!-- 商标数据分页 -->
<div class="jdbycquerytm-pagination" v-if="dataList.length != 0">
<el-pagination
background
:page-size="pageSize"
:current-page.sync="currentPage"
layout="prev, pager, next"
:total="dataCount"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
<!-- 暂无数据 -->
<div class="notData" v-if="dataList.length == 0">
<img src="@/assets/imgs/wushuju.png" alt="" />
<p>很抱歉，没有查询到您要搜索的内容</p>
<p>同时您也可以使用同义关键词或减少筛选范围再进行尝试。</p>
</div>
</div>
</div>
</template>
......@@ -162,7 +227,12 @@
<script>
import BomTable from "./bomTable";
//
import { findTrademarkNameAccurate, findTrademarkName } from "@/api/tmQuery.js";
import {
findTrademarkNameAccurate,
findTrademarkName,
findTrademarkzchAccurate,
findTrademarkzcr
} from "@/api/tmQuery.js";
//高级筛选
const citiesList = [
"近似",
......@@ -173,20 +243,82 @@ const citiesList = [
"换序",
"包含该商标"
];
//尼斯编号
const nclOptionNumbers = [
"01",
"02",
"03",
"04",
"05",
"06",
"07",
"08",
"09",
"10",
"11",
"12",
"13",
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"31",
"32",
"33",
"34",
"35",
"36",
"37",
"38",
"39",
"40",
"41",
"42",
"43",
"44",
"45"
];
export default {
components: {
BomTable
},
data() {
return {
//多选框
checkAll: false,
//多选框选中的值
//尼斯编号多选框
checkAllClass: false,
checkedCitiesClass: [],
citiesClass: nclOptionNumbers,
isIndeterminateClass: false,
classAllClassFlag: false,
//已选条件
sqr: {},
sqlb: {},
flzt: {},
sqnf: {},
//loading
loading: false,
//高级筛选多选框部分
checkAll: true,
checkedCities: citiesList,
cities: citiesList,
isIndeterminate: true,
isIndeterminate: false,
//input框检索参数
serchName: "",
//展示申请人
showRenType: false,
//展示商标类别
showClassType: false,
//展示申请年份
......@@ -197,6 +329,8 @@ export default {
currentPage: 1,
//tabs选项
activeName: "first",
//申请人
nameCounts: [],
//申请类别
nclOptions: [],
//法律状态
......@@ -208,8 +342,64 @@ export default {
//查询商标数据
dataList: [],
//商标精确检索参数
trademarkNameAccurate: {
tmName: "萌颜",
trademarkNameAccurate: {},
//商标近似检索参数
trademarkName: {},
//商标申请号查询参数
TrademarkzchAccurate: {},
//商标申请人查询参数
Trademarkzcr: {}
};
},
mounted() {
this.serchName = this.$route.query.tminput;
this.serchNameList();
},
methods: {
/////////
handleCheckAllChangeClass(val) {
this.checkedCitiesClass = val ? nclOptionNumbers : [];
this.isIndeterminateClass = false;
},
handleCheckedCitiesChangeClass(value) {
let checkedCount = value.length;
this.checkAllClass = checkedCount === this.citiesClass.length;
this.isIndeterminateClass =
checkedCount > 0 && checkedCount < this.citiesClass.length;
},
//鼠标划入全部类别
classAll() {
this.classAllClassFlag = true;
},
classAllLeave() {
this.classAllClassFlag = false;
},
//点击检索
serchNameList() {
if (this.serchName) {
this.clearParameter();
this.switchTags();
} else {
this.$message({
message: "请输入搜索内容！",
type: "warning"
});
}
},
//回车检索
onKeyDown() {
this.serchNameList();
},
//还原默认参数
clearParameter() {
//已选条件
this.sqr = {};
this.sqlb = {};
this.flzt = {};
this.sqnf = {};
//商标精确检索参数
this.trademarkNameAccurate = {
tmName: this.serchName,
sqlbtabkey: "", //申请类别
flzttabkey: "", //法律状态
sqnftabkey: "", //申请年份
......@@ -218,10 +408,10 @@ export default {
nclNum: [],
pageSize: 20,
currentPage: 1
},
};
//商标近似检索参数
trademarkName: {
tmName: "萌颜",
this.trademarkName = {
tmName: this.serchName,
sqlbtabkey: "",
flzttabkey: "",
sqnftabkey: "",
......@@ -231,33 +421,129 @@ export default {
sbtjdata: citiesList,
pageSize: 20,
currentPage: 1
}
};
},
mounted() {
this.getTrademarkNameAccurateList();
},
methods: {
};
//商标申请号查询参数
this.TrademarkzchAccurate = {
regNum: this.serchName,
sqlbtabkey: "",
flzttabkey: "",
sqnftabkey: "",
xcl: [],
pageSize: 20,
currentPage: 1
};
//商标申请人查询参数
this.Trademarkzcr = {
regMan: this.serchName,
sqlbtabkey: "",
flzttabkey: "",
sqnftabkey: "",
zcrname: "",
xcl: [],
pageSize: 20,
currentPage: 1
};
},
//点击申请人
nclRen(item) {
this.currentPage = 1;
this.sqr = item;
this.Trademarkzcr.zcrname = this.sqr.key;
this.getTrademarkzcrList();
},
//点击商标类别
nclClass(item) {
console.log(item);
let arr = [];
arr.push(item);
this.dynamicTags = arr;
this.currentPage = 1;
this.sqlb = item;
switch (this.activeName) {
case "first":
this.trademarkNameAccurate.sqlbtabkey = this.sqlb.key;
this.getTrademarkNameAccurateList();
break;
case "second":
this.trademarkName.sqlbtabkey = this.sqlb.key;
this.getTrademarkNameList();
break;
case "third":
this.TrademarkzchAccurate.sqlbtabkey = this.sqlb.key;
this.getTrademarkzchAccurateList();
break;
case "fourth":
this.Trademarkzcr.sqlbtabkey = this.sqlb.key;
this.getTrademarkzcrList();
break;
}
},
//点击法律状态
nclFlzt(item) {
this.currentPage = 1;
this.flzt = item;
switch (this.activeName) {
case "first":
this.trademarkNameAccurate.flzttabkey = this.flzt.key;
this.getTrademarkNameAccurateList();
break;
case "second":
this.trademarkName.flzttabkey = this.flzt.key;
this.getTrademarkNameList();
break;
case "third":
this.TrademarkzchAccurate.flzttabkey = this.flzt.key;
this.getTrademarkzchAccurateList();
break;
case "fourth":
this.Trademarkzcr.flzttabkey = this.flzt.key;
this.getTrademarkzcrList();
break;
}
},
//点击申请年份
nclSqnf(item) {
this.currentPage = 1;
this.sqnf = item;
switch (this.activeName) {
case "first":
this.trademarkNameAccurate.sqnftabkey = this.sqnf.key;
this.getTrademarkNameAccurateList();
break;
case "second":
this.trademarkName.sqnftabkey = this.sqnf.key;
this.getTrademarkNameList();
break;
case "third":
this.TrademarkzchAccurate.sqnftabkey = this.sqnf.key;
this.getTrademarkzchAccurateList();
break;
case "fourth":
this.Trademarkzcr.sqnftabkey = this.sqnf.key;
this.getTrademarkzcrList();
break;
}
},
//高级筛选
//全选改变事件
handleCheckAllChange(val) {
console.log(val, "asd");
this.checkedCities = val ? this.cities : [];
this.isIndeterminate = false;
this.trademarkName.sbtjdata = this.checkedCities;
this.getTrademarkNameList();
},
//
handleCheckedCitiesChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.cities.length;
this.trademarkName.sbtjdata = value;
this.getTrademarkNameList();
},
//显示申请人
showRen(tag) {
this.showRenType = !this.showRenType;
if (this.showRenType) {
tag.toElement.parentNode.parentNode.style.height = "auto";
} else {
tag.toElement.parentNode.parentNode.style.height = "51px";
}
},
//显示申请类别
showClass(tag) {
......@@ -279,8 +565,10 @@ export default {
},
//商标精确检索
getTrademarkNameAccurateList() {
this.loading = true;
findTrademarkNameAccurate(this.trademarkNameAccurate).then(res => {
console.log(res, "res");
this.loading = false;
console.log(res, "商标精确检索");
if (res.status == 0) {
this.assignmentData(res.data);
}
......@@ -288,8 +576,32 @@ export default {
},
//商标近似检索
getTrademarkNameList() {
this.loading = true;
findTrademarkName(this.trademarkName).then(res => {
console.log(res);
this.loading = false;
console.log(res, "商标近似检索");
if (res.status == 0) {
this.assignmentData(res.data);
}
});
},
//商标申请号查询
getTrademarkzchAccurateList() {
this.loading = true;
findTrademarkzchAccurate(this.TrademarkzchAccurate).then(res => {
this.loading = false;
console.log(res, "商标申请号查询");
if (res.status == 0) {
this.assignmentData(res.data);
}
});
},
//商标申请人查询
getTrademarkzcrList() {
this.loading = true;
findTrademarkzcr(this.Trademarkzcr).then(res => {
this.loading = false;
console.log(res, "商标申请人查询");
if (res.status == 0) {
this.assignmentData(res.data);
}
......@@ -297,24 +609,40 @@ export default {
},
//赋值数据
assignmentData(data) {
if (data.namecounts) {
this.nameCounts = data.namecounts;
}
this.nclOptions = data.code_counts;
this.statusCounts = data.status_counts;
this.yearCounts = data.year_counts;
this.dataCount = data.count;
this.dataList = data.rows;
},
//切换tabs选项
handleClick(tab, event) {
console.log(tab, event);
switch (tab.name) {
//判断在哪个标签页
switchTags() {
switch (this.activeName) {
case "first":
this.trademarkNameAccurate.nclNum = this.checkedCitiesClass;
this.getTrademarkNameAccurateList();
break;
case "second":
this.trademarkName.nclNum = this.checkedCitiesClass;
this.getTrademarkNameList();
break;
case "third":
this.getTrademarkzchAccurateList();
break;
case "fourth":
this.getTrademarkzcrList();
break;
}
},
//切换tabs选项
handleClick(tab, event) {
console.log(tab, event);
this.serchNameList();
this.currentPage = 1;
},
//切换页数
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
......@@ -327,6 +655,14 @@ export default {
this.trademarkName.currentPage = val;
this.getTrademarkNameList();
break;
case "third":
this.TrademarkzchAccurate.currentPage = val;
this.getTrademarkzchAccurateList();
break;
case "fourth":
this.Trademarkzcr.currentPage = val;
this.getTrademarkzcrList();
break;
}
}
}
......@@ -340,6 +676,28 @@ export default {
.jdbycquerytm-main {
width: 1200px;
margin: 0 auto;
.notData {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
padding-top: 80px;
p {
font-size: 16px;
font-weight: 400;
color: rgba(130, 130, 130, 1);
margin-top: 10px;
}
}
}
.jdbycquerytm-loading {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 100;
}
}
.jdbycquerytm-top {
......@@ -354,8 +712,25 @@ export default {
justify-content: space-between;
margin: 30px 0;
.jdbycquerytm-serch-left {
position: relative;
width: 735px;
display: flex;
.classAll {
.classAllClass {
position: absolute;
left: 100px;
background: #fff;
z-index: 99;
padding: 20px 0 20px 30px;
border: 1px solid #dcdfe6;
border-top: none;
border-radius: 0 0 5px 5px;
.el-checkbox {
margin: 0;
width: 67px;
}
}
}
.serchSpan {
font-family: PingFangSC-Medium;
cursor: pointer;
......@@ -374,6 +749,10 @@ export default {
.el-input__suffix-inner {
cursor: pointer;
}
.el-input__icon {
font-size: 20px;
color: #108ee9;
}
}
.el-button {
width: 100px;
......@@ -439,14 +818,31 @@ export default {
color: #333;
letter-spacing: 0;
}
.el-tag {
padding: 0;
margin-left: 40px;
font-size: 12px;
border-radius: 0;
border: 1px solid #108ee9;
color: #108ee9;
padding: 0 10px;
.selected-tags {
display: flex;
.selected-tags-tag {
margin-left: 40px;
font-size: 12px;
border-radius: 3px;
border: 1px solid #108ee9;
color: #108ee9;
padding: 2px 7px 2px 10px;
background: #ecf5ff;
i {
margin-left: 10px;
width: 15px;
height: 15px;
border-radius: 100px;
color: #108ee9;
line-height: 15px;
text-align: center;
cursor: pointer;
}
i:hover {
background: #108ee9;
color: #fff;
}
}
}
}
.jdbycquerytm-condition-ul {
......@@ -463,6 +859,7 @@ export default {
.titleSpan {
display: inline-block;
padding: 7px 40px 7px 0;
width: 100px;
}
.li-item {
flex: 1;
......
channel-access/src/views/pages/jdtrademark/Jdtmsearch.vue
......@@ -127,13 +127,20 @@ export default {
checkedCount > 0 && checkedCount < this.typeList.length;
},
goSearch() {
this.$router.push({
path: `/jdbycquerytm`,
query: {
checkedNcl: JSON.stringify(this.checkedType),
tminput: this.searchValue
}
});
if (this.searchValue) {
this.$router.push({
path: `/jdbycquerytm`,
query: {
checkedNcl: JSON.stringify(this.checkedType),
tminput: this.searchValue
}
});
}else {
this.$message({
message:"请输入搜索内容！",
type:"warning"
})
}
}
}
};
......
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