分支合并

src/api/axios.js

@@ -9,7 +9,7 @@ axios.defaults.withCredentials = true;
  * @param {Object} options 详细配置项，使用方法与所有配置项说明如下：
 
   this.API.requestData({
-    isMust: true, // 请求是否携带 token ，默认为 true ，可缺省
+    isMust: true, // 请求是否携带 token ，默认为 true ，可缺省 
     showLoading: false, // 请求是否显示加载中遮罩层，默认 false ，可缺省
     method: "GET", // 请求方式，默认为 GET ，可缺省
     baseURL: "http://192.168.10.23:8082/", // 请求服务器地址 + 端口，可缺省

src/router/index.js

@@ -260,11 +260,6 @@ const routes = [
     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', // 测点历史数据查询
@@ -317,7 +312,7 @@ const routes = [
     component: () => import(/* webpackChunkName: "sandtable" */ "../views/SandTable/SandTable.vue"),
   },
   {
-    path: "/new/dj1",
+    path: "/new/dj1/:wtId",
     name: "dj1",
     component: () => import(/* webpackChunkName: "dj1" */ "../views/NewPages/dj1.vue"),
   },

src/views/NewPages/dj1.vue

@@ -38,7 +38,8 @@
         </div>
       </div>
     </div>
-    <!-- tab2 -->
+
+    <!-- tab1 -->
     <div v-if="tabIndex == 0" class="tab-1">
       <panel :title="'损失电量分析'" class="mg-b-16">
         <area-bar-chart :height="'23.1481vh'" />
@@ -58,6 +59,7 @@
         </panel>
       </div>
     </div>
+
     <!-- tab2 -->
     <div v-if="tabIndex == 1" class="tab-2">
       <el-row>
@@ -119,6 +121,7 @@
       </el-row>
     </div>
 
+    <!-- tab3 -->
     <div v-if="tabIndex == 2" class="tab-3">
       <el-row>
         <el-col :span="8">
@@ -192,6 +195,7 @@
       </el-row>
     </div>
 
+    <!-- tab4 -->
     <div v-if="tabIndex == 3" class="tab-4">
       <el-row>
         <el-col :span="8">

src/views/performanceAnalysis/index.vue

@@ -554,7 +554,7 @@ export default {
 
     // 页面跳转
     jumpUrl(item){
-      this.$router.push(`/performanceAnalysis/detail/${item.windtpowerstationid}`);
+      this.$router.push(`/new/dj1/${item.windtpowerstationid}`);
     }
   },