Skip to content

Z
zhichan
Commit ea5b2d15 by 尹亚亭
Options

bycnotice

parent 8c6fa6b7
Showing with 175 additions and 51 deletions
channel-access/src/api/tmQuery.js
......@@ -48,22 +48,36 @@ export function noticequeryTMZCSQ() {
}
// 公告列表检索接口
export function noticequery() {
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: {
// noticenumber: "1656",
// applynumber: "",
// tmname: "大爱城控股",
// applier: "",
// noticetype: "TMZCSQ",
// nclNum: "all",
// // 公告列表检索接口
// pageSize: 20,
// currentPage: 1
// }
actionBody: params
});
}
// 初审公告详情查询接口
export function noticeSearch(params) {
return http.post(baseUrl, {
actionType: "noticesearch",
// actionBody: {
// csggqh: 1663, //公告期号
// sbzch: "36280736" //商标注册号
// }
actionBody: params
});
}
//商标精确检索接口
export function findTrademarkNameAccurate(params) {
return http.post(baseUrl, {
......
channel-access/src/router/index.js
......@@ -115,6 +115,12 @@ const routes = [
path: "/bycnoticeindex",
name: "bycnoticeindex",
component: () => import("@/views/pages/bycnoticeindex/Bycnoticeindex")
},
// 公告查询 公告详情页
{
path: "/bycnoticedetail",
name: "bycnoticedetail",
component: () => import("@/views/pages/bycnoticedetail/Bycnoticedetail")
}
];
const router = new VueRouter({
......
channel-access/src/views/pages/bycnoticedetail/Bycnoticedetail.vue 0 → 100644
<template>
<div class="notice-details-page">
<div class="nav">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/bycnoticetm' }"
>商标公告查询</el-breadcrumb-item
>
<!-- 优化点：公告类型不同 -->
<el-breadcrumb-item :to="{ path: '/bycnoticeindex' }"
>第{{ noticesearchparams.ggqh }}期商标初审公告</el-breadcrumb-item
>
<el-breadcrumb-item :to="{ path: '/bycnoticedetail' }"
>{{ sbmc }}公告详情</el-breadcrumb-item
>
</el-breadcrumb>
</div>
<div class="show-notice">
<!-- 优化点：数据图片的展示：GET net::ERR_NAME_NOT_RESOLVED 给予相应提示 -->
<img :src="linkurl" alt="" />
</div>
</div>
</template>
<script>
import { noticeSearch } from "@/api/tmQuery.js";
export default {
data() {
return {
noticesearchparams: {
ggqh: "",
sbzch: ""
},
// 面包屑部分： 商标名称
sbmc: "",
// 返回数据中的公告图形
linkurl: ""
};
},
created() {
// 面包屑部分 商标名称的装填
this.sbmc = this.$route.query.sbmc;
// 获取并装填公告详情查询参数
this.noticesearchparams.ggqh = this.$route.query.ggqh.split("(")[0];
this.noticesearchparams.sbzch = this.$route.query.sbzch;
// 进行公告详情查询
noticeSearch(this.noticesearchparams).then(res => {
if (res.status == 0) {
if (res.data == null) {
this.$notify({
title: "警告",
message: "暂时没有该公告", // 服务器端返回的数据为空
type: "warning"
});
}
// 状态码不是 0
else {
this.linkurl = res.data.linkurl;
// 域名处理 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;
}
} else {
this.$notify.error({
title: "错误", // 服务器端请求失败
message: res.msg
});
}
});
}
};
</script>
<style lang="scss" scoped>
.notice-details-page {
min-height: calc(100% - 70px);
}
.nav {
width: 1200px;
margin: 0 auto;
padding: 20px 0;
}
.show-notice {
width: 889px;
height: 1260px;
padding-top: 50px;
margin: 0 auto;
img {
display: block;
border: 1px solid gray;
}
}
</style>
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue
<template>
<div>
<div class="noticepage">
<!-- 头部导航面包屑 -->
<div class="nav">
<span>商标公告查询</span>
......@@ -15,15 +15,9 @@
class="info-box"
@change="changeOption"
>
<el-option label="商标初步审定公告" value="chushen"></el-option>
<el-option
label="商标注册公告（一）"
value="gonggaoyi"
></el-option>
<el-option
label="商标注册公告（二）"
value="gonggaoer"
></el-option>
<el-option label="商标初步审定公告" value="TMZCSQ"></el-option>
<el-option label="商标注册公告（一）" value="TMZCZC"></el-option>
<el-option label="商标注册公告（二）" value="TMQTZC"></el-option>
</el-select>
</el-form-item>
<el-form-item label="公告期号：" class="left-span" prop="num">
......@@ -47,13 +41,8 @@
<!-- 公告表格 -->
<div class="brand-form-wrap">
<el-table :data="brandData" class="brand-form">
<el-table-column
prop="notice_issue"
label="公告期"
align="center"
width="240"
>
<el-table :data="brandData" class="brand-form" v-loading="loading">
<el-table-column prop="notice_issue" label="公告期" align="center">
</el-table-column>
<el-table-column
prop="date"
......@@ -72,7 +61,14 @@
></el-table-column>
<el-table-column prop="operation" label="操作" align="center">
<el-button type="text" size="small">公告详情</el-button>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="passNoticeNumber(scope.$index, scope.row)"
>公告详情</el-button
>
</template>
</el-table-column>
</el-table>
</div>
......@@ -86,36 +82,33 @@ export default {
return {
// 查询选择表单数据
choiceForm: {
// 公告类型
type: "chushen",
// 公告期号
num: null
type: "TMZCSQ", // 公告类型
num: null // 公告期号
},
rule: {},
// 商标表格数据
brandData: []
brandData: [],
// 动画
loading: false
};
},
methods: {
onSubmit() {
// console.log("submit!", this.choiceForm.num);
// console.log(typeof this.choiceForm.num);
console.log(this.choiceForm.num);
if (this.choiceForm.num == null) {
console.log("konhkongkong");
this.$message({
message: "请输入目标",
type: "warning"
});
}
// 判断为
// if () {
// this.$message({
// message: "工期号只能是数字",
// type: "warning"
// });
// }
else {
} else if (/\D/.test(this.choiceForm.num)) {
this.$message({
message: "工期号只能是数字",
type: "warning"
});
} else {
this.$router.push({
path: "/bycnoticeindex",
query: {
......@@ -129,23 +122,37 @@ export default {
// console.log(value);
this.choiceForm.type = value;
console.log("change change", this.choiceForm.type);
},
passNoticeNumber(index, row) {
this.choiceForm.num = row.notice_issue;
// 提交请求
this.$router.push({
path: "/bycnoticeindex",
query: {
type: this.choiceForm.type,
noticenum: this.choiceForm.num
}
});
}
},
created() {
// 刷新页面取消查询的query参数
this.$router.push("/bycnoticetm");
this.loading = true;
noticequeryTMZCSQ().then(res => {
this.brandData = res.data.rows;
this.loading = false;
});
},
mounted() {
console.log(this.choiceForm.type);
}
mounted() {}
};
</script>
<style lang="scss" scoped>
.noticepage {
// 企链 70px的footer ; 启服通的footer是377px
min-height: calc(100% - 70px);
}
/* 头部导航面包屑 */
.nav {
width: 1200px;
......@@ -221,6 +228,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
// 样式，，，
> .el-table__body-wrapper
> .el-table__body
> tbody
......
channel-access/src/views/pages/jdbycquerytm/index.vue
......@@ -22,7 +22,7 @@
<el-button type="primary">检索</el-button>
</div>
<div class="jdbycquerytm-serch-right">
<el-button>公告查询</el-button>
<el-button @click="$router.push('/bycnoticetm')">公告查询</el-button>
</div>
</div>
<div class="jdbycquerytm-tabs">
......
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