Merge remote-tracking branch 'origin/radarForntend' into radarForntend

# Conflicts:
#	src/layout/Aside/index.vue

src/layout/Aside/index.vue

@@ -52,7 +52,7 @@
           <dv-decoration-7 style="width:200px;height:30px;">雷达管理</dv-decoration-7>
         </el-menu-item>
         <el-menu-item index="/home/scoutESM">
-<!--          <dv-decoration-7 style="width:200px;height:30px;">电子攻击管理</dv-decoration-7>-->
+          <dv-decoration-7 style="width:200px;height:30px;">电子攻击管理</dv-decoration-7>
         </el-menu-item>
         <!-- <el-menu-item index="/home/scoutImage">
           <dv-decoration-7 style="width:200px;height:30px;">成像传感器管理</dv-decoration-7>

src/store/modules/app.js

@@ -7,43 +7,43 @@ const getDefaultState = () => {
         platforms: [
             {
                 platformID: 101,
-                platformName: '干扰模型-1'
+                platformName: '雷达平台-1'
             },
             {
                 platformID: 102,
-                platformName: '干扰模型-2'
+                platformName: '雷达平台-2'
             },
             {
                 platformID: 103,
-                platformName: '干扰模型-3'
+                platformName: '雷达平台-3'
             },
             {
                 platformID: 104,
-                platformName: '干扰模型-4'
+                platformName: '雷达平台-4'
             },
             {
                 platformID: 105,
-                platformName: '干扰模型-5'
+                platformName: '雷达平台-5'
             },
             {
                 platformID: 106,
-                platformName: '干扰模型-6'
+                platformName: '雷达平台-6'
             },
             {
                 platformID: 107,
-                platformName: '干扰模型-7'
+                platformName: '雷达平台-7'
             },
             {
                 platformID: 108,
-                platformName: '干扰模型-8'
+                platformName: '雷达平台-8'
             },
             {
                 platformID: 109,
-                platformName: '干扰模型-9'
+                platformName: '雷达平台-9'
             },
             {
                 platformID: 110,
-                platformName: '干扰模型-10'
+                platformName: '雷达平台-10'
             },
         ],
         platformShow: false,