SunZehao 13 часов назад
Родитель
Сommit
876a7e8566

+ 0 - 1
.env.production

@@ -41,6 +41,5 @@ VUE_APP_WS_URL=ws://10.112.33.5:6014
 # VUE_APP_GENERAT_URL=http://10.220.1.5:6060
 VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
-# VUE_APP_HEADER_URL=http://10.112.32.31:8082
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
 

+ 7 - 3
src/permission.js

@@ -1,9 +1,14 @@
 import router from "./router";
-import { getCookie,removeToken } from "@/utills/auth"; // getToken from cookie
+import { getCookie, removeToken } from "@/utills/auth"; // getToken from cookie
 import { Base64 } from "js-base64";
 const whiteList = ["/integratedAlarm", "/login", "/logout"]; // 不重定向白名单
 import store from "@/store";
 router.beforeEach((to, from, next) => {
+    if (to.path == "/login" || to.path == "/") {
+        next({ path: "/integratedAlarm" });
+    } else {
+        next();
+    }
     // if (getCookie("authToken")) {
     //     if (to.path == "/login" || to.path == "/") {
     //     next({ path: "/integratedAlarm" });
@@ -15,7 +20,6 @@ router.beforeEach((to, from, next) => {
     // } else {
     //     next(`/login?redirect=${to.fullPath}`);
     // }
-    next();
 });
 
-router.afterEach((to, from, next) => {});
+router.afterEach((to, from, next) => { });

+ 52 - 5
src/router/index.js

@@ -29,11 +29,11 @@ export const asyncRoutes = [
     //     },
     //   },
     {
-    path: "/",
-    redirect: "/integratedAlarm",
-    meta: {
-        title: "综合报警",
-    },
+        path: "/",
+        redirect: "/integratedAlarm",
+        meta: {
+            title: "综合报警",
+        },
     },
     //综合报警
     {
@@ -1106,6 +1106,53 @@ export const asyncRoutes = [
                     icon: "svg-自定制报表管理",
                 },
             },
+            {
+                path: "czswdlgl",
+                name: "czswdlgl",
+                component: () => import("@/views/nxReport/czswdlgl"),
+                meta: {
+                    title: "场站上网电量,功率(试运行)",
+                    icon: "svg-报表管理",
+                },
+                children: [
+                    {
+                        path: "haswdlr",
+                        name: "haswdlr",
+                        component: () => import("@/views/nxReport/czswdlgl/haswdlr.vue"),
+                        meta: {
+                            title: "惠安上网电量(日)",
+                            icon: "",
+                        },
+                    },
+                    {
+                        path: "haswdly",
+                        name: "haswdly",
+                        component: () => import("@/views/nxReport/czswdlgl/haswdly.vue"),
+                        meta: {
+                            title: "惠安上网电量(月)",
+                            icon: "",
+                        },
+                    },
+                    {
+                        path: "haglycr",
+                        name: "haglycr",
+                        component: () => import("@/views/nxReport/czswdlgl/haglycr.vue"),
+                        meta: {
+                            title: "惠安功率预测(日)",
+                            icon: "",
+                        },
+                    },
+                    {
+                        path: "haglycy",
+                        name: "haglycy",
+                        component: () => import("@/views/nxReport/czswdlgl/haglycy.vue"),
+                        meta: {
+                            title: "惠安功率预测(月)",
+                            icon: "",
+                        },
+                    }
+                ]
+            },
             // {
             //     path: "fdscqk",
             //     name: "fdscqk",

+ 37 - 0
src/views/nxReport/czswdlgl/haglycr.vue

@@ -0,0 +1,37 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url:
+        process.env.VUE_APP_REPORT +
+        "/rbi/ebibase/showreport.do?resid=EANA$2$2$1$72977a47b6154b299ebcc708634e63dc$64caf0462a99432c901b2e2d65acbcb8&id=admin&pw=GYpt.6388@7590*",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

+ 37 - 0
src/views/nxReport/czswdlgl/haglycy.vue

@@ -0,0 +1,37 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url:
+        process.env.VUE_APP_REPORT +
+        "/rbi/ebibase/showreport.do?resid=EANA$2$2$1$72977a47b6154b299ebcc708634e63dc$5f10b329ed3442188ea883113c3039f6&id=admin&pw=GYpt.6388@7590*",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

+ 37 - 0
src/views/nxReport/czswdlgl/haswdlr.vue

@@ -0,0 +1,37 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url:
+        process.env.VUE_APP_REPORT +
+        "/rbi/ebibase/showreport.do?resid=EANA$2$2$1$72977a47b6154b299ebcc708634e63dc$d4466230062444fb8292f2cc90d0e915&id=admin&pw=GYpt.6388@7590*",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

+ 37 - 0
src/views/nxReport/czswdlgl/haswdly.vue

@@ -0,0 +1,37 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url:
+        process.env.VUE_APP_REPORT +
+        "/rbi/ebibase/showreport.do?resid=EANA$2$2$1$72977a47b6154b299ebcc708634e63dc$6d2b113a8f9740a09e88ea557f75b0a7&id=admin&pw=GYpt.6388@7590*",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

+ 12 - 0
src/views/nxReport/czswdlgl/index.vue

@@ -0,0 +1,12 @@
+<template>
+  <router-view />
+</template>
+
+<script>
+export default {
+  name: "czswdlgl",
+};
+</script>
+
+<style scoped lang="less">
+</style>