ming преди 3 години
родител
ревизия
99c45ddd15
променени са 11 файла, в които са добавени 36 реда и са изтрити 11 реда
  1. BIN
      dist.zip
  2. BIN
      dist3.zip
  3. BIN
      dist4.zip
  4. BIN
      dist5.zip
  5. 9 3
      src/assets/css/index.css
  6. 10 0
      src/router/index.js
  7. 11 5
      src/utils/request.js
  8. 1 1
      src/views/index.vue
  9. 1 1
      src/views/site/Device_motore.vue
  10. 2 0
      src/views/site/Power_diagram.vue
  11. 2 1
      vue.config.js

BIN
dist.zip


BIN
dist3.zip


BIN
dist4.zip


BIN
dist5.zip


+ 9 - 3
src/assets/css/index.css

@@ -30,8 +30,8 @@ body {
     margin: 0;
     padding: 0;
     /*  背景图定位 / 背景图尺寸  cover 完全铺满容器  contain 完整显示在容器内 */
-    /* background: url(../images/bg.png) no-repeat #000; */
-    background-color: rgba(1, 33, 63, .9);
+    background: url(../images/bg.png) no-repeat #000;
+    /* background-color: rgba(1, 33, 63, .9); */
     background-size: cover;
     /* 行高是字体1.15倍 */
     line-height: 1.15;
@@ -82,7 +82,7 @@ header {
     height: calc(100% - .8375rem);
     color: #fff;
     min-height: 650px;
-    font-size: .3rem;
+    font-size: .23rem;
     /* min-height: 750px */
 }
 
@@ -664,6 +664,12 @@ p {
     -webkit-text-fill-color: transparent;
 }
 
+.filterSec option {
+    color: #000;
+    /* color: red; */
+    /* background: #000 */
+}
+
 
 /* 站点概览 */
 

+ 10 - 0
src/router/index.js

@@ -57,6 +57,16 @@ let routes = [
         component: () =>
             import ('../views/site/Overview.vue'),
     },
+
+    //配电系统图页面
+    {
+        path: '/CircuitEdit',
+        name: 'CircuitEdit',
+        meta: { title: '配电系统图', name: "测试站点一", type: "menu" },
+        component: () =>
+            import ('../views/site/CircuitEdit.vue'),
+    },
+
     //配电系统图页面
     {
         path: '/Power_diagram',

+ 11 - 5
src/utils/request.js

@@ -22,15 +22,21 @@ const handleCode = (code, msg) => {
     switch (code) {
         case '401':
             // ElMessage({
-            //     message: '登录失效',0111111111111111111
+            //     message: '登录失效',
             //     type: 'error',
             //     duration: 2 * 1000
             // })
             router
-            // router.replace({ path: "/" });
-            window.location.href = 'https://wx.ewoogi.com/manage/#/login'
 
+
+            localStorage.removeItem('accessToken')
+            alert('进入登录页')
+            router.replace({ path: "/login" });
             removeToken()
+
+            // window.location.href = 'https://wx.ewoogi.com/manage/#/login'
+            // removeToken()
+
             return;
     }
 }
@@ -53,8 +59,8 @@ service.interceptors.request.use(
     config => {
         // config.headers.accessToken = getToken()
         var tokenInfo = localStorage.getItem('accessToken')
-        // console.log('tokenInfo')
-        // console.log(tokenInfo)
+            // console.log('tokenInfo')
+            // console.log(tokenInfo)
 
 
         config.headers.accessToken = tokenInfo

+ 1 - 1
src/views/index.vue

@@ -74,7 +74,7 @@
             :class="
               title == route.meta.title ? 'router_rigth2' : 'router_rigth1'
             "
-            v-for="route in router.slice(4, 6)"
+            v-for="route in router.slice(5, 7)"
             :key="route"
             :to="route.path"
             v-show="route.meta.type === 'menu'"

+ 1 - 1
src/views/site/Device_motore.vue

@@ -1019,7 +1019,7 @@ export default {
 }
 .ac-content .states .display {
   color: rgba(55,165,235);
-  font-size: 15px;
+  /* font-size: 15px; */
   font-family: Microsoft YaHei Regular, Microsoft YaHei Regular-Regular;
   font-weight: 400;
 }

+ 2 - 0
src/views/site/Power_diagram.vue

@@ -97,8 +97,10 @@ export default {
       this.setInterval = setInterval(() => {
         api.getHookupComponentComplete({ siteId: this.$store.state.siteId }).then((requset) => {
           if (requset.data.length > 0) {
+            console.log(1)
             _this.svgLists = requset.data;
           } else {
+            console.log(2)
             ElMessage.error("当前站点下无可查看配电图,即将为您跳转到编辑页!");
             this.editChart();
           }

+ 2 - 1
vue.config.js

@@ -6,8 +6,9 @@ function resolve(dir) {
 // 基本结构
 module.exports = {
     // 打包后路径错误导致的空白页面问题。
-    publicPath: '/vuefiv/',
+    // publicPath: '/vuefiv/',
     // publicPath: '/panel/',
+    publicPath: '/',
     outputDir: process.env.outputDir,
     // assetsPublicPath: '/vuefiv/',
     // assetsDir: 'vuefiv',