Skip to content

T
ty_patentSys
Commit 53f163c0 by hanxiao
Options

修改细节

parent 5e5a28c5
Showing with 99 additions and 43 deletions
src/views/home/home.vue
......@@ -52,6 +52,12 @@
<div
v-else-if="patent_cate == 'fmr'"
style="cursor: pointer; width: 80%"
v-html="item.title"
@click="lenovnoPatentDetails(item)"
></div>
<div
v-else
style="cursor: pointer; width: 80%"
v-html="item.gkh"
@click="lenovnoPatentDetails(item)"
></div>
......
src/views/screen/components/patentMap.vue
......@@ -129,8 +129,8 @@ export default {
map: "shanxi",
aspectScale: 1,
zoom: 0.65,
layoutCenter: ["50%", "38%"],
layoutSize: "120%",
layoutCenter: ["50%", "50%"],
layoutSize: "150%",
show: true,
roam: false,
label: {
......@@ -205,8 +205,8 @@ export default {
},
},
layoutCenter: ["50%", "38%"],
layoutSize: "120%",
layoutCenter: ["50%", "50%"],
layoutSize: "150%",
markPoint: {
symbol: "none",
},
......@@ -302,8 +302,6 @@ export default {
},
visualMap: {
show: false,
// min: 0,
// max: 100,
left: "left",
top: "bottom",
text: ["高", "低"],
......@@ -318,8 +316,8 @@ export default {
map: "shanxi",
aspectScale: 1,
zoom: 0.65,
layoutCenter: ["50%", "38%"],
layoutSize: "120%",
layoutCenter: ["50%", "50%"],
layoutSize: "150%",
show: true,
roam: false,
label: {
......@@ -392,8 +390,8 @@ export default {
},
},
layoutCenter: ["50%", "38%"],
layoutSize: "120%",
layoutCenter: ["50%", "50%"],
layoutSize: "150%",
markPoint: {
symbol: "none",
},
......@@ -468,7 +466,7 @@ export default {
}
}
.echarts_container {
height: 90%;
height: 70%;
// margin-top: 20px;
}
.center_top_imgs {
......
src/views/screen/components/patentPerson.vue
......@@ -4,13 +4,16 @@
<span>专利受让省份排名</span>
<div class="center_left_title_btn">
<span :class="[type1 == 1 ? 'active' : '']" @click="changeType(1)"
>申请量</span
>专利总量</span
>
<span :class="[type1 == 2 ? 'active' : '']" @click="changeType(2)"
>公布量</span
>发明专利</span
>
<span :class="[type1 == 3 ? 'active' : '']" @click="changeType(3)"
>授权量</span
>实用新型</span
>
<span :class="[type1 == 4 ? 'active' : '']" @click="changeType(4)"
>外观设计</span
>
<a-select
ref="select"
......@@ -402,6 +405,7 @@ export default {
.center_left_echarts {
padding: 0 15px 0 5px;
height: 45%;
margin-bottom: 25px;
.center_left_title {
background: url("../../../static/screen/title-short.png") no-repeat;
background-size: 100% 100%;
......
src/views/screen/components/patentType.vue
......@@ -28,12 +28,7 @@
</div>
</div>
<div class="echarts_container">
<EchartsCon
:id="'123'"
:option="option1"
v-if="option1"
></EchartsCon>
<EchartsCon :id="'123'" :option="option1" v-if="option1"></EchartsCon>
</div>
</div>
<div class="center_left_echarts">
......@@ -54,14 +49,14 @@
>
<a-select
ref="select"
v-model:value="yearValue1"
v-model:value="yearValue2"
@change="changeYear"
:options="options1"
>
</a-select>
<a-select
ref="select"
v-model:value="yearValue2"
v-model:value="yearValue1"
@change="changeYear"
:options="options1"
>
......@@ -69,12 +64,7 @@
</div>
</div>
<div class="echarts_container">
<EchartsCon
:id="'456'"
:option="option2"
v-if="option2"
></EchartsCon>
<EchartsCon :id="'456'" :option="option2" v-if="option2"></EchartsCon>
</div>
</div>
</template>
......@@ -201,6 +191,8 @@ export default {
],
ydata1 = [],
ydata2 = [];
if (this.yearValue1 > this.yearValue2) {
[this.yearValue1, this.yearValue2] = [this.yearValue2, this.yearValue1];
patentAuthorized({
start_year: this.yearValue1,
end_year: this.yearValue2,
......@@ -214,6 +206,32 @@ export default {
});
this.getCompareOption(xdata, ydata1, ydata2);
});
} else if (this.yearValue1 == this.yearValue2) {
patentAuthorized({
start_year: this.yearValue1,
end_year: this.yearValue2,
type: this.type2,
}).then((res) => {
res.data.start_year.forEach((item) => {
ydata1.push(item.value);
});
this.getCompareOption(xdata, ydata1, []);
});
} else {
patentAuthorized({
start_year: this.yearValue1,
end_year: this.yearValue2,
type: this.type2,
}).then((res) => {
res.data.start_year.forEach((item) => {
ydata1.push(item.value);
});
res.data.end_year.forEach((item) => {
ydata2.push(item.value);
});
this.getCompareOption(xdata, ydata1, ydata2);
});
}
},
//获取专利授权对比
getCompareData() {
......@@ -233,8 +251,8 @@ export default {
],
ydata1 = [],
ydata2 = [];
this.yearValue1 = this.options1[0].value;
this.yearValue2 = this.options1[1].value;
this.yearValue1 = this.options1[1].value;
this.yearValue2 = this.options1[0].value;
patentAuthorized({
start_year: this.yearValue1,
end_year: this.yearValue2,
......@@ -253,7 +271,7 @@ export default {
const colorList = ["#1E78FF", "#E94C5B", "#2EC59A"];
this.option1 = {
tooltip: {
show: false,
trigger: "item",
},
legend: {
top: "center",
......@@ -348,7 +366,6 @@ export default {
},
yAxis: {
type: "value",
// name: "(户)",
nameTextStyle: {
color: "#B5C5D4",
fontSize: 14,
......@@ -444,6 +461,7 @@ export default {
.center_left_echarts {
padding: 0 15px;
height: 45%;
margin-bottom: 25px;
.center_left_title {
background: url("../../../static/screen/title-short.png") no-repeat;
background-size: 100% 100%;
......
src/views/screen/index.vue
......@@ -56,7 +56,7 @@
</div>
<div class="rank_con">
<div class="rank_con_left">
<div class="rank_progress" v-for="item in rankArr">
<div class="rank_progress" v-for="item in rankArr.slice(0, 5)">
<span class="index1 index" v-if="item.index == '1'">{{
item.index
}}</span>
......@@ -67,16 +67,27 @@
item.index
}}</span>
<span class="index4 index" v-else>{{ item.index }}</span>
<span class="name1 name" v-if="item.index == '1'">{{
item.name
}}</span>
<span class="name2 name" v-else-if="item.index == '2'">{{
item.name
}}</span>
<span class="name3 name" v-else-if="item.index == '3'">{{
<span
class="name1 name"
:title="item.name"
v-if="item.index == '1'"
>{{ item.name }}</span
>
<span
class="name2 name"
:title="item.name"
v-else-if="item.index == '2'"
>{{ item.name }}</span
>
<span
class="name3 name"
:title="item.name"
v-else-if="item.index == '3'"
>{{ item.name }}</span
>
<span class="name4 name" :title="item.name" v-else>{{
item.name
}}</span>
<span class="name4 name" v-else>{{ item.name }}</span>
<a-progress
v-if="item.index == '1'"
......@@ -131,9 +142,9 @@
</div>
</div>
<div class="rank_con_right">
<div class="rank_progress" v-for="item in rankArr">
<div class="rank_progress" v-for="item in rankArr.slice(5, 10)">
<span class="index4 index">{{ item.index }}</span>
<span class="name4 name">{{ item.value }}</span>
<span class="name4 name" :title="item.name">{{ item.name }}</span>
<a-progress
class="progress"
:percent="item.percent"
......@@ -618,6 +629,10 @@ export default {
text-align: left;
line-height: 30px;
width: 25%;
overflow: hidden; /*超出部分隐藏*/
text-overflow: ellipsis; /*超出部分省略号表示*/
white-space: nowrap; /*强制单行显示*/
word-break: keep-all;
}
.name1 {
text-shadow: 0px 1px 1px rgba(255, 114, 114, 0.5);
......@@ -682,4 +697,19 @@ export default {
margin-top: 20px;
height: 70%;
}
:deep(.ant-select .ant-select-selector) {
background-color: #2d58b8;
color: #f6f9fe !important;
font-family: Arial, sans-serif;
}
:deep(.ant-select-dropdown) {
background-color: #1052df !important;
}
:deep(.ant-select) {
width: 90px !important;
float: right;
}
:deep(.ant-select-single.ant-select-show-arrow .ant-select-selection-item) {
padding-right: 10px;
}
</style>
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