bugfix

src/router/index.js

@@ -153,27 +153,27 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/maintain',
-    component: Layout,
-    redirect: '/maintain/oneself',
-    name: 'Maintain',
-    meta: { title: '维护管理', icon: 'maintain' },
-    children: [
-      {
-        path: 'oneself',
-        name: 'MaintainOneself',
-        component: () => import('@/views/maintain/oneself/index'),
-        meta: { title: '设备本身维护' }
-      },
-      {
-        path: 'parameter',
-        name: 'MaintainParameter',
-        component: () => import('@/views/maintain/parameter/index'),
-        meta: { title: '设备告警参数设置' }
-      }
-    ]
-  },
+  // {
+  //   path: '/maintain',
+  //   component: Layout,
+  //   redirect: '/maintain/oneself',
+  //   name: 'Maintain',
+  //   meta: { title: '维护管理', icon: 'maintain' },
+  //   children: [
+  //     {
+  //       path: 'oneself',
+  //       name: 'MaintainOneself',
+  //       component: () => import('@/views/maintain/oneself/index'),
+  //       meta: { title: '设备本身维护' }
+  //     },
+  //     {
+  //       path: 'parameter',
+  //       name: 'MaintainParameter',
+  //       component: () => import('@/views/maintain/parameter/index'),
+  //       meta: { title: '设备告警参数设置' }
+  //     }
+  //   ]
+  // },
   {
     path: '/history',
     component: Layout,
@@ -181,24 +181,24 @@ export const constantRoutes = [
     name: 'History',
     meta: { title: '历史数据', icon: 'history' },
     children: [
-      {
-        path: 'leakyCableStatus',
-        name: 'leakyCableStatus',
-        component: () => import('@/views/history/leakyCableStatus/index.vue'),
-        meta: { title: '漏缆监测历史状态' }
-      },
+      // {
+      //   path: 'leakyCableStatus',
+      //   name: 'leakyCableStatus',
+      //   component: () => import('@/views/history/leakyCableStatus/index.vue'),
+      //   meta: { title: '漏缆监测历史状态' }
+      // },
       {
         path: 'leakyCableRepair',
         name: 'leakyCableRepair',
         component: () => import('@/views/history/leakyCableRepair/index.vue'),
         meta: { title: '漏缆监测维修历史' }
       },
-      {
-        path: 'deviceLinkStatus',
-        name: 'deviceLinkStatus',
-        component: () => import('@/views/history/deviceLinkStatus/index.vue'),
-        meta: { title: '设备连接历史状态' }
-      },
+      // {
+      //   path: 'deviceLinkStatus',
+      //   name: 'deviceLinkStatus',
+      //   component: () => import('@/views/history/deviceLinkStatus/index.vue'),
+      //   meta: { title: '设备连接历史状态' }
+      // },
       {
         path: 'deviceLinkRepair',
         name: 'deviceLinkRepair',

src/views/dashboard/components/trendAnalysis.vue

@@ -69,8 +69,10 @@ export default {
     finalyText() {
       if(this.$route.query.name) {
         return '趋势分析图形(' + this.$route.query.name + ')'
-      } else {
+      } else if(this.type == 0) {
         return '趋势分析图形(' + this.curInfo.baseInfo.leakyCableDescribe + ')'
+      } else {
+        return '趋势分析图形(' + this.curInfo.baseInfo.feederDescribe + ')'
       }
     },
     isDisableYear() {
@@ -146,7 +148,7 @@ export default {
     init(type) {
       let params = {
         type: this.type,
-        applyId: this.selectId,
+        applyId: this.$route.query.id ? this.$route.query.id : this.selectId,
         creationTime: this.date == 1 ? this.year+'-00-00 00:00:00' : this.year+'-'+this.month
       }
       if(type == 1) {

src/views/dashboard/components/type6.vue

@@ -290,7 +290,7 @@
     </el-row>
 
     <picAnalysis :flag="curflag" :curInfo="curObj" @cancel="cancel" />
-    <trendAnalysis :flag="trendflag" :selectId="selectId" :type="type==5 ? 0 : 1" @cancel="cancel" />
+    <trendAnalysis :flag="trendflag" :selectId="selectId" :curInfo="curInfo" :type="type==5 ? 0 : 1" @cancel="cancel" />
   </div>
 </template>
 
@@ -345,7 +345,7 @@ export default {
     generateChart() {
       this.curObj = []
       this.curflag = 1
-      this.curObj.push(this.curInfo.baseInfo.leakyCableDescribe)
+      this.curObj.push(this.curInfo.baseInfo.feederDescribe)
     },
     cancel() {
       this.curflag = 0