Skip to content

Z
zhichan
Commit 158d6438 by 尹亚亭
Options

0121

parent a372502b
Showing with 251 additions and 174 deletions
channel-access/src/api/tmQuery.js
......@@ -34,7 +34,6 @@ export function noticequeryTMZCSQ() {
export function noticequery(params) {
return http.post(baseUrl, {
actionType: "noticequery",
actionBody: params
});
}
......@@ -43,10 +42,6 @@ export function noticequery(params) {
export function noticeSearch(params) {
return http.post(baseUrl, {
actionType: "noticesearch",
// actionBody: {
// csggqh: 1663, //公告期号
// sbzch: "36280736" //商标注册号
// }
actionBody: params
});
}
......
channel-access/src/views/pages/bycnoticedetail/Bycnoticedetail.vue
<template>
<div class="notice-details-page">
<div class="nav">
<div class="noticedetail-nav">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/bycnoticetm' }"
>商标公告查询</el-breadcrumb-item
......@@ -14,8 +14,7 @@
>
</el-breadcrumb>
</div>
<div class="show-notice">
<!-- 优化点：数据图片的展示：GET net::ERR_NAME_NOT_RESOLVED 给予相应提示 -->
<div class="show-notice" v-loading="loading">
<img :src="linkurl" alt="" />
</div>
</div>
......@@ -30,10 +29,11 @@ export default {
ggqh: "",
sbzch: ""
},
// 面包屑部分： 商标名称
sbmc: "",
// 返回数据中的公告图形
linkurl: ""
sbmc: "", // 面包屑部分： 商标名称
linkurl: "", // 返回数据中的公告图形
// 动画加载
loading: false
};
},
created() {
......@@ -43,6 +43,7 @@ export default {
this.noticesearchparams.ggqh = this.$route.query.ggqh.split("(")[0];
this.noticesearchparams.sbzch = this.$route.query.sbzch;
this.loading = true; // 查询数据之前显示 loading
// 进行公告详情查询
noticeSearch(this.noticesearchparams).then(res => {
if (res.status == 0) {
......@@ -56,11 +57,12 @@ export default {
// 状态码不是 0
else {
this.linkurl = res.data.linkurl;
// 域名处理 http://sbggwj.saic.gov.cn:8000/ 变为 http://sbggwj.sbj.cnipa.gov.cn:8000/ 公告才可以访问
// 优化点：域名处理 http://sbggwj.saic.gov.cn:8000/ 变为 http://sbggwj.sbj.cnipa.gov.cn:8000/ 公告才可以访问
let linkpart2 = this.linkurl.split(":8000")[1];
let rightlinkpart1 = "http://sbggwj.sbj.cnipa.gov.cn";
let rightlinkurl = rightlinkpart1.concat(":8000", linkpart2);
this.linkurl = rightlinkurl;
this.loading = false; //数据查询成功之后隐藏 loading
}
} else {
this.$notify.error({
......@@ -73,24 +75,39 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss">
.notice-details-page {
min-height: calc(100% - 70px);
.el-breadcrumb {
.el-breadcrumb__item {
.el-breadcrumb__inner {
color: #03004c;
font-size: 16px;
}
}
span:nth-child(3) {
.el-breadcrumb__inner {
color: #0989c5;
font-size: 16px;
}
}
}
}
.nav {
width: 1200px;
.noticedetail-nav {
width: 889px;
margin: 0 auto;
padding: 20px 0;
}
.show-notice {
width: 889px;
height: 1260px;
padding-top: 50px;
padding-top: 10px;
margin: 0 auto;
img {
display: block;
border: 1px solid gray;
width: 100%;
}
}
</style>
channel-access/src/views/pages/bycnoticeindex/Bycnoticeindex.vue
<template>
<div>
<!-- 头部导航面包屑 -->
<div class="nav">
<div class="noticeindex-nav">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/bycnoticetm' }"
>商标公告查询</el-breadcrumb-item
>
<el-breadcrumb-item>{{ choiceForm.num }}期公告</el-breadcrumb-item>
<el-breadcrumb-item v-if="choiceForm.num"
>{{ choiceForm.num }}期公告</el-breadcrumb-item
>
</el-breadcrumb>
</div>
......@@ -18,11 +20,10 @@
<el-select
v-model="choiceForm.type"
placeholder="请选择"
class="info-box"
@change="changeType"
>
<el-option label="商标初步审定公告" value="TMZCSQ"></el-option>
<!--TMZCSQ TMZCZC TMQTZC-->
<el-option label="商标初步审定公告" value="TMZCSQ"></el-option>
<el-option label="商标注册公告（一）" value="TMZCZC"></el-option>
<el-option label="商标注册公告（二）" value="TMQTZC"></el-option>
</el-select>
......@@ -30,7 +31,6 @@
<el-form-item label="公告期号：" class="left-span">
<el-input
v-model="choiceForm.num"
class="info-box"
placeholder="请输入公告期号"
></el-input>
</el-form-item>
......@@ -38,7 +38,6 @@
<el-input
v-model="choiceForm.user"
placeholder="请输入申请人名称"
class="info-box"
></el-input>
</el-form-item>
</el-row>
......@@ -46,7 +45,6 @@
<el-form-item label="商标名称：" class="left-span">
<el-input
v-model="choiceForm.name"
class="info-box"
placeholder="请输入商标名称"
></el-input>
</el-form-item>
......@@ -54,7 +52,6 @@
<el-select
v-model="choiceForm.kind"
placeholder="全部类别"
class="info-box"
@change="changeKind"
>
<el-option
......@@ -68,7 +65,6 @@
<el-form-item label="申请号：" class="left-span">
<el-input
v-model="choiceForm.digit"
class="info-box"
placeholder="请输入商标申请号"
></el-input>
</el-form-item>
......@@ -91,12 +87,12 @@
<div class="record">
<div class="title">
共
<span>&nbsp;{{ count }}&nbsp;</span>条公告数据
<span>&nbsp;{{ count > 10000 ? 10000 : count }}&nbsp;</span>条公告数据
</div>
</div>
<!-- 商标表格 -->
<div class="brand-form-wrap">
<el-table :data="brandData" class="brand-form">
<el-table :data="brandData" class="brand-form" v-loading="loading">
<el-table-column
prop="logo"
label="商标图样"
......@@ -104,7 +100,9 @@
width="150"
>
<template slot-scope="scope">
<img :src="scope.row.logo" alt="" />
<div class="img-wrap">
<img :src="scope.row.logo" alt="" />
</div>
</template>
</el-table-column>
<el-table-column
......@@ -112,44 +110,54 @@
label="商标名称"
align="center"
width="100"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ scope.row.sbmc ? scope.row.sbmc : "---" }}</span>
</template></el-table-column
>
<el-table-column
prop="sblb"
label="商标类别"
align="center"
width="100"
></el-table-column>
<el-table-column
prop="sbzch"
label="申请号"
align="center"
width="100"
></el-table-column>
<el-table-column
prop="zcr"
label="申请人"
align="center"
width="300"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ scope.row.sblb ? scope.row.sblb : "---" }}</span>
</template></el-table-column
>
<el-table-column prop="sbzch" label="申请号" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.sbzch ? scope.row.sbzch : "---" }}</span>
</template></el-table-column
>
<el-table-column prop="zcr" label="申请人" align="center" width="300">
<template slot-scope="scope">
<!-- 申请人返回的是" " 不是"",故加个trim去掉空格-->
<span>{{ scope.row.zcr.trim() ? scope.row.zcr : "---" }}</span>
</template></el-table-column
>
<el-table-column
prop="gglx"
label="公告类型"
align="center"
width="200"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ scope.row.gglx ? scope.row.gglx : "---" }}</span>
</template>
</el-table-column>
<el-table-column
prop="ggqh"
label="公告期号"
align="center"
width="150"
></el-table-column>
<el-table-column
prop="branddetail"
label="公告详情"
align="center"
width="90"
>
<template slot-scope="scope">
<span>{{ scope.row.ggqh ? scope.row.ggqh : "---" }}</span>
</template></el-table-column
>
<el-table-column prop="branddetail" label="公告详情" align="center">
<template slot-scope="scope">
<el-button
type="text"
size="small"
......@@ -167,7 +175,7 @@
background
layout="prev, pager, next"
:page-size="20"
:total="count"
:total="count > 10000 ? 10000 : count"
:current-page="noticequeryparams.currentPage"
@current-change="handleCurrentChange"
></el-pagination>
......@@ -255,13 +263,15 @@ export default {
},
// 共查出的数据条数
count: 0
count: 0,
// loading动画
loading: false
};
},
methods: {
// 点击 公告详情 跳到对应的公告详情页面
passNoticeNumber(index, row) {
// console.log(index, row);
// 提交请求
this.$router.push({
path: "/bycnoticedetail",
......@@ -277,64 +287,38 @@ export default {
async handleCurrentChange(val) {
// 改变当前页码为点击到的高亮的页码
this.noticequeryparams.currentPage = val;
// 提交查询参数
this.noticequeryparams.noticenumber = this.choiceForm.num;
this.noticequeryparams.applynumber = this.choiceForm.digit;
this.noticequeryparams.tmname = this.choiceForm.name;
this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind;
this.commonParams(); // 提交查询参数
let result = await noticequery(this.noticequeryparams).then(res => {
if (res.status == 0) {
if (res.data.rows.length == 0) {
this.$notify({
title: "警告",
message: "没有该商品", // 服务器端返回的数据为空
type: "warning"
});
} else {
return res.data; // 返回请求成功的非空数据
}
} else {
// 服务器端请求失败
this.$notify.error({
title: "错误",
message: res.msg
});
}
});
this.loading = true; // 查询数据之前显示 loading
let result = await this.getNoticeQuery();
// 如果查询后没有数据 就显示 0条记录 并 把表格数据置为空
if (result == undefined) {
this.brandData = [];
this.count = 0;
} else {
// 请求回来的数据装填 数据表 和 记录条数
this.brandData = result.rows;
this.loading = false; //数据查询成功之后隐藏 loading
this.count = result.count;
}
},
// 提交查询
async onSubmit() {
console.log("submit!");
// 提交查询参数
// 提交查询参数
commonParams() {
this.noticequeryparams.noticenumber = this.choiceForm.num;
this.noticequeryparams.applynumber = this.choiceForm.digit;
this.noticequeryparams.tmname = this.choiceForm.name;
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);
// 请求数据的方法提取
getNoticeQuery() {
return noticequery(this.noticequeryparams).then(res => {
if (res.status == 0) {
if (res.data.rows.length == 0) {
} else {
return res.data; // 返回请求成功的非空数据
}
return res.data; // 返回请求成功的非空数据
} else {
// 服务器端请求失败
this.$notify.error({
......@@ -343,14 +327,31 @@ export default {
});
}
});
},
// 如果查询后没有数据 就显示 0条记录 并 把表格数据置为空
if (result == undefined) {
this.brandData = [];
this.count = 0;
// 提交查询
async onSubmit() {
this.commonParams(); // 提交查询参数
if (/\D/.test(this.noticequeryparams.noticenumber)) {
// 数字
this.$message({
message: "工期号只能是数字",
type: "warning"
});
} else {
this.brandData = result.rows;
this.count = result.count;
this.noticequeryparams.currentPage = 1;
this.loading = true; // 查询数据之前显示 loading
let result = await this.getNoticeQuery();
// 如果查询后没有数据 就显示 0条记录 并 把表格数据置为空
if (result == undefined) {
this.brandData = [];
this.count = 0;
} else {
this.brandData = result.rows;
this.loading = false; //数据查询成功之后隐藏 loading
this.count = result.count;
}
}
},
......@@ -366,7 +367,6 @@ export default {
// 重置公告查询选项
clearChoices() {
console.log("clear, clear, clear");
this.choiceForm.num = null;
this.choiceForm.type = null;
this.choiceForm.user = null;
......@@ -379,28 +379,16 @@ export default {
// form表格接收传过来的参数 并 装填上
this.choiceForm.type = this.$route.query.type;
this.choiceForm.num = this.$route.query.noticenum;
// 获取 公告查询的参数
this.noticequeryparams.noticenumber = this.choiceForm.num;
this.noticequeryparams.applynumber = this.choiceForm.digit;
this.noticequeryparams.tmname = this.choiceForm.name;
this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind;
this.commonParams(); // 提交查询参数
// 进行公告查询 并 对返回的数据进行处理
this.loading = true; // 查询数据之前显示 loading
noticequery(this.noticequeryparams).then(res => {
if (res.status == 0) {
if (res.data.rows.length == 0) {
// 服务器端返回的数据为空
// this.$notify({
// title: "警告",
// message: "没有该商品",
// type: "warning"
// });
} else {
this.brandData = res.data.rows;
this.count = res.data.count;
}
// 查询成功有数据就装填在表格里面 无数据表格提示查询数据为空
this.brandData = res.data.rows;
this.loading = false; //数据查询成功之后隐藏 loading
this.count = res.data.count;
} else {
// 服务器端请求失败
this.$notify.error({
......@@ -414,27 +402,56 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss">
/* 头部导航面包屑 */
.nav {
.noticeindex-nav {
width: 1200px;
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
// 样式，，，
.el-breadcrumb > .el-breadcrumb__item > .el-breadcrumb__inner {
color: rgb(9, 137, 197);
font-size: 16px;
padding-bottom: 19px;
.el-breadcrumb {
span:nth-child(1) {
.el-breadcrumb__inner.is-link {
color: #03004c;
font-size: 16px;
}
}
span:nth-child(2) {
.el-breadcrumb__inner {
color: #0989c5;
font-size: 16px;
}
}
}
}
/* 查询选择表单 */
.choice-form {
background: #f7f8fc;
border: 1px solid #eff1f9;
width: 1198px;
height: 129px;
background: rgba(247, 248, 252, 1);
border: 1px solid rgba(239, 241, 249, 1);
width: 1200px;
height: 131px;
margin: 0 auto;
.el-form {
.el-row {
.el-form-item {
.el-input {
.el-input__inner {
width: 220px;
height: 34px;
border-radius: 0px;
}
}
}
.el-form-item {
.el-button {
padding: 0;
border-radius: 0px;
}
}
}
}
.first-row {
margin-top: 18px;
......@@ -445,15 +462,6 @@ export default {
height: 34px;
}
.info-box {
width: 220px;
height: 334px;
}
/* .el-input__inner {
border-radius: 0px;
} */
.btn-size {
width: 60px;
height: 34px;
......@@ -482,31 +490,45 @@ export default {
/* 商标表格 */
.brand-form-wrap {
width: 1198px;
width: 1200px;
margin: 0 auto;
border: 1px solid #d6daeb;
border-bottom: none;
.brand-form {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
.img-wrap {
width: 80px;
height: 80px;
margin: 0 auto;
background: url("https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_imagequery293101543401586324201828183946324czhd.png")
no-repeat;
background-size: 100% 100%;
}
img {
display: block;
width: 80px;
height: 80px;
margin: 0 auto;
}
.el-table__header-wrapper .el-table__header .has-gutter tr th {
background: rgba(247, 248, 252, 1);
}
}
}
/* 分页器 */
.pagenation {
background: #f7f8fc;
width: 1198px;
height: 59px;
width: 1200px;
height: 60px;
background: #fff;
border: 1px solid rgba(214, 218, 235, 1);
margin: 0 auto;
text-align: right;
.el-pagination {
margin: 15px 0;
}
}
</style>
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue
<template>
<div class="noticepage">
<!-- 头部导航面包屑 -->
<div class="nav">
<div class="noticetm-nav">
<span>商标公告查询</span>
</div>
<!-- 查询选择表单 -->
<div class="choice-form">
<el-form :inline="true" :model="choiceForm" :rules="rule">
<el-form :inline="true" :model="choiceForm">
<el-row class="first-row">
<el-form-item label="公告类型：" class="left-span">
<el-select
......@@ -76,6 +76,7 @@
</template>
<script>
// 近12期初审公告 公告查询接口
import { noticequeryTMZCSQ } from "@/api/tmQuery.js";
export default {
data() {
......@@ -85,30 +86,47 @@ export default {
type: "TMZCSQ", // 公告类型
num: null // 公告期号
},
rule: {},
// 商标表格数据
brandData: [],
// 动画
loading: false
// loading动画
loading: false,
// 最大工期号
maxNum: null
};
},
methods: {
// 点击 查询 按钮，提交表单数据进行查询
onSubmit() {
console.log(this.choiceForm.num);
// 关于输入的工期号的验证判断
if (this.choiceForm.num == null) {
console.log("konhkongkong");
// 非空
this.$message({
message: "请输入目标",
type: "warning"
});
} else if (/\D/.test(this.choiceForm.num)) {
// 数字
this.$message({
message: "工期号只能是正整数数字",
type: "warning"
});
} else if (this.choiceForm.num <= 0) {
// 大于0
this.$message({
message: "工期号是大于0的数字",
type: "warning"
});
} else if (this.choiceForm.num > this.maxNum) {
// 小于最大工期号
this.$message({
message: "工期号只能是数字",
message: `工期号是小于或等于最大工期号${this.maxNum}的数字`,
type: "warning"
});
} else {
// 验证通过，提交表单的数据，在详情页面显示查询结果
this.$router.push({
path: "/bycnoticeindex",
query: {
......@@ -118,11 +136,11 @@ export default {
});
}
},
// 选择不同的 初审公告 注册公告一 注册公告二 三种类型对应不同的类型接口参数
changeOption(value) {
// console.log(value);
this.choiceForm.type = value;
console.log("change change", this.choiceForm.type);
},
// 点击公告详情 按钮，提交工期号和公告类型进行查询，在详情页面显示查询结果
passNoticeNumber(index, row) {
this.choiceForm.num = row.notice_issue;
// 提交请求
......@@ -138,13 +156,23 @@ export default {
created() {
// 刷新页面取消查询的query参数
this.$router.push("/bycnoticetm");
this.loading = true;
this.loading = true; // 查询数据之前显示 loading
noticequeryTMZCSQ().then(res => {
this.brandData = res.data.rows;
this.loading = false;
if (res.status == 0) {
this.brandData = res.data.rows;
this.loading = false; //数据查询成功之后隐藏 loading
if (res.data.rows.length != 0) {
this.maxNum = res.data.rows[0].notice_issue; // 保留数据中的最大工期号
}
} else {
this.$notify.error({
title: "错误", // 服务器端请求失败
message: res.msg
});
}
});
},
mounted() {}
}
};
</script>
......@@ -156,32 +184,36 @@ export default {
.choice-form {
.el-input__inner {
border-radius: 0px;
height: 34px;
width: 300px;
}
}
.has-gutter tr th {
background: #d6daeb;
}
/* 头部导航面包屑 */
.nav {
.noticetm-nav {
width: 1200px;
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
padding-bottom: 19px;
span {
font-weight: 500;
line-height: 20px;
width: 96px;
height: 21px;
font-size: 16px;
color: #03004c;
color: rgba(3, 0, 76, 1);
line-height: 21px;
}
}
/* 查询选择表单 */
.choice-form {
background: #f7f8fc;
border: 1px solid #eff1f9;
width: 1198px;
width: 1200px;
height: 76px;
background: rgba(247, 248, 252, 1);
border: 1px solid rgba(239, 241, 249, 1);
margin: 0 auto;
.first-row {
margin-top: 18px;
button.el-button {
......@@ -192,6 +224,7 @@ export default {
box-sizing: border-box;
border-radius: 0;
line-height: 0;
margin-top: 2px;
}
}
......@@ -219,24 +252,34 @@ export default {
margin: 0 auto;
height: 40px;
span {
padding-left: 17px;
padding-left: 20px;
width: 113px;
height: 20px;
font-size: 14px;
color: rgb(130, 130, 130);
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(102, 102, 102, 1);
line-height: 40px;
}
}
/* 商标表格 */
.brand-form-wrap {
width: 1198px;
width: 1200px;
margin: 0 auto;
border: 1px solid #d6daeb;
margin-bottom: 100px;
.brand-form {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
// 样式，，，
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(102, 102, 102, 1);
th.is-center {
padding: 8px 0px;
}
td.is-center {
padding: 4px 0px;
}
}
.el-table__row {
td:nth-child(4) {
......
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