Skip to content

Z
zhichan
Commit 158d6438 by 尹亚亭
Options

0121

parent a372502b
Showing with 102 additions and 47 deletions
channel-access/src/api/tmQuery.js
...@@ -34,7 +34,6 @@ export function noticequeryTMZCSQ() { ...@@ -34,7 +34,6 @@ export function noticequeryTMZCSQ() {
export function noticequery(params) { export function noticequery(params) {
return http.post(baseUrl, { return http.post(baseUrl, {
actionType: "noticequery", actionType: "noticequery",
actionBody: params actionBody: params
}); });
} }
...@@ -43,10 +42,6 @@ export function noticequery(params) { ...@@ -43,10 +42,6 @@ export function noticequery(params) {
export function noticeSearch(params) { export function noticeSearch(params) {
return http.post(baseUrl, { return http.post(baseUrl, {
actionType: "noticesearch", actionType: "noticesearch",
// actionBody: {
// csggqh: 1663, //公告期号
// sbzch: "36280736" //商标注册号
// }
actionBody: params actionBody: params
}); });
} }
......
channel-access/src/views/pages/bycnoticedetail/Bycnoticedetail.vue
<template> <template>
<div class="notice-details-page"> <div class="notice-details-page">
<div class="nav"> <div class="noticedetail-nav">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/bycnoticetm' }" <el-breadcrumb-item :to="{ path: '/bycnoticetm' }"
>商标公告查询</el-breadcrumb-item >商标公告查询</el-breadcrumb-item
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
> >
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="show-notice"> <div class="show-notice" v-loading="loading">
<!-- 优化点：数据图片的展示：GET net::ERR_NAME_NOT_RESOLVED 给予相应提示 -->
<img :src="linkurl" alt="" /> <img :src="linkurl" alt="" />
</div> </div>
</div> </div>
...@@ -30,10 +29,11 @@ export default { ...@@ -30,10 +29,11 @@ export default {
ggqh: "", ggqh: "",
sbzch: "" sbzch: ""
}, },
// 面包屑部分： 商标名称 sbmc: "", // 面包屑部分： 商标名称
sbmc: "", linkurl: "", // 返回数据中的公告图形
// 返回数据中的公告图形
linkurl: "" // 动画加载
loading: false
}; };
}, },
created() { created() {
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
this.noticesearchparams.ggqh = this.$route.query.ggqh.split("(")[0]; this.noticesearchparams.ggqh = this.$route.query.ggqh.split("(")[0];
this.noticesearchparams.sbzch = this.$route.query.sbzch; this.noticesearchparams.sbzch = this.$route.query.sbzch;
this.loading = true; // 查询数据之前显示 loading
// 进行公告详情查询 // 进行公告详情查询
noticeSearch(this.noticesearchparams).then(res => { noticeSearch(this.noticesearchparams).then(res => {
if (res.status == 0) { if (res.status == 0) {
...@@ -56,11 +57,12 @@ export default { ...@@ -56,11 +57,12 @@ export default {
// 状态码不是 0 // 状态码不是 0
else { else {
this.linkurl = res.data.linkurl; 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 linkpart2 = this.linkurl.split(":8000")[1];
let rightlinkpart1 = "http://sbggwj.sbj.cnipa.gov.cn"; let rightlinkpart1 = "http://sbggwj.sbj.cnipa.gov.cn";
let rightlinkurl = rightlinkpart1.concat(":8000", linkpart2); let rightlinkurl = rightlinkpart1.concat(":8000", linkpart2);
this.linkurl = rightlinkurl; this.linkurl = rightlinkurl;
this.loading = false; //数据查询成功之后隐藏 loading
} }
} else { } else {
this.$notify.error({ this.$notify.error({
...@@ -73,24 +75,39 @@ export default { ...@@ -73,24 +75,39 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.notice-details-page { .notice-details-page {
min-height: calc(100% - 70px); 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 { .noticedetail-nav {
width: 1200px; width: 889px;
margin: 0 auto; margin: 0 auto;
padding: 20px 0; padding: 20px 0;
} }
.show-notice { .show-notice {
width: 889px; width: 889px;
height: 1260px; height: 1260px;
padding-top: 50px; padding-top: 10px;
margin: 0 auto; margin: 0 auto;
img { img {
display: block; display: block;
border: 1px solid gray; border: 1px solid gray;
width: 100%;
} }
} }
</style> </style>
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue
<template> <template>
<div class="noticepage"> <div class="noticepage">
<!-- 头部导航面包屑 --> <!-- 头部导航面包屑 -->
<div class="nav"> <div class="noticetm-nav">
<span>商标公告查询</span> <span>商标公告查询</span>
</div> </div>
<!-- 查询选择表单 --> <!-- 查询选择表单 -->
<div class="choice-form"> <div class="choice-form">
<el-form :inline="true" :model="choiceForm" :rules="rule"> <el-form :inline="true" :model="choiceForm">
<el-row class="first-row"> <el-row class="first-row">
<el-form-item label="公告类型：" class="left-span"> <el-form-item label="公告类型：" class="left-span">
<el-select <el-select
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
</template> </template>
<script> <script>
// 近12期初审公告 公告查询接口
import { noticequeryTMZCSQ } from "@/api/tmQuery.js"; import { noticequeryTMZCSQ } from "@/api/tmQuery.js";
export default { export default {
data() { data() {
...@@ -85,30 +86,47 @@ export default { ...@@ -85,30 +86,47 @@ export default {
type: "TMZCSQ", // 公告类型 type: "TMZCSQ", // 公告类型
num: null // 公告期号 num: null // 公告期号
}, },
rule: {},
// 商标表格数据 // 商标表格数据
brandData: [], brandData: [],
// 动画 // loading动画
loading: false loading: false,
// 最大工期号
maxNum: null
}; };
}, },
methods: { methods: {
// 点击 查询 按钮，提交表单数据进行查询
onSubmit() { onSubmit() {
console.log(this.choiceForm.num); // 关于输入的工期号的验证判断
if (this.choiceForm.num == null) { if (this.choiceForm.num == null) {
console.log("konhkongkong"); // 非空
this.$message({ this.$message({
message: "请输入目标", message: "请输入目标",
type: "warning" type: "warning"
}); });
} else if (/\D/.test(this.choiceForm.num)) { } 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({ this.$message({
message: "工期号只能是数字", message: `工期号是小于或等于最大工期号${this.maxNum}的数字`,
type: "warning" type: "warning"
}); });
} else { } else {
// 验证通过，提交表单的数据，在详情页面显示查询结果
this.$router.push({ this.$router.push({
path: "/bycnoticeindex", path: "/bycnoticeindex",
query: { query: {
...@@ -118,11 +136,11 @@ export default { ...@@ -118,11 +136,11 @@ export default {
}); });
} }
}, },
// 选择不同的 初审公告 注册公告一 注册公告二 三种类型对应不同的类型接口参数
changeOption(value) { changeOption(value) {
// console.log(value);
this.choiceForm.type = value; this.choiceForm.type = value;
console.log("change change", this.choiceForm.type);
}, },
// 点击公告详情 按钮，提交工期号和公告类型进行查询，在详情页面显示查询结果
passNoticeNumber(index, row) { passNoticeNumber(index, row) {
this.choiceForm.num = row.notice_issue; this.choiceForm.num = row.notice_issue;
// 提交请求 // 提交请求
...@@ -138,13 +156,23 @@ export default { ...@@ -138,13 +156,23 @@ export default {
created() { created() {
// 刷新页面取消查询的query参数 // 刷新页面取消查询的query参数
this.$router.push("/bycnoticetm"); this.$router.push("/bycnoticetm");
this.loading = true;
this.loading = true; // 查询数据之前显示 loading
noticequeryTMZCSQ().then(res => { noticequeryTMZCSQ().then(res => {
this.brandData = res.data.rows; if (res.status == 0) {
this.loading = false; 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> </script>
...@@ -156,32 +184,36 @@ export default { ...@@ -156,32 +184,36 @@ export default {
.choice-form { .choice-form {
.el-input__inner { .el-input__inner {
border-radius: 0px; border-radius: 0px;
height: 34px;
width: 300px;
} }
} }
.has-gutter tr th { .has-gutter tr th {
background: #d6daeb; background: #d6daeb;
} }
/* 头部导航面包屑 */ /* 头部导航面包屑 */
.nav { .noticetm-nav {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding-top: 21px; padding-top: 21px;
padding-bottom: 18px; padding-bottom: 19px;
span { span {
font-weight: 500; width: 96px;
line-height: 20px; height: 21px;
font-size: 16px; font-size: 16px;
color: #03004c; color: rgba(3, 0, 76, 1);
line-height: 21px;
} }
} }
/* 查询选择表单 */ /* 查询选择表单 */
.choice-form { .choice-form {
background: #f7f8fc; width: 1200px;
border: 1px solid #eff1f9;
width: 1198px;
height: 76px; height: 76px;
background: rgba(247, 248, 252, 1);
border: 1px solid rgba(239, 241, 249, 1);
margin: 0 auto; margin: 0 auto;
.first-row { .first-row {
margin-top: 18px; margin-top: 18px;
button.el-button { button.el-button {
...@@ -192,6 +224,7 @@ export default { ...@@ -192,6 +224,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border-radius: 0; border-radius: 0;
line-height: 0; line-height: 0;
margin-top: 2px;
} }
} }
...@@ -219,24 +252,34 @@ export default { ...@@ -219,24 +252,34 @@ export default {
margin: 0 auto; margin: 0 auto;
height: 40px; height: 40px;
span { span {
padding-left: 17px; padding-left: 20px;
width: 113px;
height: 20px;
font-size: 14px; 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; line-height: 40px;
} }
} }
/* 商标表格 */ /* 商标表格 */
.brand-form-wrap { .brand-form-wrap {
width: 1198px; width: 1200px;
margin: 0 auto; margin: 0 auto;
border: 1px solid #d6daeb; border: 1px solid #d6daeb;
margin-bottom: 100px; margin-bottom: 100px;
.brand-form { .brand-form {
font-family: PingFangSC-Regular; font-size: 12px;
font-size: 14px; font-family: PingFangSC-Regular, PingFang SC;
color: #333333; font-weight: 400;
// 样式，，， color: rgba(102, 102, 102, 1);
th.is-center {
padding: 8px 0px;
}
td.is-center {
padding: 4px 0px;
}
} }
.el-table__row { .el-table__row {
td:nth-child(4) { 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