LAPTOP-FO2T5SIU\35838 1 éve%!(EXTRA string=óta)
szülő
commit
b49b0e5b92
28 módosított fájl, 34 hozzáadás és 33 törlés
  1. 1 1
      src/permission.js
  2. 2 2
      src/static/utils/constant.js
  3. 3 3
      src/views/life-line/components/special-image.vue
  4. 3 3
      src/views/life-line/components/special-image_old.vue
  5. 1 1
      src/views/life-line/monitor/points/hidden_danger/index.vue
  6. 1 1
      src/views/life-line/situational-awareness.vue
  7. 1 1
      src/views/life-line/situational-components/echarts/bridgeEcharts/emergenciesEchart.vue
  8. 1 1
      src/views/life-line/situational-components/echarts/bridgeEcharts/gasRiskEchart.vue
  9. 1 1
      src/views/life-line/situational-components/echarts/bridgeEcharts/hiddenDangerEchart.vue
  10. 1 1
      src/views/life-line/situational-components/echarts/constructionEcharts/emergenciesEchart.vue
  11. 1 1
      src/views/life-line/situational-components/echarts/constructionEcharts/gasRiskEchart.vue
  12. 1 1
      src/views/life-line/situational-components/echarts/constructionEcharts/hiddenDangerEchart.vue
  13. 1 1
      src/views/life-line/situational-components/echarts/gasEcharts/emergenciesEchart.vue
  14. 1 1
      src/views/life-line/situational-components/echarts/gasEcharts/gasRiskEchart.vue
  15. 1 1
      src/views/life-line/situational-components/echarts/gasEcharts/hiddenDangerEchart.vue
  16. 1 1
      src/views/life-line/situational-components/echarts/loggingEcharts/emergenciesEchart.vue
  17. 1 1
      src/views/life-line/situational-components/echarts/loggingEcharts/hiddenDangerEchart.vue
  18. 1 1
      src/views/life-line/situational-components/echarts/pipelineEcharts/emergenciesEchart.vue
  19. 1 1
      src/views/life-line/situational-components/echarts/pipelineEcharts/gasRiskEchart.vue
  20. 1 1
      src/views/life-line/situational-components/echarts/pipelineEcharts/hiddenDangerEchart.vue
  21. 1 1
      src/views/life-line/situational-components/echarts/roadEcharts/emergenciesEchart.vue
  22. 1 1
      src/views/life-line/situational-components/echarts/roadEcharts/gasRiskEchart.vue
  23. 1 1
      src/views/life-line/situational-components/echarts/roadEcharts/hiddenDangerEchart.vue
  24. 1 1
      src/views/life-line/situational-components/echarts/supplyEcharts/emergenciesEchart.vue
  25. 1 1
      src/views/life-line/situational-components/echarts/supplyEcharts/gasRiskEchart.vue
  26. 1 1
      src/views/life-line/situational-components/echarts/supplyEcharts/hiddenDangerEchart.vue
  27. 2 1
      src/views/login/index.vue
  28. 1 1
      src/views/testProfile/testVue.vue

+ 1 - 1
src/permission.js

