联调专利排名人、受让省份接口

src/components/EchartsCon.vue

@@ -19,7 +19,7 @@ export default {
     },
     height: {
       type: String,
-      default: "300px",
+      default: "100%",
     },
     option: {
       type: Object,

src/utils/screen.js

@@ -5,5 +5,14 @@ export const patentAuthorized = p => post('/api/dataScreen/patentAuthorized', p)
 export const patentTransform = p => get('/api/dataScreen/patentTransform', {});
 //专利发展趋势图
 export const patentDevelop = p => post('/api/dataScreen/patentDevelop', p);
+//专利受让省份排名
+export const patentSSProvince = p => post('/api/dataScreen/patentSSProvince', p);
+//大屏标题文字
+export const patentHead = p => get('/api/dataScreen/patentHead', {});
+//专利发明人排名
+export const patentInventor = p => post('/api/dataScreen/patentInventor', p);
+
+
+
 
 

src/views/screen/components/patentMap.vue

 <template>
-  <div>
-    <div class="center_top_imgs">
-      <div class="top_img1 text">
-        <div>专利数量</div>
-        <div><span>50595</span>项</div>
+  <div class="center_top_imgs">
+    <div class="top_img1 text">
+      <div>专利数量</div>
+      <div>
+        <span>{{ patent_num }}</span
+        >项
       </div>
-      <div class="top_img2 text">
-        <div>专利数量</div>
-        <div><span>50595</span>项</div>
-      </div>
-      <div class="top_img3 text">
-        <div>专利数量</div>
-        <div><span>50595</span>项</div>
+    </div>
+    <div class="top_img2 text">
+      <div>发明数量</div>
+      <div>
+        <span>{{ inventor_num }}</span
+        >项
       </div>
-      <div class="top_img4 text">
-        <div>专利数量</div>
-        <div><span>50595</span>项</div>
+    </div>
+    <div class="top_img3 text">
+      <div>专利转让量</div>
+      <div>
+        <span>{{ transfer_num }}</span
+        >项
       </div>
     </div>
-    <div class="map_title">
-      <img src="@/static/screen/bg-zlzhldqyt.png" alt="" />
-      <span class="text_title">专利转化落地区域图</span>
+    <div class="top_img4 text">
+      <div>合作申请量</div>
+      <div><span>50595</span>项</div>
     </div>
-    <div style="height: 300px" id="area11"></div>
+  </div>
+  <div class="map_title">
+    <img src="@/static/screen/bg-zlzhldqyt.png" alt="" />
+    <span class="text_title">专利转化落地区域图</span>
+  </div>
+  <div class="echarts_container">
+    <EchartsCon :id="'area'" :option="option1" v-if="option1"></EchartsCon>
   </div>
 </template>
 <script>
 import * as echarts from "echarts";
-import { patentTransform } from "@/utils/screen.js";
+import EchartsCon from "@/components/EchartsCon.vue";
+import { patentTransform, patentHead } from "@/utils/screen.js";
 import axios from "axios";
 export default {
   name: "patentMap",
   data() {
     return {
       option1: null,
+      inventor_num: null,
+      patent_num: null,
+      transfer_num: null,
     };
   },
-  components: {},
+  components: {
+    EchartsCon,
+  },
   methods: {
     init() {
       this.getMap();
+      this.getTextData();
     },
     getMap() {
       let dataNum = [];
@@ -66,12 +82,23 @@ export default {
         this.getMapOption(dataNum, dataPosition, dataScatter);
       });
     },
+    //获取文字数据
+    getTextData() {
+      patentHead().then((res) => {
+        if (res.code == 0) {
+          this.inventor_num = res.data.inventor_num;
+          this.patent_num = res.data.patent_num;
+
+          this.transfer_num = res.data.transfer_num;
+        }
+      });
+    },
     //获取地图
     getMapOption(dataNum, dataPosition, dataScatter) {
-      const myChart = echarts.init(document.getElementById("area11"));
       axios.get("/map_json/shanxi.json").then((res) => {
         echarts.registerMap("shanxi", res.data);
-        var option = {
+
+        this.option1 = {
           tooltip: {
             trigger: "item",
             formatter: function (params) {
@@ -209,7 +236,6 @@ export default {
             },
           ],
         };
-        myChart.setOption(option);
       });
     },
   },
@@ -226,7 +252,7 @@ export default {
   .text_title {
     position: absolute;
     left: 60px;
-   top: 5px;
+    top: 5px;
     font-family: "jiangcheng";
     font-weight: normal;
     font-size: 20px;
@@ -243,6 +269,9 @@ export default {
     // -webkit-text-fill-color: transparent;
   }
 }
+.echarts_container {
+  height: 70%;
+}
 .center_top_imgs {
   height: 140px;
   width: 100%;

src/views/screen/components/patentType.vue

@@ -31,7 +31,7 @@
       <EchartsCon
         :id="'123'"
         :option="option1"
-        :height="'140px'"
+       
         v-if="option1"
       ></EchartsCon>
     </div>
@@ -72,7 +72,7 @@
       <EchartsCon
         :id="'456'"
         :option="option2"
-        :height="'140px'"
+    
         v-if="option2"
       ></EchartsCon>
     </div>
@@ -442,6 +442,8 @@ export default {
 </script>
 <style lang="less" scoped>
 .center_left_echarts {
+  padding: 0 15px;
+  height: 45%;
   .center_left_title {
     background: url("../../../static/screen/title-long.png") no-repeat;
     background-size: 100% 100%;
@@ -453,7 +455,7 @@ export default {
     font-style: italic;
     color: #f6f9fe;
     text-shadow: 0px 2px 8px rgba(5, 28, 55, 0.42);
-    padding-left: 30px;
+    padding-left: 25px;
     padding-top: 6px;
     .center_left_title_btn {
       font-size: 14px;
@@ -491,6 +493,7 @@ export default {
   .echarts_container {
     // height: 120px;
     margin-top: 40px;
+    height: 70%;
   }
 }
 </style>

src/views/screen/index.vue

@@ -9,7 +9,7 @@
         <patentMap></patentMap>
       </div>
       <div class="center_right">
-        <!-- <patentPerson></patentPerson> -->
+        <patentPerson></patentPerson>
       </div>
     </div>
     <div class="bottom">
@@ -46,7 +46,6 @@
           <EchartsCon
             :id="'patent_trend'"
             :option="option5"
-            :height="'150px'"
             v-if="option5"
           ></EchartsCon>
         </div>
@@ -55,7 +54,7 @@
         <div class="bottom_title">
           <span>专利产业布局分布（山西十大产业）</span>
         </div>
-        <div class="rank_con">
+        <!-- <div class="rank_con">
           <div class="rank_con_left">
             <div class="rank_progress" v-for="item in rankArr">
               <span class="index1 index" v-if="item.index === '1'">{{
@@ -147,7 +146,7 @@
               <span class="num4 num">{{ item.num }}个</span>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -515,6 +514,7 @@ export default {
   background-size: 100%;
   width: 100%;
   height: 100%;
+  overflow: auto;
   // height: 885px;
   header {
     background-image: url("../../static/screen/bg-top-logo.png");
@@ -546,9 +546,10 @@ export default {
   .bottom {
     //  height: 120px;
     display: flex;
-
+    height: 28%;
+    justify-content: space-evenly;
     .bottom_echart {
-      width: 50%;
+      width: 48%;
       .bottom_title {
         background: url("../../static/screen/title-long.png") no-repeat;
         background-size: 100% 100%;
@@ -696,5 +697,6 @@ export default {
 .echarts_container {
   // height: 120px;
   margin-top: 20px;
+  height: 70%;
 }
 </style>