Merge branch 'sl' of http://61.161.152.110:10101/r/electronic-map into sl

# Conflicts:
#	src/views/WindSite/pages/Info/Base-Info.vue

src/router/index.js

@@ -256,16 +256,16 @@ const routes = [
     name: 'singleAnalysis',
     component: () => import('../views/singleAnalysis/index.vue'),
   },
-  {
-    path: '/performanceAnalysis', // 单机性能分析
-    name: 'performanceAnalysis',
-    component: () => import('../views/performanceAnalysis/index.vue'),
-    children: [{
-      path: "detail/:wpId",
-      name: "performanceAnalysisDetail",
-      component: () => import("../views/performanceAnalysis/detail/index.vue"),
-    }]
-  },
+  // {
+  //   path: '/performanceAnalysis', // 单机性能分析
+  //   name: 'performanceAnalysis',
+  //   component: () => import('../views/performanceAnalysis/index.vue'),
+  //   children: [{
+  //     path: "detail/:wpId",
+  //     name: "performanceAnalysisDetail",
+  //     component: () => import("../views/performanceAnalysis/detail/index.vue"),
+  //   }]
+  // },
   {
     path: '/historySearch', // 测点历史数据查询
     name: 'historySearch',

src/views/WindSite/pages/Info/Base-Info.vue

@@ -14,7 +14,11 @@
       </div>
       <div class="wind-site-tag">
         <div class="tag-text">机型</div>
+<<<<<<< HEAD
         <div class="tag-value">{{ sourceMap.model }}</div>
+=======
+        <div class="tag-value">{{sourceMap.model}}</div>
+>>>>>>> f57ac2ddb5613fc5ee68772d0b230fab4e19a55c
       </div>
       <div class="wind-site-tag">
         <div class="tag-text">告警时间</div>