合并分支 'hyh' 到 'master'

src/layout/head.vue

@@ -18,15 +18,11 @@
           <nav>{{ item.name }}</nav>
         </div>
       </el-col>
-    </el-row> -->
+    </el-row>-->
 
     <div class="container">
       <!-- 二级导航栏 -->
-      <el-row
-        v-if="(secodndList || []).length > 0"
-        class="second-nav"
-        :gutter="20"
-      >
+      <el-row v-if="(secodndList || []).length > 0" class="second-nav" :gutter="20">
         <el-col v-for="(item, index) in secodndList" :key="index" :span="4">
           <el-card
             shadow="hover"
@@ -34,9 +30,7 @@
               'second-active-nav': index === secondIndex,
             }"
             @click="secondHandle(item, index)"
-          >
-            {{ item.name }}
-          </el-card>
+          >{{ item.name }}</el-card>
         </el-col>
       </el-row>
 
@@ -44,8 +38,9 @@
       <el-row v-if="curRouteHistoy.length > 0" class="proceed-record">
         <el-col class="nav-history" :span="18">
           <el-row class="pointer" @click="$router.go(-1)" align="middle">
-            <el-icon><ArrowLeftBold /></el-icon>
-            返回
+            <el-icon>
+              <ArrowLeftBold />
+            </el-icon>返回
             <el-divider direction="vertical"></el-divider>
           </el-row>
 
@@ -62,9 +57,14 @@
               <el-icon
                 v-if="index > 0"
                 :color="index === curRouteHistoy.length - 1 ? '#409EFC' : ''"
-                ><CaretRight
-              /></el-icon>
-              {{ item.label }}
+              >
+                <CaretRight />
+              </el-icon>
+              <span
+                :class="{
+               'lignht-color': index === curRouteHistoy.length - 1,
+             }"
+              >{{ item.label }}</span>
             </div>
           </el-col>
         </el-col>
@@ -79,8 +79,7 @@
                 active: index === curYearIndex,
               }"
               @click="yearHandle(index)"
-              >{{ item }}年</span
-            >
+            >{{ item }}年</span>
           </div>
         </el-col>
       </el-row>

src/views/dataCenter/ConctructSystem/index.vue

@@ -124,11 +124,11 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-::v-deep .Progress .el-progress__text {
+::v-deep .el-progress__text {
   position: relative;
   top: -20px;
   left: 65px;
-  font-size: 18px;
+  font-size: 20px !important;
   color: #4198ff;
 }
 .card-item {
@@ -171,7 +171,7 @@ export default defineComponent({
         left: 80px;
         top: 20px;
         font-size: 14px;
-        letter-spacing: 0.5em;
+        // letter-spacing: 0.5em;
       }
     }
   }

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

@@ -109,7 +109,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>
              `;
 
@@ -126,7 +126,7 @@ export default defineComponent({
         },
         yAxis: {
           type: "value",
-          name: "数量(次)",
+          name: "金额(亿元)",
           min: 0,
           max: 500,
         },

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

@@ -4,11 +4,11 @@
     <div class="describes">
       <div class="text">各市军民协同创新指标情况</div>
     </div>
-    <el-row>
+    <!-- <el-row>
       <el-button>2019年</el-button>
       <el-button>2020年</el-button>
       <el-button type="primary">2021年上半年</el-button>
-    </el-row>
+    </el-row>-->
 
     <div id="synergyInnovation" class="line"></div>
   </div>