Commit 5e5a28c5 by hanxiao

修改仪表盘细节

parent fe103c83
...@@ -13,6 +13,9 @@ export const patentHead = p => get('/api/dataScreen/patentHead', {}); ...@@ -13,6 +13,9 @@ export const patentHead = p => get('/api/dataScreen/patentHead', {});
export const patentInventor = p => post('/api/dataScreen/patentInventor', p); export const patentInventor = p => post('/api/dataScreen/patentInventor', p);
//产业排名 //产业排名
export const patentIndustryTopN = p => get('/api/dataScreen/patentIndustryTopN', {}); export const patentIndustryTopN = p => get('/api/dataScreen/patentIndustryTopN', {});
//项目合作方
export const projectPartner = p => get('/api/dataScreen/projectPartner', {});
......
...@@ -85,7 +85,6 @@ export default { ...@@ -85,7 +85,6 @@ export default {
}, },
methods: { methods: {
changepage(name) { changepage(name) {
switch (name) { switch (name) {
case "企业": case "企业":
this.$router.push({ this.$router.push({
......
...@@ -126,7 +126,6 @@ export default { ...@@ -126,7 +126,6 @@ export default {
methods: { methods: {
//账号登录 //账号登录
login() { login() {
console.log(this.formState.password);
let param = AES_Encrypt( let param = AES_Encrypt(
JSON.stringify({ JSON.stringify({
login_name: this.formState.username, login_name: this.formState.username,
......
...@@ -23,17 +23,20 @@ ...@@ -23,17 +23,20 @@
</div> </div>
<div class="top_img4 text"> <div class="top_img4 text">
<div>合作申请量</div> <div>合作申请量</div>
<div><span>50595</span></div> <div><span>{{ application_num }}</span></div>
</div> </div>
</div> </div>
<div class="map_title_box"> <div class="map_title_box">
<div class="map_title"> <div class="map_title">
<img src="@/static/screen/bg-zlzhldqyt.png" alt="" /> <img src="@/static/screen/bg-zlzhldqyt.png" alt="" />
<span class="text_title"> <span class="text_title">
<span class="active" @click="changeMap(1)"> <span :class="[maptab == 1 ? 'active' : '']" @click="changeMap(1)">
专利转化落地区域图 &nbsp; &nbsp; &nbsp;| &nbsp; &nbsp; &nbsp;</span 专利转化落地区域图</span
> >
<span @click="changeMap(2)"> 项目合作方区域图 </span> &nbsp; &nbsp; &nbsp;| &nbsp; &nbsp; &nbsp;
<span :class="[maptab == 2 ? 'active' : '']" @click="changeMap(2)">
项目合作方区域图
</span>
</span> </span>
</div> </div>
<!-- <div class="map_title"> <!-- <div class="map_title">
...@@ -49,7 +52,7 @@ ...@@ -49,7 +52,7 @@
<script> <script>
import * as echarts from "echarts"; import * as echarts from "echarts";
import EchartsCon from "@/components/EchartsCon.vue"; import EchartsCon from "@/components/EchartsCon.vue";
import { patentTransform, patentHead } from "@/utils/screen.js"; import { patentTransform, patentHead, projectPartner } from "@/utils/screen.js";
import axios from "axios"; import axios from "axios";
export default { export default {
name: "patentMap", name: "patentMap",
...@@ -59,6 +62,8 @@ export default { ...@@ -59,6 +62,8 @@ export default {
inventor_num: null, inventor_num: null,
patent_num: null, patent_num: null,
transfer_num: null, transfer_num: null,
application_num:null,
maptab: 1,
}; };
}, },
components: { components: {
...@@ -100,7 +105,7 @@ export default { ...@@ -100,7 +105,7 @@ export default {
if (res.code == 0) { if (res.code == 0) {
this.inventor_num = res.data.inventor_num; this.inventor_num = res.data.inventor_num;
this.patent_num = res.data.patent_num; this.patent_num = res.data.patent_num;
this.application_num = res.data.application_num;
this.transfer_num = res.data.transfer_num; this.transfer_num = res.data.transfer_num;
} }
}); });
...@@ -137,7 +142,7 @@ export default { ...@@ -137,7 +142,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
borderWidth: 1, borderWidth: 1,
borderColor: '#3B5077', borderColor: "#3B5077",
areaColor: { areaColor: {
type: "radial", type: "radial",
x: 0.5, x: 0.5,
...@@ -170,12 +175,16 @@ export default { ...@@ -170,12 +175,16 @@ export default {
], ],
series: [ series: [
{ {
name: "山西市数据", // name: "山西",
type: "map", type: "map",
map: "shanxi", // 自定义扩展图表类型 map: "shanxi", // 自定义扩展图表类型
aspectScale: 1, aspectScale: 1,
zoom: 0.65, // 缩放 zoom: 0.65, // 缩放
showLegendSymbol: true, showLegendSymbol: true,
// silent: true,
select: {
disabled: true,
},
label: { label: {
normal: { normal: {
show: true, show: true,
...@@ -191,8 +200,8 @@ export default { ...@@ -191,8 +200,8 @@ export default {
borderWidth: 0.2, borderWidth: 0.2,
}, },
emphasis: { emphasis: {
areaColor: '#8cd3ef', areaColor: "#8cd3ef",
color:'#fff' color: "#fff",
}, },
}, },
...@@ -277,12 +286,147 @@ export default { ...@@ -277,12 +286,147 @@ export default {
}; };
}); });
}, },
//切换地图 //获取项目和作地图
changeMap(){ getProjectMap(dataNum) {
axios.get("/map_json/shanxi.json").then((res) => {
echarts.registerMap("shanxi", res.data);
this.option1 = {
tooltip: {
trigger: "item",
formatter: function (params) {
if (params.seriesType == "map") {
return params.data.name + ":" + params.data.value;
} }
//获取项目合作图 },
},
visualMap: {
show: false,
// min: 0,
// max: 100,
left: "left",
top: "bottom",
text: ["高", "低"],
calculable: true,
inRange: {
color: ["rgba(20,60,100,0.5)", "rgba(20,60,150,0.5)", "#2961AD"],
// ['绿色', '#黄色', '#粉色', '#肉色', '#紫色']
},
},
geo: [
{
map: "shanxi",
aspectScale: 1,
zoom: 0.65,
layoutCenter: ["50%", "38%"],
layoutSize: "120%",
show: true,
roam: false,
label: {
emphasis: {
show: false,
},
},
itemStyle: {
normal: {
borderWidth: 1,
borderColor: "#3B5077",
areaColor: {
type: "radial",
x: 0.5,
y: 0.5,
r: 0.8,
colorStops: [
{
offset: 0,
color: "rgba(147, 235, 248, 0)", // 0% 处的颜色
},
{
offset: 1,
color: "rgba(147, 235, 248, .2)", // 100% 处的颜色
},
],
},
},
emphasis: {
areaColor: "#8cd3ef",
borderWidth: 0,
},
},
emphasis: {
//地图高亮
itemStyle: {
color: "#93EBF8",
},
},
},
],
series: [
{
name: "山西省数据",
type: "map",
map: "shanxi", // 自定义扩展图表类型
aspectScale: 1,
zoom: 0.65, // 缩放
showLegendSymbol: true,
label: {
normal: {
show: true,
textStyle: { color: "#fff", fontSize: "120%" },
},
},
select: {
disabled: true,
},
itemStyle: {
normal: {
areaColor: "rgba(20,60,100,0.5)",
borderColor: "#fff",
borderWidth: 0.2,
},
emphasis: {
areaColor: "#8cd3ef",
color: "#fff",
},
},
layoutCenter: ["50%", "38%"],
layoutSize: "120%",
markPoint: {
symbol: "none",
},
data: dataNum,
},
],
};
});
},
getProjectData() {
let dataNum = [];
projectPartner().then((res) => {
res.data.forEach((item) => {
dataNum.push({
name: item.name,
value: item.value,
});
});
this.getProjectMap(dataNum);
});
},
//切换地图
changeMap(tab) {
this.maptab = tab;
if (tab == 1) {
this.getMap();
} else {
this.getProjectData();
}
},
//获取项目合作图
}, },
mounted() { mounted() {
this.init(); this.init();
...@@ -307,7 +451,7 @@ export default { ...@@ -307,7 +451,7 @@ export default {
font-family: "jiangcheng"; font-family: "jiangcheng";
font-weight: normal; font-weight: normal;
font-size: 20px; font-size: 20px;
color: #ccc; color: #bbb;
text-shadow: 0px 2px 8px rgba(5, 28, 55, 0.42); text-shadow: 0px 2px 8px rgba(5, 28, 55, 0.42);
background: linear-gradient( background: linear-gradient(
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
>发明专利</span >发明专利</span
> >
<span :class="[type2 == 3 ? 'active' : '']" @click="changeAuth(3)" <span :class="[type2 == 3 ? 'active' : '']" @click="changeAuth(3)"
>使用新型</span >用新型</span
> >
<span :class="[type2 == 4 ? 'active' : '']" @click="changeAuth(4)" <span :class="[type2 == 4 ? 'active' : '']" @click="changeAuth(4)"
>外观设计</span >外观设计</span
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
>发明专利</span >发明专利</span
> >
<span :class="[type2 == 3 ? 'active' : '']" @click="changeAuth(3)" <span :class="[type2 == 3 ? 'active' : '']" @click="changeAuth(3)"
>使用新型</span >用新型</span
> >
<span :class="[type2 == 4 ? 'active' : '']" @click="changeAuth(4)" <span :class="[type2 == 4 ? 'active' : '']" @click="changeAuth(4)"
>外观设计</span >外观设计</span
...@@ -428,7 +428,7 @@ export default { ...@@ -428,7 +428,7 @@ export default {
//切换专利授权类型 //切换专利授权类型
changeAuth(type) { changeAuth(type) {
this.type2 = type; this.type2 = type;
this.getCompareData(); this.changeYear();
}, },
}, },
beforeMount() { beforeMount() {
...@@ -464,7 +464,7 @@ export default { ...@@ -464,7 +464,7 @@ export default {
color: #bbcdef; color: #bbcdef;
opacity: 0.8; opacity: 0.8;
span { span {
padding: 5px 10px; padding: 5px 8px 5px 0;
cursor: pointer; cursor: pointer;
} }
.active { .active {
......
<template> <template>
<div class="screen"> <div class="screen">
<header>太原理工大学专利成果转移转化智能推荐系统</header> <header>太原理工大学专利成果转移转化仪表盘</header>
<div class="center"> <div class="center">
<div class="center_left"> <div class="center_left">
<patentType></patentType> <patentType></patentType>
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,7 @@ export default {
//获取专利发展趋势图 //获取专利发展趋势图
this.getTrend(); this.getTrend();
//获取产业排名 //获取产业排名
// this.getTopN(); this.getTopN();
}, },
//修改时间 //修改时间
handleChange() { handleChange() {
...@@ -425,7 +425,7 @@ export default { ...@@ -425,7 +425,7 @@ export default {
type: "line", type: "line",
smooth: true, smooth: true,
symbol: "none", // 不显示连接点 symbol: "none", // 不显示连接点
name: "使用新型", name: "用新型",
data: data.yData3, data: data.yData3,
areaStyle: { areaStyle: {
color: { color: {
......
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