wenhongquan 3 жил өмнө
parent
commit
435b9e4c77

+ 1 - 1
ruoyi-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 江苏海事局船舶尾气排放遥感监测系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/tailgas/prod-api'

+ 11 - 5
ruoyi-ui/src/components/map/index.vue

@@ -421,6 +421,12 @@ import {queryDatabymmsi, queryShipByDeviceId} from "@/api/data/deviceData";
 let ispro = process.env.NODE_ENV === "production";
 let that = null;
 let mapv = null;
+
+let mapturl = "http://36.156.155.131:8090/geoserver/wms";
+// let mapturl = "/tailgas/geoserver/wms";
+let mapturlpro = "/tailgas/geoserver/gwc/service/wms"
+let mapurlpro1 = "/tailgas/geoserver1"
+
 //  ispro = false;
 export default {
   props: {
@@ -731,7 +737,7 @@ export default {
       var untiled = new ImageLayer({
         source: new ImageWMS({
           ratio: 1,
-          url: 'http://36.156.155.131:8090/geoserver/wms',
+          url: mapturl,
           params: {
             'FORMAT': format,
             'VERSION': '1.1.1',
@@ -750,7 +756,7 @@ export default {
       var tiled = new TileLayer({
         visible: false,
         source: new TileWMS({
-          url: 'http://36.156.155.131:8090/geoserver/wms',
+          url: mapturl,
           params: {
             'FORMAT': format,
             'VERSION': '1.1.1',
@@ -891,7 +897,7 @@ export default {
       var untiled = new ImageLayer({
         source: new ImageWMS({
           ratio: 1,
-          url: 'http://198.17.188.64/geoserver/gwc/service/wms',
+          url: mapturlpro,
           params: {
             'FORMAT': format,
             'VERSION': '1.1.1',
@@ -908,7 +914,7 @@ export default {
       var tiled = new TileLayer({
         visible: false,
         source: new TileWMS({
-          url: 'http://198.17.188.64/geoserver/gwc/service/wms',
+          url: mapturlpro,
           params: {
             'FORMAT': format,
             'VERSION': '1.1.1',
@@ -925,7 +931,7 @@ export default {
 
       const map = new Map({
         target: "map",
-        layers: [getWMTSLayer('http://198.17.188.64:9879/vec_w/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'vec'), getWMTSLayer('http://198.17.188.64:9879/cva_w/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'cva'),
+        layers: [getWMTSLayer(mapurlpro1+'/vec_w/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'vec'), getWMTSLayer(mapurlpro1+'/cva_w/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'cva'),
           untiled,
           tiled
         ],

+ 36 - 36
ruoyi-ui/src/permission.js

@@ -10,44 +10,44 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
-  if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+    NProgress.start()
+    if (getToken()) {
+        to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+            /* has token*/
+        if (to.path === '/login') {
+            next({ path: '/' })
+            NProgress.done()
+        } else {
+            if (store.getters.roles.length === 0) {
+                // 判断当前用户是否已拉取完user_info信息
+                store.dispatch('GetInfo').then(() => {
+                    store.dispatch('GenerateRoutes').then(accessRoutes => {
+                        // 根据roles权限生成可访问的路由表
+                        router.addRoutes(accessRoutes) // 动态添加可访问路由表
+                        next({...to, replace: true }) // hack方法 确保addRoutes已完成
+                    })
+                }).catch(err => {
+                    store.dispatch('LogOut').then(() => {
+                        Message.error(err)
+                        next({ path: '/' })
+                    })
+                })
+            } else {
+                next()
+            }
+        }
     } else {
-      if (store.getters.roles.length === 0) {
-        // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/' })
-            })
-          })
-      } else {
-        next()
-      }
+        // 没有token
+        if (whiteList.indexOf(to.path) !== -1) {
+            // 在免登录白名单,直接进入
+            next()
+        } else {
+            next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
+            NProgress.done()
+        }
     }
-  } else {
-    // 没有token
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单,直接进入
-      next()
-    } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
-    }
-  }
 })
 
 router.afterEach(() => {
-  NProgress.done()
-})
+    NProgress.done()
+})

+ 81 - 83
ruoyi-ui/src/utils/request.js

@@ -1,102 +1,100 @@
 import axios from 'axios'
-import {Message, MessageBox, Notification} from 'element-ui'
+import { Message, MessageBox, Notification } from 'element-ui'
 import store from '@/store'
-import {getToken} from '@/utils/auth'
+import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
-// 创建axios实例
+    // 创建axios实例
 const service = axios.create({
-  // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
-  // 超时
-  timeout: 20000
-})
-// request拦截器
+        // axios中请求配置有baseURL选项,表示请求URL公共部分
+        baseURL: process.env.VUE_APP_BASE_API,
+        // 超时
+        timeout: 20000
+    })
+    // request拦截器
 service.interceptors.request.use(config => {
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?';
-    for (const propName of Object.keys(config.params)) {
-      const value = config.params[propName];
-      var part = encodeURIComponent(propName) + "=";
-      if (value !== null && typeof (value) !== "undefined") {
-        if (typeof value === 'object') {
-          for (const key of Object.keys(value)) {
-            let params = propName + '[' + key + ']';
-            var subPart = encodeURIComponent(params) + "=";
-            url += subPart + encodeURIComponent(value[key]) + "&";
-          }
-        } else {
-          url += part + encodeURIComponent(value) + "&";
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false
+    if (getToken() && !isToken) {
+        config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    // get请求映射params参数
+    if (config.method === 'get' && config.params) {
+        let url = config.url + '?';
+        for (const propName of Object.keys(config.params)) {
+            const value = config.params[propName];
+            var part = encodeURIComponent(propName) + "=";
+            if (value !== null && typeof(value) !== "undefined") {
+                if (typeof value === 'object') {
+                    for (const key of Object.keys(value)) {
+                        let params = propName + '[' + key + ']';
+                        var subPart = encodeURIComponent(params) + "=";
+                        url += subPart + encodeURIComponent(value[key]) + "&";
+                    }
+                } else {
+                    url += part + encodeURIComponent(value) + "&";
+                }
+            }
         }
-      }
+        url = url.slice(0, -1);
+        config.params = {};
+        config.url = url;
     }
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
-  }
-  return config
+    return config
 }, error => {
-  console.log(error)
-  Promise.reject(error)
+    console.log(error)
+    Promise.reject(error)
 })
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
-    // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
-    if (code === 401) {
-      MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
+        // 未设置状态码则默认成功状态
+        const code = res.data.code || 200;
+        // 获取错误信息
+        const msg = errorCode[code] || res.data.msg || errorCode['default']
+        if (code === 401) {
+            MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
+                confirmButtonText: '重新登录',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                store.dispatch('LogOut').then(() => {
+                    location.href = '/index';
+                })
+            }).catch(() => {});
+        } else if (code === 500) {
+            Message({
+                message: msg,
+                type: 'error'
+            })
+            return Promise.reject(new Error(msg))
+        } else if (code !== 200) {
+            Notification.error({
+                title: msg
+            })
+            return Promise.reject('error')
+        } else {
+            return res.data
+        }
+    },
+    error => {
+        console.log('err' + error)
+        let { message } = error;
+        if (message == "Network Error") {
+            message = "后端接口连接异常";
+        } else if (message.includes("timeout")) {
+            message = "系统接口请求超时";
+        } else if (message.includes("Request failed with status code")) {
+            message = "系统接口" + message.substr(message.length - 3) + "异常";
         }
-      ).then(() => {
-        store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+        Message({
+            message: message,
+            type: 'error',
+            duration: 5 * 1000
         })
-      }).catch(() => {
-      });
-    } else if (code === 500) {
-      Message({
-        message: msg,
-        type: 'error'
-      })
-      return Promise.reject(new Error(msg))
-    } else if (code !== 200) {
-      Notification.error({
-        title: msg
-      })
-      return Promise.reject('error')
-    } else {
-      return res.data
+        return Promise.reject(error)
     }
-  },
-  error => {
-    console.log('err' + error)
-    let {message} = error;
-    if (message == "Network Error") {
-      message = "后端接口连接异常";
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
 )
 
-export default service
+export default service

+ 1 - 1
ruoyi-ui/vue.config.js

@@ -16,7 +16,7 @@ module.exports = {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
-    publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+    publicPath: process.env.NODE_ENV === "production" ? "/tailgas" : "/",
     // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
     outputDir: "dist",
     // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)