Browse Source

修改配置文件

a1140836302 2 years ago
parent
commit
9854402c4e

+ 3 - 1
.env.development

@@ -2,4 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.3.177:8080/api'
+VUE_APP_BASE_API = 'http://192.168.3.177:8080/api'
+VUE_APP_WS = 'ws://192.168.3.177:8080/ws'
+VUE_APP_VIDEO = 'ws://192.168.3.177:8082/ws'

+ 3 - 1
.env.production

@@ -2,4 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.3.177:8080/api'
+VUE_APP_BASE_API = 'http://192.168.3.177:8080/api'
+VUE_APP_WS = 'ws://192.168.3.177:8080/ws'
+VUE_APP_VIDEO = 'ws://192.168.3.177:8082/ws'

+ 0 - 2
src/utils/request.js

@@ -11,8 +11,6 @@ const service = axios.create({
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 service.interceptors.request.use(
   config => {
-    console.log('url',config)
-    // do something before request is sent
     if (config.method === 'get' && config.params) {
       let url = config.url + '?' + tansParams(config.params)
       url = url.slice(0, -1)

+ 1 - 2
src/views/control-config/setFile.vue

@@ -31,7 +31,6 @@
   </template>
   
   <script>
-  import wsUrl from "../../../vue.config.js"
   import { getToken } from '@/utils/auth'
   import ControlBox from './components/ControlBox.vue'
   export default {
@@ -103,7 +102,7 @@
       websocketConnect() {
         const wstoken = getToken();
         this.ws = new WebSocket(
-          wsUrl.devServer.proxy["/ws"].target + "/" + wstoken
+          process.env.VUE_APP_WS + "/" + wstoken
         );
         this.ws.onopen = this.websocketOnOpen;
         this.ws.onerror = this.websocketOnError;

+ 1 - 2
src/views/equipment-monitoring/index.vue

@@ -180,7 +180,6 @@
 
 <script>
 import './index.scss'
-import wsUrl from '../../../vue.config.js'
 import SubTitle from './components/SubTitle.vue'
 import StorageInfo from './components/StorageInfo.vue'
 import { getToken } from '@/utils/auth'
@@ -297,7 +296,7 @@ export default {
     },
     websocketConnect() {
       const wstoken = getToken()
-      this.ws = new WebSocket(wsUrl.devServer.proxy['/ws'].target+'/'+wstoken)
+      this.ws = new WebSocket(process.env.VUE_APP_WS+'/'+wstoken)
       this.ws.onopen = this.websocketOnOpen
       this.ws.onerror = this.websocketOnError
       this.ws.onmessage = this.websocketOnMessage

+ 1 - 2
src/views/manage-log/control.vue

@@ -51,7 +51,6 @@
 </template>
 
 <script>
-import wsUrl from "../../../vue.config.js"
 import { getToken } from '@/utils/auth'
 import ControlBox from './components/ControlBox'
 export default {
@@ -128,7 +127,7 @@ export default {
     websocketConnect() {
       const wstoken = getToken();
       this.ws = new WebSocket(
-        wsUrl.devServer.proxy["/ws"].target + "/" + wstoken
+        process.env.VUE_APP_WS + "/" + wstoken
       );
       this.ws.onopen = this.websocketOnOpen;
       this.ws.onerror = this.websocketOnError;

+ 1 - 2
src/views/permission/directive.vue

@@ -147,7 +147,6 @@
 <script>
 import './permission.scss'
 import { swapList, swapExport } from '@/api/records'
-import serverUrl from '../../../vue.config.js'
 export default {
   name: 'DirectivePermission',
   components: {},
@@ -250,7 +249,7 @@ export default {
       })
       .then(async() => {
           const res = await swapExport(this.queryParams)
-          const execlUrl=serverUrl.devServer.proxy['/api'].target+'/excel/'+res.data
+          const execlUrl=process.env.VUE_APP_BASE_API+'/excel/'+res.data
           window.open(execlUrl,'_blank')
         })
       .catch(err => { console.error(err) })

+ 1 - 2
src/views/permission/page.vue

@@ -197,7 +197,6 @@
 <script>
 import './permission.scss'
 import { chargeList, chargeExport, getChargeCode } from '@/api/records'
-import serverUrl from '../../../vue.config.js'
 export default {
   name: 'PagePermission',
   components: {},
@@ -316,7 +315,7 @@ export default {
       })
       .then(async() => {
           const res = await chargeExport(this.queryParams)
-          const execlUrl=serverUrl.devServer.proxy['/api'].target+'/excel/'+res.data
+          const execlUrl=process.env.VUE_APP_BASE_API+'/excel/'+res.data
           window.open(execlUrl,'_blank')
         })
       .catch(err => { console.error(err) })

+ 1 - 2
src/views/permission/record-alarm/index.vue

@@ -164,7 +164,6 @@
   <script>
   import '../permission.scss';
   import { alarmList,alarmExport,alarmDispose } from "@/api/records";
-  import serverUrl from '../../../../vue.config.js'
   export default {
     name: "RecordAlarm",
     components: {},
@@ -285,7 +284,7 @@
         })
         .then(async() => {
             const res = await alarmExport(this.queryParams)
-            const execlUrl=serverUrl.devServer.proxy['/api'].target+'/excel/'+res.data
+            const execlUrl=process.env.VUE_APP_BASE_API+'/excel/'+res.data
             window.open(execlUrl,'_blank')
           })
         .catch(err => { console.error(err) })

+ 3 - 3
src/views/power-change-monitoring/index.vue

@@ -336,7 +336,6 @@
 
 <script>
 import { swapInfo, swapRecord, alarmRecord,CarOnline,EditPlate} from '@/api/powerCharge'
-import wsUrl from '../../../vue.config.js'
 import UserItem from './components/UserItem.vue'
 import PannelItem from './components/PannelItem.vue'
 import BinInfomation from './components/BinInfomation.vue'
@@ -540,7 +539,7 @@ export default {
   },
   mounted() {
     // 监控视频
-    const videoUrl = wsUrl.devServer.proxy["/video"].target
+    const videoUrl = process.env.VUE_APP_VIDEO
     let canvas = document.getElementById("video-1");
     var player = new window.JSMpeg.Player(videoUrl, {
       canvas: canvas,
@@ -802,7 +801,8 @@ export default {
     },
     websocketConnect() {
       const wstoken = getToken()
-      this.ws = new WebSocket(wsUrl.devServer.proxy['/ws'].target+'/'+wstoken)
+      console.log('process',process.env)
+      this.ws = new WebSocket(process.env.VUE_APP_WS+'/'+wstoken)
       this.ws.onopen = this.websocketOnOpen
       this.ws.onerror = this.websocketOnError
       this.ws.onmessage = this.websocketOnMessage