合并分支 'gll' 到 'master'

src/views/dataCenter/ConctructSystem/model/Munitions/index.vue

 <template>
   <div class="enterprises-institutions">
-    <MapTitle text="“民参军”企事业单位研发投入情况" />
-
+    <MapTitle text=融委全体会议召开情况 />
+    <div class="meeting">
+      <div>
+        今年以来召开融委全体会议次数
+      </div>
+      <div class="frequency">
+        {{shu}}
+        <span class="second">次</span>
+      </div>
+    </div>
     <el-row class="investment">
-      <el-col class="card-list" :span="6">
+      <!-- <el-col class="card-list" :span="6">
         <div class="card-item" v-for="item in cards" :key="item.label">
           <p>{{ item.label }}</p>
           <div>
             {{ item.value }}<span class="unit">{{ item.unit }}</span>
           </div>
         </div>
-      </el-col>
-
-      <el-col class="city-echarts" :span="18">
-        <div class="title2X">“民参军”企事业单位军品科研经费分布情况</div>
+      </el-col> -->
+      <el-col class="city-echarts">
+        <div class="title2X">各市融委全体会议召开次数</div>
         <div id="enterprises" class="echart-item"></div>
       </el-col>
     </el-row>
@@ -40,7 +47,7 @@ const xAxisCity = [
   "丽水",
 ];
 const cityData = {
-  value: [32.68, 7.42, 1.36, 3.47, 19.56, 12.5, 1.7, 0.86, 2.61, 2.58, 0.17],
+  value: [40.40, 40.40, 40, 40, 40, 40, 40, 40, 40, 40, 40],
 };
 
 /**
@@ -55,19 +62,20 @@ export default defineComponent({
   data() {
     return {
       countryEcharts: null,
-
+      shu:43,
       enterprises: null,
       cards: [
         {
           label: "全省“民参军”企事业单位军品科研经费支出总额",
           value: "284",
-          unit: "亿元",
+          unit: "40次",
         },
         {
           label: "全省“民参军”企事业单位R & D",
           value: "5%",
           unit: "",
         },
+        
       ],
     };
   },
@@ -104,7 +112,7 @@ export default defineComponent({
             html += `<div class="munition-echart ">
                 <span class=" title color_1">${params[0].axisValue}市</span>
                 <br />
-                <span class="text text-color_1">${params[0].data.value}</span>亿元
+                <span class="text text-color_1">${params[0].data.value}</span>次
                </div>
              `;
 
@@ -121,7 +129,7 @@ export default defineComponent({
         },
         yAxis: {
           type: "value",
-          name: "金额(亿元)",
+          name: "数量(次)",
           min: 0,
           max: 50,
         },
@@ -201,13 +209,35 @@ export default defineComponent({
 .munition-echart .color_2::before {
   background: #eca933;
 }
+/* 次数 */
+.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;
+}
+.frequency{
+  color: rgba(65, 152, 255, 1);
+  font-weight: 500;
+}
+.second{
+  color:  #666666;;
+  font-size: 12px;
+  font-weight: normal;
+}
+
 </style>
 
 
 <style lang="scss" scoped>
 .enterprises-institutions {
   height: 100%;
-
   .investment {
     .echart-item {
       flex: 1;
@@ -216,9 +246,9 @@ export default defineComponent({
       margin-top: 10px;
     }
     .card-list {
-      display: flex;
-      flex-direction: column;
-      padding: 20px 20px 20px 0;
+      // display: flex;
+      // flex-direction: column;
+      // padding: 20px 20px 20px 0;
       .card-item {
         flex: 1;
         box-sizing: border-box;

src/views/dataCenter/ConctructSystem/model/Outline/index.vue

 <template>
   <div class="synergy-innovation">
-    <MapTitle text="军民协同创新总览" />
+    <MapTitle text="五大体系建设总览" />
     <div class="describes">
-      <div class="text">各市军民协同创新指标情况</div>
-      <el-row class="" justify="space-between">
+      <div class="text">各市五大体系建设指标情况</div>
+      <!-- <el-row class="" justify="space-between">
         <div class="years" align="middle">
           <span
             v-for="(item, index) in years"
@@ -15,7 +15,7 @@
             >{{ item }}年</span
           >
         </div>
-      </el-row>
+      </el-row> -->
     </div>
 
     <div id="synergyInnovation" class="line"></div>
@@ -26,7 +26,7 @@ import { defineComponent } from "vue";
 import MapTitle from "@/components/mapTitle/index.vue";
 import * as echarts from "echarts";
 
-const SeriesData = [25, 27, 18, 22, 28, 24, 19, 20, 21, 22, 19];
+const SeriesData = [250, 170, 190, 145, 128, 194, 160, 210, 150, 300, 160];
 const xAxisValue = [
   "杭州",
   "宁波",
@@ -42,7 +42,7 @@ const xAxisValue = [
 ];
 
 /**
- * 军民协同创新总览
+ * 五大体系建设总览
  */
 export default defineComponent({
   props: {},
@@ -68,7 +68,7 @@ export default defineComponent({
           axisPointer: {
             type: "shadow",
           },
-          textStyle: {},
+          textStyle: {} ,
           className: "target-bar-tooltip",
           formatter:
             "<span class='title'>{b0}市</span>: <br /> <span class='bar-text'>{c0}</span> 分",
@@ -77,12 +77,13 @@ export default defineComponent({
         grid: {
           left: "-5%",
           right: "5%",
-          bottom: "5%",
+          bottom: "3%",
           containLabel: true,
         },
         yAxis: {
           type: "value",
           show: false,
+          max:300
         },
         xAxis: {
           type: "category",
@@ -97,6 +98,7 @@ export default defineComponent({
             label: {
               show: true,
               position: "top",
+              formatter:"{c} 分"
             },
             barWidth: 20,
             data: SeriesData,
@@ -134,13 +136,14 @@ export default defineComponent({
   padding-left: 10px;
   color: #4198ff;
 }
+
 </style>
 
 <style lang="scss" scoped>
 .synergy-innovation {
   .line {
     flex: 1;
-    height: 250px;
+    height: 360px;
     box-sizing: border-box;
   }
   .describes {