Эх сурвалжийг харах

去除请求前缀tailgas
子系统功能有些地址使用相对路径,配合内外网都能使用

459242451@qq.com 3 жил өмнө
parent
commit
38caa82200

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

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

+ 4 - 4
ruoyi-ui/src/components/map/index.vue

@@ -424,8 +424,8 @@ 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"
+let mapturlpro = "/geoserver/gwc/service/wms"
+let mapurlpro1 = "/geoserver1"
 
 //  ispro = false;
 export default {
@@ -530,7 +530,7 @@ export default {
               that.deviceData = tadata.data;
               that.d_activeName = 'd_first';
               if (tadata.data.source == "heiyan_ship_recognition") {
-                that.source = tadata.data.liveStreamUrl;
+                that.source = tadata.data.liveStreamUrl.slice(tadata.data.liveStreamUrl.indexOf("/live"));
                 setTimeout(function () {
                   that.$refs.VueAliplayerV2.play();
                 }, 1000)
@@ -931,7 +931,7 @@ export default {
 
       const map = new Map({
         target: "map",
-        layers: [getWMTSLayer(mapurlpro1+'/vec_w/wmts?tk=98ec3e37b32974c2d58ea1a790640fe7', 'vec'), getWMTSLayer(mapurlpro1+'/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
         ],

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

@@ -2,7 +2,7 @@
 const path = require('path')
 
 function resolve(dir) {
-    return path.join(__dirname, dir)
+  return path.join(__dirname, dir)
 }
 
 const name = process.env.VUE_APP_TITLE || '江苏海事局船舶尾气排放遥感监测系统' // 网页标题
@@ -13,106 +13,106 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分,具体配置参考文档
 module.exports = {
-    // 部署生产环境和开发环境下的URL。
-    // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
-    publicPath: process.env.NODE_ENV === "production" ? "/tailgas" : "/",
-    // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
-    outputDir: "dist",
-    // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
-    assetsDir: "static",
-    // 是否开启eslint保存检测,有效值:ture | false | 'error'
-    lintOnSave: process.env.NODE_ENV === "development",
-    // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
-    productionSourceMap: false,
-    // webpack-dev-server 相关配置
-    devServer: {
-        host: "0.0.0.0",
-        port: port,
-        open: true,
-        proxy: {
-            // detail: https://cli.vuejs.org/config/#devserver-proxy
-            [process.env.VUE_APP_BASE_API]: {
-                // target: `http://localhost:8080`,
-                target: `http://cbwq.xt.wenhq.top:8083/prod-api`,
-                changeOrigin: true,
-                pathRewrite: {
-                    ["^" + process.env.VUE_APP_BASE_API]: "",
-                },
-            },
-            "/PLTV": {
-                target: "http://localhost:8082",
-                ws: true,
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/": "",
-                },
-            },
+  // 部署生产环境和开发环境下的URL。
+  // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
+  outputDir: "dist",
+  // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
+  assetsDir: "static",
+  // 是否开启eslint保存检测,有效值:ture | false | 'error'
+  lintOnSave: process.env.NODE_ENV === "development",
+  // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  // webpack-dev-server 相关配置
+  devServer: {
+    host: "0.0.0.0",
+    port: port,
+    open: true,
+    proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `http://localhost:8080`,
+        target: `http://cbwq.xt.wenhq.top:8083/prod-api`,
+        changeOrigin: true,
+        pathRewrite: {
+          ["^" + process.env.VUE_APP_BASE_API]: "",
         },
-        disableHostCheck: true,
-    },
-    configureWebpack: {
-        name: name,
-        resolve: {
-            alias: {
-                "@": resolve("src"),
-            },
+      },
+      "/PLTV": {
+        target: "http://localhost:8082",
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          "^/": "",
         },
+      },
+    },
+    disableHostCheck: true,
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        "@": resolve("src"),
+      },
     },
-    chainWebpack(config) {
-        config.plugins.delete("preload"); // TODO: need test
-        config.plugins.delete("prefetch"); // TODO: need test
+  },
+  chainWebpack(config) {
+    config.plugins.delete("preload"); // TODO: need test
+    config.plugins.delete("prefetch"); // TODO: need test
 
-        // set svg-sprite-loader
-        config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
-        config.module
-            .rule("icons")
-            .test(/\.svg$/)
-            .include.add(resolve("src/assets/icons"))
-            .end()
-            .use("svg-sprite-loader")
-            .loader("svg-sprite-loader")
-            .options({
-                symbolId: "icon-[name]",
-            })
-            .end();
+    // set svg-sprite-loader
+    config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
+    config.module
+      .rule("icons")
+      .test(/\.svg$/)
+      .include.add(resolve("src/assets/icons"))
+      .end()
+      .use("svg-sprite-loader")
+      .loader("svg-sprite-loader")
+      .options({
+        symbolId: "icon-[name]",
+      })
+      .end();
 
-        config.when(process.env.NODE_ENV !== "development", (config) => {
-            config
-                .plugin("ScriptExtHtmlWebpackPlugin")
-                .after("html")
-                .use("script-ext-html-webpack-plugin", [{
-                    // `runtime` must same as runtimeChunk name. default is `runtime`
-                    inline: /runtime\..*\.js$/,
-                }, ])
-                .end();
-            config.optimization.splitChunks({
-                chunks: "all",
-                cacheGroups: {
-                    libs: {
-                        name: "chunk-libs",
-                        test: /[\\/]node_modules[\\/]/,
-                        priority: 10,
-                        chunks: "initial", // only package third parties that are initially dependent
-                    },
-                    elementUI: {
-                        name: "chunk-elementUI", // split elementUI into a single package
-                        priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                        test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
-                    },
-                    commons: {
-                        name: "chunk-commons",
-                        test: resolve("src/components"), // can customize your rules
-                        minChunks: 3, //  minimum common number
-                        priority: 5,
-                        reuseExistingChunk: true,
-                    },
-                },
-            });
-            config.optimization.runtimeChunk("single"), {
-                from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
-                to: "./", //到根目录下
-            };
-        });
-    },
-};
+    config.when(process.env.NODE_ENV !== "development", (config) => {
+      config
+        .plugin("ScriptExtHtmlWebpackPlugin")
+        .after("html")
+        .use("script-ext-html-webpack-plugin", [{
+          // `runtime` must same as runtimeChunk name. default is `runtime`
+          inline: /runtime\..*\.js$/,
+        },])
+        .end();
+      config.optimization.splitChunks({
+        chunks: "all",
+        cacheGroups: {
+          libs: {
+            name: "chunk-libs",
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: "initial", // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: "chunk-elementUI", // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+          },
+          commons: {
+            name: "chunk-commons",
+            test: resolve("src/components"), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true,
+          },
+        },
+      });
+      config.optimization.runtimeChunk("single"), {
+        from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+        to: "./", //到根目录下
+      };
+    });
+  },
+};