Skip to content

Z
zhichan
Commit 4c2e77b3 by 任建
Options

renjian

parent 67ad9c18
Showing with 81 additions and 42 deletions
embed_applications/app/front/vues/pages/brandfind/brandfind.js
......@@ -155,6 +155,7 @@
this.$message.warning("请输入目标");
} else {
/* 0:相同商标,1：相似商标,2：申请号,3：申请人,4：图像*/
console.log(this.tabsName,"12312312");
if (this.tabsName == "0") {
this.accurateTmSearch();
} else if (this.tabsName == "1") {
......@@ -646,6 +647,7 @@
console.log("12345");
console.log(this.tabsName);
console.log(typeof (this.tabsName));
this.currentpage="1";
if (this.tabsName == "4") {
console.log(123);
}
......
embed_applications/app/front/vues/pages/noticetm/noticetm.html
......@@ -183,8 +183,8 @@
</ul>
</div>
<!-- 分页 -->
<div class="brandfind-list-page">
<el-pagination background v-if="tms" layout="prev, pager, next" :page-size="pageSize" prev-text="上一页"
<div class="brandfind-list-page" v-if="tms.length">
<el-pagination style="marginTop:18px;" background v-if="tms" layout="prev, pager, next" :page-size="pageSize" prev-text="上一页"
next-text="下一页" :current-page="currentPage" :total="total"
@current-change="currentChange">
</el-pagination>
......
embed_applications/app/front/vues/pages/noticetm/noticetm.js
......@@ -149,6 +149,7 @@
var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, "");
var nclnum = sblb.split(" ")[0];
nclnum = Number(nclnum);
console.log(nclnum);
nclnum = this.ncldata[nclnum - 1].code + " " + this.ncldata[nclnum - 1].name;
rows[i]["nclnum"] = nclnum;
}
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.html
......@@ -48,7 +48,7 @@
</div>
<div class="tmbigdata-contentTwo">
<div class="tmbigdata-content-left">
<gsb-echart2 ref="trademarkApplicationRef" :data="trademarkApplicationdata"></gsb-echart2>
<gsb-echart2 style="marginLeft:30px;box-sizing: border-box;" ref="trademarkApplicationRef" :data="trademarkApplicationdata"></gsb-echart2>
</div>
<div class="tmbigdata-content-right">
<div class="tmbigdata-content-right-tabs"><span>商标类别申请排名</span><div @click="tmbigdatadetail(3)">详情</div></div>
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.js
......@@ -66,99 +66,135 @@
title: '多 X 轴示例',
tabsKey: 1,
trademarkApplicationdata: {
boundaryGap: false,
color: ['#5793f3', '#d14a61', '#675bba'],
tooltip: {
trigger: 'none',
trigger: 'axis',
formatter: function(params) {
return `<div>
<p>${params[0].axisValue}</p>
<p>${params[0].marker}${params[0].seriesName}:${params[0].value}</p>
<p>${params[1].marker}${params[1].seriesName}:${params[1].value}</p>
</div>`;
},
axisPointer: {
type: 'cross'
},
},
title:{
text:"商标申请及注册趋势",
y:'30px',
textStyle:{
fontWeight: '500',
fontSize:'15px',
color: '#666'
}
},
legend: {
y: '35px',
right:'10%',
data: ['商标申请', '商标注册']
},
grid: {
top: 70,
bottom: 50
},
xAxis: [
{
type: 'category',
boundaryGap: false,
axisTick: {
alignWithLabel: true
alignWithLabel: true,
show:false
},
axisLine: {
onZero: false,
lineStyle: {
color: '#d14a61'
color: '#5793f3',
width: 1
}
},
axisPointer: {
label: {
tooltip: {
formatter: function (params) {
return '商标申请 ' + params.value
+ (params.seriesData.length ? '：' + params.seriesData[0].data : '');
return params;
}
}
},
data: ["2014", "2015", "2016", "2017", "2018", "2019"]
data: ["2014", "2015", "2016", "2017", "2018", "2019"],
},
],
yAxis: [
{
type: 'category',
type: 'value',
splitNumber:4,
max:8000000,
boundaryGap: false,
axisTick: {
alignWithLabel: true
alignWithLabel: true,
show:false
},
axisLine: {
onZero: false,
lineStyle: {
color: '#5793f3'
color: '#5793f3',
width: 1
}
},
axisPointer: {
label: {
tooltip: {
formatter: function (params) {
return '商标注册 ' + params.value
+ (params.seriesData.length ? '：' + params.seriesData[0].data : '');
return params;
}
}
},
data: ["2014", "2015", "2016", "2017", "2018", "2019"]
splitLine: {
show: true,
lineStyle:{
color:'#F1F4F5',
type: 'solid'
}
],
yAxis: [
{
type: 'value'
},
}
],
series: [
{
name: '',
type: 'line',
xAxisIndex: 1,
smooth: true,
data: [],
lineStyle:{
color:'#C2DBFE'
series: [{
name: 'pv',
itemStyle: {
normal: {
color: '#FEBD04',
lineStyle: {
color: '#FEBD04',
width: 2
},
areaStyle: {
color:'#C2DBFE'
}
},
{
name: '',
type: 'line',
smooth: true,
type: 'line',
data: [],
lineStyle:{
color:'#F1C898'
animationDuration: 2800,
animationEasing: 'cubicInOut'
},
{
name: 'ip',
smooth: true,
type: 'line',
itemStyle: {
normal: {
color: '#3888fa',
lineStyle: {
color: '#3888fa',
width: 2
},
areaStyle: {
color:'#F1C898'
color: 'rgba(10, 144, 254, 0.05)'
}
}
]
},
data: [],
animationDuration: 2800,
animationEasing: 'quadraticOut'
}]
},
provinceType: false,
cityType: false,
......@@ -624,7 +660,7 @@
}]
},
loading:false
loading:false,
}
},
......@@ -784,8 +820,8 @@
var data = d.data;
var echarts = that.$refs.trademarkApplicationRef.getEchartObj();
that.trademarkApplicationdata.series[0].data = data.sqtrend.data;
that.trademarkApplicationdata.series[0].name = data.sqtrend.name;
that.trademarkApplicationdata.series[1].data = data.zctrend.data;
that.trademarkApplicationdata.series[0].name = data.sqtrend.name;
that.trademarkApplicationdata.series[1].name = data.zctrend.name;
echarts.setOption(that.trademarkApplicationdata);
window.addEventListener("resize", function () {
......
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