Commit fe103c83 by hanxiao

联调产业排名

parent f7286109
...@@ -11,7 +11,8 @@ export const patentSSProvince = p => post('/api/dataScreen/patentSSProvince', p) ...@@ -11,7 +11,8 @@ export const patentSSProvince = p => post('/api/dataScreen/patentSSProvince', p)
export const patentHead = p => get('/api/dataScreen/patentHead', {}); 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', {});
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
<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"> <span class="active" @click="changeMap(1)">
专利转化落地区域图 &nbsp; &nbsp; &nbsp;| &nbsp; &nbsp; &nbsp;</span 专利转化落地区域图 &nbsp; &nbsp; &nbsp;| &nbsp; &nbsp; &nbsp;</span
> >
<span> 项目合作方区域图 </span> <span @click="changeMap(2)"> 项目合作方区域图 </span>
</span> </span>
</div> </div>
<!-- <div class="map_title"> <!-- <div class="map_title">
...@@ -277,6 +277,12 @@ export default { ...@@ -277,6 +277,12 @@ export default {
}; };
}); });
}, },
//切换地图
changeMap(){
}
//获取项目合作图
}, },
mounted() { mounted() {
this.init(); this.init();
...@@ -289,7 +295,7 @@ export default { ...@@ -289,7 +295,7 @@ export default {
// } // }
.map_title { .map_title {
position: relative; position: relative;
display: inline-block; // display: inline-block;
// width: 300px; // width: 300px;
// color: #fff; // color: #fff;
......
...@@ -57,20 +57,20 @@ ...@@ -57,20 +57,20 @@
<div class="rank_con"> <div class="rank_con">
<div class="rank_con_left"> <div class="rank_con_left">
<div class="rank_progress" v-for="item in rankArr"> <div class="rank_progress" v-for="item in rankArr">
<span class="index1 index" v-if="item.index === '1'">{{ <span class="index1 index" v-if="item.index == '1'">{{
item.index item.index
}}</span> }}</span>
<span class="index2 index" v-else-if="item.index === '2'">{{ <span class="index2 index" v-else-if="item.index == '2'">{{
item.index item.index
}}</span> }}</span>
<span class="index3 index" v-else-if="item.index == '3'">{{ <span class="index3 index" v-else-if="item.index == '3'">{{
item.index item.index
}}</span> }}</span>
<span class="index4 index" v-else>{{ item.index }}</span> <span class="index4 index" v-else>{{ item.index }}</span>
<span class="name1 name" v-if="item.index === '1'">{{ <span class="name1 name" v-if="item.index == '1'">{{
item.name item.name
}}</span> }}</span>
<span class="name2 name" v-else-if="item.index === '2'">{{ <span class="name2 name" v-else-if="item.index == '2'">{{
item.name item.name
}}</span> }}</span>
<span class="name3 name" v-else-if="item.index == '3'">{{ <span class="name3 name" v-else-if="item.index == '3'">{{
...@@ -79,9 +79,9 @@ ...@@ -79,9 +79,9 @@
<span class="name4 name" v-else>{{ item.name }}</span> <span class="name4 name" v-else>{{ item.name }}</span>
<a-progress <a-progress
v-if="item.index === '1'" v-if="item.index == '1'"
class="progress" class="progress"
:percent="'67'" :percent="item.percent"
:stroke-color="gradientColor1" :stroke-color="gradientColor1"
:trail-color="'rgba(19, 40, 71, 1)'" :trail-color="'rgba(19, 40, 71, 1)'"
:show-info="false" :show-info="false"
...@@ -89,9 +89,9 @@ ...@@ -89,9 +89,9 @@
> >
</a-progress> </a-progress>
<a-progress <a-progress
v-else-if="item.index === '2'" v-else-if="item.index == '2'"
class="progress" class="progress"
:percent="'67'" :percent="item.percent"
:stroke-color="gradientColor2" :stroke-color="gradientColor2"
:trail-color="'rgba(19, 40, 71, 1)'" :trail-color="'rgba(19, 40, 71, 1)'"
:show-info="false" :show-info="false"
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
> >
</a-progress> </a-progress>
<a-progress <a-progress
v-else-if="item.index === '3'" v-else-if="item.index == '3'"
class="progress" class="progress"
:percent="'67'" :percent="item.percent"
:stroke-color="gradientColor3" :stroke-color="gradientColor3"
:trail-color="'rgba(19, 40, 71, 1)'" :trail-color="'rgba(19, 40, 71, 1)'"
:show-info="false" :show-info="false"
...@@ -111,39 +111,39 @@ ...@@ -111,39 +111,39 @@
<a-progress <a-progress
v-else v-else
class="progress" class="progress"
:percent="'67'" :percent="item.percent"
:stroke-color="gradientColor4" :stroke-color="gradientColor4"
:trail-color="'rgba(19, 40, 71, 1)'" :trail-color="'rgba(19, 40, 71, 1)'"
:show-info="false" :show-info="false"
:stroke-linecap="'round'" :stroke-linecap="'round'"
> >
</a-progress> </a-progress>
<span class="num1 num" v-if="item.index === '1'" <span class="num1 num" v-if="item.index == '1'"
>{{ item.num }}</span >{{ item.value }}</span
> >
<span class="num2 num" v-else-if="item.index === '2'" <span class="num2 num" v-else-if="item.index == '2'"
>{{ item.num }}</span >{{ item.value }}</span
> >
<span class="num3 num" v-else-if="item.index == '3'" <span class="num3 num" v-else-if="item.index == '3'"
>{{ item.num }}</span >{{ item.value }}</span
> >
<span class="num4 num" v-else>{{ item.num }}</span> <span class="num4 num" v-else>{{ item.value }}</span>
</div> </div>
</div> </div>
<div class="rank_con_right"> <div class="rank_con_right">
<div class="rank_progress" v-for="item in rankArr"> <div class="rank_progress" v-for="item in rankArr">
<span class="index4 index">{{ item.index }}</span> <span class="index4 index">{{ item.index }}</span>
<span class="name4 name">{{ item.name }}</span> <span class="name4 name">{{ item.value }}</span>
<a-progress <a-progress
class="progress" class="progress"
:percent="'67'" :percent="item.percent"
:stroke-color="gradientColor4" :stroke-color="gradientColor4"
:trail-color="'rgba(19, 40, 71, 1)'" :trail-color="'rgba(19, 40, 71, 1)'"
:show-info="false" :show-info="false"
:stroke-linecap="'round'" :stroke-linecap="'round'"
> >
</a-progress> </a-progress>
<span class="num4 num">{{ item.num }}</span> <span class="num4 num">{{ item.value }}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -152,11 +152,11 @@ ...@@ -152,11 +152,11 @@
</div> </div>
</template> </template>
<script> <script>
import { patentDevelop } from "@/utils/screen.js"; import { patentDevelop, patentIndustryTopN } from "@/utils/screen.js";
import EchartsCon from "@/components/EchartsCon.vue"; import EchartsCon from "@/components/EchartsCon.vue";
import patentType from "./components/patentType.vue"; import patentType from "./components/patentType.vue";
import patentMap from "./components/patentMap.vue"; import patentMap from "./components/patentMap.vue";
import patentPerson from "./components/patentPerson.vue" import patentPerson from "./components/patentPerson.vue";
export default { export default {
name: "screen", name: "screen",
data() { data() {
...@@ -164,38 +164,7 @@ export default { ...@@ -164,38 +164,7 @@ export default {
option5: null, option5: null,
activeTrend: "apply_num", activeTrend: "apply_num",
trend_year: 8, trend_year: 8,
rankArr: [ rankArr: [],
{
index: "1",
num: 172,
percent: 72,
name: "特钢材料",
},
{
index: "2",
num: 172,
percent: 72,
name: "特钢材料",
},
{
index: "3",
num: 172,
percent: 72,
name: "特钢材料",
},
{
index: "4",
num: 172,
percent: 72,
name: "特钢材料",
},
{
index: "5",
num: 172,
percent: 72,
name: "特钢材料",
},
],
yearOptions: [ yearOptions: [
{ {
value: 3, value: 3,
...@@ -262,17 +231,29 @@ export default { ...@@ -262,17 +231,29 @@ export default {
EchartsCon, EchartsCon,
patentType, patentType,
patentMap, patentMap,
patentPerson patentPerson,
}, },
methods: { methods: {
init() { init() {
//获取专利发展趋势图 //获取专利发展趋势图
this.getTrend(); this.getTrend();
//获取产业排名
// this.getTopN();
}, },
//修改时间 //修改时间
handleChange() { handleChange() {
this.getTrend(); this.getTrend();
}, },
//获取产业排名
getTopN() {
patentIndustryTopN().then((res) => {
this.rankArr = res.data;
this.rankArr.forEach((item, index) => {
item.index = index + 1;
item.percent = item.percent.replace("%", "");
});
});
},
getTrend() { getTrend() {
let data = { let data = {
xData: [], xData: [],
...@@ -498,7 +479,7 @@ export default { ...@@ -498,7 +479,7 @@ export default {
}, },
changetrend(tab) { changetrend(tab) {
this.activeTrend = tab; this.activeTrend = tab;
this.getTrend() this.getTrend();
}, },
}, },
...@@ -592,7 +573,7 @@ export default { ...@@ -592,7 +573,7 @@ export default {
height: 160px; height: 160px;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-around;
.index { .index {
font-size: 12px; font-size: 12px;
font-family: "jiangcheng"; font-family: "jiangcheng";
...@@ -632,10 +613,11 @@ export default { ...@@ -632,10 +613,11 @@ export default {
font-family: "jiangcheng"; font-family: "jiangcheng";
font-weight: 400; font-weight: 400;
color: #f8fbff; color: #f8fbff;
padding: 0 5px;
height: 30px; height: 30px;
text-align: center; text-align: left;
line-height: 30px; line-height: 30px;
width: 25%;
} }
.name1 { .name1 {
text-shadow: 0px 1px 1px rgba(255, 114, 114, 0.5); text-shadow: 0px 1px 1px rgba(255, 114, 114, 0.5);
...@@ -670,7 +652,9 @@ export default { ...@@ -670,7 +652,9 @@ export default {
font-family: "jiangcheng"; font-family: "jiangcheng";
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
// color: #ff4b4b; // color: #ff4b4b
width: 20%;
padding: 0 5px;
} }
.num1 { .num1 {
color: #ff4b4b; color: #ff4b4b;
...@@ -685,7 +669,7 @@ export default { ...@@ -685,7 +669,7 @@ export default {
color: rgba(0, 159, 255, 1); color: rgba(0, 159, 255, 1);
} }
.progress { .progress {
width: 300px; width: 280px;
} }
} }
} }
......
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