增加erp报表，关口计量表；

.env.development

@@ -9,11 +9,11 @@ VUE_APP_TITLE = '页面标题'
 # 登录
 VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
 # 发电能力分析
-# VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
-VUE_APP_GENERAT_URL = 'http://192.168.2.12:9002'
+VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
+# VUE_APP_GENERAT_URL = 'http://192.168.2.12:9002'
 # 智能报表
-# VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
-VUE_APP_REPORT_URL = 'http://192.168.2.3:9001'
+VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
+# VUE_APP_REPORT_URL = 'http://192.168.2.3:9001'
 # 功率预测
 VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
 

components.d.ts

@@ -29,7 +29,6 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElFromItem: typeof import('element-plus/es')['ElFromItem']
     ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']

src/App.vue

@@ -76,6 +76,16 @@
                     },
                 ],
                 intelligentReportDatas: [{
+                        icon: 'ScaleToOriginal',
+                        index: '/intelligentReport/gkjlb',
+                        name: '关口计量表'
+                    },
+                    {
+                        icon: 'Eleme',
+                        index: '/intelligentReport/erp',
+                        name: 'ERP'
+                    },
+                    {
                         icon: 'Finished',
                         index: '/intelligentReport/reporting',
                         name: '报表上报'
@@ -162,8 +172,10 @@
                 }
                 this.$emit('swichFn', this.switchTheme)
             }
+
             if (window.sessionStorage.getItem('headerRoute')) {
                 let str = window.sessionStorage.getItem('headerRoute')
+                // let str = window.location.href
                 if (str.indexOf('powerPrediction') > -1) {
                     this.showMenuData = this.powerPreDatas
                 } else if (str.indexOf('intelligentReport') > -1) {

src/router/index.js

@@ -108,6 +108,22 @@ const routes = [
     },
     //智能报表
     {
+        path: "/intelligentReport/gkjlb",
+        name: "intelligentReportgkjlb",
+        meta: {
+            title: "关口计量表",
+        },
+        component: () => import("../views/intelligentReporting/gkjlb/index.vue"),
+    },
+    {
+        path: "/intelligentReport/erp",
+        name: "intelligentReporterp",
+        meta: {
+            title: "ERP",
+        },
+        component: () => import("../views/intelligentReporting/erp/index.vue"),
+    },
+    {
         path: "/intelligentReport/reporting",
         name: "intelligentReportreporting",
         meta: {

src/views/intelligentReporting/erp/index.vue

@@ -0,0 +1,21 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$90580a90c10b4ee59dfa129528be1442&id=admin&pw=admin",
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        }
+    };
+</script>

src/views/intelligentReporting/gkjlb/index.vue

@@ -0,0 +1,21 @@
+<template>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$e97782eaa9444e11aa1b33c78d9dca1f&id=admin&pw=admin",
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    'height': document.documentElement.clientHeight - 80 + 'px'
+                }
+            },
+        }
+    };
+</script>

src/views/login/index.vue

@@ -141,6 +141,7 @@
                         setToken(datas.data.accessToken)
                         that.$router.push({
                             path: "/home"
+                            // path: "/generatingCap/dataFilter/prepare"
                         })
                     } else {
                         ElMessage.error(datas.msg);