fix(创新示范): 文案修改

src/views/dataCenter/army/model/EconomicConstruct/index.vue

@@ -382,10 +382,10 @@ export default defineComponent({
   },
   watch: {
     seriesData() {
-      MAP_ECHARTS.setOption(this.optionBar, true);
+      MAP_ECHARTS && MAP_ECHARTS.setOption(this.optionBar, true);
     },
     provinceData() {
-      CRI_RIGHT_ECHART.setOption(this.ptionCirRight, true);
+      CRI_RIGHT_ECHART && CRI_RIGHT_ECHART.setOption(this.ptionCirRight, true);
     },
   },
   methods: {

src/views/dataCenter/innovation/index.vue

@@ -41,6 +41,8 @@
                   </div>
                 </div>
               </div>
+
+              <div class="title2X">各市领跑技术（产品）分布情况</div>
             </div>
 
             <div id="TargetBars" class="target-bar"></div>
@@ -159,7 +161,7 @@ export default defineComponent({
         },
         legend: {},
         grid: {
-          top: "10%",
+          top: "15%",
           left: "5%",
           right: "2%",
           bottom: "3%",
@@ -197,34 +199,13 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-// .meeting {
-//   height: 50px;
-//   line-height: 50px;
-//   border-radius: 4px;
-//   color: #666666;
-//   background: rgba(248, 249, 251, 1);
-//   display: flex;
-//   justify-content: space-between;
-//   padding: 0 10px 0 10px;
-//   box-sizing: border-box;
-//   margin-top: 10px;
-// }
-
 .target-bar {
   flex: 1;
-  height: calc(100% - 100px);
+  height: calc(100% - 130px);
   box-sizing: border-box;
   margin-top: 10px;
 }
-// .frequency {
-//   color: rgba(65, 152, 255, 1);
-//   font-weight: 500;
-// }
-// .second {
-//   color: #666666;
-//   font-size: 12px;
-//   font-weight: normal;
-// }
+
 .card-item {
   background: #fff;
   border-radius: 5px;
@@ -293,4 +274,9 @@ export default defineComponent({
 .footer-warpper {
   margin-bottom: 20px;
 }
+.title2X {
+  margin-top: 15px;
+  font-size: 16px;
+  color: #4198ff;
+}
 </style>

src/views/dataCenter/innovation/model/Platform/index.vue

@@ -7,19 +7,12 @@
         <div class="item">
           <span>协同创新平台</span>
           <div class="value-des">
-            <span>{{count || "--"}}</span>个
+            <span>{{ count || "--" }}</span
+            >个
           </div>
         </div>
-
-        <!-- <div class="item">
-          <span>协同创新示范平台</span>
-          <div class="value-des">
-            <span>66</span>个
       </div>
-        </div>-->
-      </div>
-
-      <!-- <div class="title">协同创新平台投入研发经费</div> -->
+      <div class="title2X">历年军民协同创新平台情况</div>
     </div>
 
     <div id="TargetBar" class="target-bar"></div>
@@ -33,9 +26,7 @@ import { Aim } from "@element-plus/icons";
 import Mock from "./mock";
 import { mapState } from "vuex";
 const xAxisCity = ["2018年", "2019年", "2020年"];
-// const cityData = {
-//   value: [225, 160, 170],
-// };
+
 let MAP_ECHARTS = null;
 /**
  * 全省军民协同创新平台情况——折线图
@@ -90,21 +81,6 @@ export default defineComponent({
         };
       });
 
-      // const seriesBar = {
-      //   type: "bar",
-
-      //   itemStyle: {
-      //     color: "#4198ff",
-      //   },
-      //   barWidth: 20,
-
-      //   data: cityData.value.map((item) => {
-      //     return {
-      //       value: item,
-      //       label: "收入规模",
-      //     };
-      //   }),
-      // };
       return {
         tooltip: {
           trigger: "axis",
@@ -126,7 +102,7 @@ export default defineComponent({
         },
         legend: {},
         grid: {
-          top: "10%",
+          top: "15%",
           left: "5%",
           right: "2%",
           bottom: "3%",
@@ -210,10 +186,15 @@ export default defineComponent({
       }
     }
   }
+  .title2X {
+    margin-top: 15px;
+    font-size: 16px;
+    color: #4198ff;
+  }
 
   .target-bar {
     flex: 1;
-    height: calc(100% - 94px);
+    height: calc(100% - 120px);
     box-sizing: border-box;
     margin-top: 10px;
   }

src/views/dataCenter/map/cradMock.js

@@ -13,7 +13,7 @@ export default {
     },
     "typeTwo": {
         list: [
-            { label: "领跑产品（技术）", value: 0, unit: "个" },
+            { label: "领跑产品（技术）", value: 155, unit: "个" },
             { label: "军地协同创新平台", value: 0, unit: "个" },
             { label: "新兴领域研发经费", value: 0, unit: "亿元" },
           ],
@@ -25,7 +25,7 @@ export default {
     },
     "typeThree": {
         list: [
-            { label: "领跑产品（技术）", value: 0, unit: "个" },
+            { label: "领跑产品（技术）", value: 155, unit: "个" },
             { label: "军地协同创新平台", value: 0, unit: "个" },
             { label: "新兴领域研发经费", value: "86.55", unit: "亿元" },
           ],