@@ -8,7 +8,7 @@ import getPageTitle from '@/static/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/login', '/bizLogin','/lifeLine','/door','/backstage','/deviceh5','/assitsdanger'] // no redirect whitelist 路由白名单
+const whiteList = ['/login', '/bizLogin','/lifeLine','/door','/deviceh5','/assitsdanger'] // no redirect whitelist 路由白名单
 
 router.beforeEach(async(to, from, next) => {
     //console.log('beforeEach')

+ 2 - 2
src/static/utils/constant.js

@@ -1,7 +1,7 @@
 // 服务端地址
 // const BASE_URI = process.env.VUE_APP_WEB // 利用环境变量
-const BASE_URI = '/webServer' // 代理模式代理地址
-// const BASE_URI = 'https://www.idea-co-sf.com/settleDownApi'
+// const BASE_URI = '/webServer' // 代理模式代理地址
+const BASE_URI = 'https://www.idea-co-sf.com/settleDownApi'
 
 const WEB_URL = 'https://2.21.138.147:8080/lifeline' // 正式
 

+ 3 - 3
src/views/life-line/components/special-image.vue

@@ -331,9 +331,9 @@ export default {
         pointer-events: auto !important;
     }
 
-    .el-dialog__headerbtn {
-        font-size: 75px;
-    }
+    //.el-dialog__headerbtn {
+    //    font-size: 75px;
+    //}
 
     .title {
         display: flex;

+ 3 - 3
src/views/life-line/components/special-image_old.vue

@@ -369,9 +369,9 @@ export default {
   .el-dialog {
     pointer-events: auto !important;
   }
-  .el-dialog__headerbtn {
-    font-size: 75px;
-  }
+  //.el-dialog__headerbtn {
+  //  font-size: 75px;
+  //}
   .title {
     display: flex;
     justify-content: center;

+ 1 - 1
src/views/life-line/monitor/points/hidden_danger/index.vue

@@ -1351,7 +1351,7 @@ export default {
 }
 
 .el-dialog__headerbtn {
-	font-size: 75px
+	//font-size: 75px
 }
 
 .videoBox {

+ 1 - 1
src/views/life-line/situational-awareness.vue

@@ -2034,7 +2034,7 @@ export default {
     }
 }
 .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000 ;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/bridgeEcharts/emergenciesEchart.vue

@@ -350,7 +350,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/bridgeEcharts/gasRiskEchart.vue

@@ -332,7 +332,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/bridgeEcharts/hiddenDangerEchart.vue

@@ -315,7 +315,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/constructionEcharts/emergenciesEchart.vue

@@ -351,7 +351,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/constructionEcharts/gasRiskEchart.vue

@@ -329,7 +329,7 @@ export default {
    }
 
    /deep/ .el-dialog__headerbtn {
-       font-size: 75px;
+       //font-size: 75px;
        z-index: 10000;
    }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/constructionEcharts/hiddenDangerEchart.vue

@@ -318,7 +318,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/gasEcharts/emergenciesEchart.vue

@@ -360,7 +360,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/gasEcharts/gasRiskEchart.vue

@@ -342,7 +342,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/gasEcharts/hiddenDangerEchart.vue

@@ -317,7 +317,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/loggingEcharts/emergenciesEchart.vue

@@ -351,7 +351,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/loggingEcharts/hiddenDangerEchart.vue

@@ -353,7 +353,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/pipelineEcharts/emergenciesEchart.vue

@@ -348,7 +348,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/pipelineEcharts/gasRiskEchart.vue

@@ -329,7 +329,7 @@ export default {
    }
 
    /deep/ .el-dialog__headerbtn {
-       font-size: 75px;
+       //font-size: 75px;
        z-index: 10000;
    }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/pipelineEcharts/hiddenDangerEchart.vue

@@ -316,7 +316,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/roadEcharts/emergenciesEchart.vue

@@ -351,7 +351,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/roadEcharts/gasRiskEchart.vue

@@ -339,7 +339,7 @@ export default {
    }
 
    /deep/ .el-dialog__headerbtn {
-       font-size: 75px;
+       //font-size: 75px;
        z-index: 10000;
    }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/roadEcharts/hiddenDangerEchart.vue

@@ -316,7 +316,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/supplyEcharts/emergenciesEchart.vue

@@ -351,7 +351,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/supplyEcharts/gasRiskEchart.vue

@@ -334,7 +334,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 1 - 1
src/views/life-line/situational-components/echarts/supplyEcharts/hiddenDangerEchart.vue

@@ -314,7 +314,7 @@ export default {
 }
 
 /deep/ .el-dialog__headerbtn {
-    font-size: 75px;
+    //font-size: 75px;
     z-index: 10000;
 }
 </style>

+ 2 - 1
src/views/login/index.vue

@@ -626,7 +626,8 @@ export default {
                                 } else {
                                     Cookie.remove('username')
                                 }
-                                this.$router.push({ path: '/homeLand' })
+                                // this.$router.push({ path: '/homeLand' })
+                                this.$router.push({ path: '/backstage?menuIndex=1281203683157082112' })
                                 // window.localStorage.setItem('mask_status', true)
                                 this.loading = false
                             } else {

+ 1 - 1
src/views/testProfile/testVue.vue

@@ -557,7 +557,7 @@ export default {
 			.btn-next .btn-prev {
 				height: 75px;
 				width: 75px;
-				font-size: 75px;
+				//font-size: 75px;
 				line-height: 75px;
 				color: white;
 				background-color: rgba(0, 0, 0, 0);