+
+
// 引入导航栏组件
import NavBar from './components/navBar.vue'
+// 引入导航栏组件
+import NavBar2 from './components/navBar2.vue'
+
+import {getUserName} from '../../utils/auth'
export default {
name: 'PublicService',
components: {
NavBar,
+ NavBar2
},
data() {
return {
- searchKeyword: '' // 搜索关键词
+ searchKeyword: '', // 搜索关键词
+ isDemoUser: false // 新增状态
}
},
+
+ mounted() {
+ const userName = getUserName();
+ // 判断用户名不能为空
+ if (userName) {
+ this.isDemoUser = userName.includes('演示')
+ }
+ },
+
computed: {
// 根据路由元信息控制搜索框显示
showSearch() {
diff --git a/src/views/publicService/index_1.vue b/src/views/publicService/index_1.vue
index 026134c..855b7fd 100644
--- a/src/views/publicService/index_1.vue
+++ b/src/views/publicService/index_1.vue
@@ -6,6 +6,7 @@ export default {
name: 'PublicService_1',
mounted() {
const permissions = getPermissions();
+ console.log("检查权限值",permissions);
// 检查权限值,根据权限进行跳转
if (permissions) {
// 将权限字符串转换为数组
diff --git a/src/views/publicService/proMaterials/index.vue b/src/views/publicService/proMaterials/index.vue
index 11bbf0c..78c4c78 100644
--- a/src/views/publicService/proMaterials/index.vue
+++ b/src/views/publicService/proMaterials/index.vue
@@ -12,7 +12,7 @@
{{ item.label }}
-
+
diff --git a/src/views/publicService/productCenter/index.vue b/src/views/publicService/productCenter/index.vue
index 4c79f5c..53f256f 100644
--- a/src/views/publicService/productCenter/index.vue
+++ b/src/views/publicService/productCenter/index.vue
@@ -147,10 +147,10 @@ export default {
} else if (!url.startsWith('http://') && !url.startsWith('https://')) {
// 如果 URL 不是以 http:// 或 https:// 开头,则添加 https://
if (url.startsWith('www.')) {
- url = 'https://' + url
+ url = 'http://' + url
} else {
- // 其他情况,添加 https://
- url = 'https://' + url
+ // 其他情况,添加 http://
+ url = 'http://' + url
}
}
window.open(url, '_blank')
diff --git a/src/views/publicService/productCenter/index_old.vue b/src/views/publicService/productCenter/index_old.vue
index 91f72c6..7614986 100644
--- a/src/views/publicService/productCenter/index_old.vue
+++ b/src/views/publicService/productCenter/index_old.vue
@@ -121,12 +121,12 @@ export default {
let url = service.linkUrl
// 如果 URL 不是以 http:// 或 https:// 开头,则添加 https://
if (!url.startsWith('http://') && !url.startsWith('https://')) {
- // 如果 URL 以 www. 开头,直接添加 https://
+ // 如果 URL 以 www. 开头,直接添加 http://
if (url.startsWith('www.')) {
- url = 'https://' + url
+ url = 'http://' + url
} else {
- // 其他情况,添加 https://
- url = 'https://' + url
+ // 其他情况,添加 http://
+ url = 'http://' + url
}
}
diff --git a/src/views/publicService/productCenter/product-detail.vue b/src/views/publicService/productCenter/product-detail.vue
index d83728a..25267fa 100644
--- a/src/views/publicService/productCenter/product-detail.vue
+++ b/src/views/publicService/productCenter/product-detail.vue
@@ -235,10 +235,10 @@ export default {
} else if (!url.startsWith('http://') && !url.startsWith('https://')) {
// 如果 URL 不是以 http:// 或 https:// 开头,则添加 https://
if (url.startsWith('www.')) {
- url = 'https://' + url
+ url = 'http://' + url
} else {
- // 其他情况,添加 https://
- url = 'https://' + url
+ // 其他情况,添加 http://
+ url = 'http://' + url
}
}
diff --git a/vue.config.js b/vue.config.js
index df1857f..7f1ac56 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,13 +2,13 @@
const path = require('path')
function resolve(dir) {
- return path.join(__dirname, dir)
+ return path.join(__dirname, dir)
}
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '博诺思公共微服务平台' // 网页标题
-const baseUrl = 'http://192.168.0.38:58080' // 后端接口
+const baseUrl = 'http://192.168.0.50:58080/bnscloud/' // 后端接口d
const port = process.env.port || process.env.npm_config_port || 80 // 端口
@@ -16,120 +16,121 @@ 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' ? '/pubSerPlatform' : '/',
- // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
- outputDir: 'dist',
- // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
- assetsDir: 'static',
- // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
- productionSourceMap: false,
- transpileDependencies: ['quill'],
- // 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://192.168.0.7:58080/bnscloud', // 产线环境
- target: 'http://192.168.0.14:1999/bnscloud', // 测试环境
- changeOrigin: true,
- pathRewrite: {
- ['^' + process.env.VUE_APP_BASE_API]: '',
- },
- },
- // springdoc proxy
- '^/v3/api-docs/(.*)': {
- target: baseUrl,
- changeOrigin: true,
- },
+ // 部署生产环境和开发环境下的URL。
+ // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+ // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
+ publicPath: process.env.NODE_ENV === 'production' ? '/pubSerPlatform' : '/',
+ // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
+ outputDir: 'dist',
+ // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
+ assetsDir: 'static',
+ // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
+ productionSourceMap: false,
+ transpileDependencies: ['quill'],
+ // 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://192.168.0.7:58080/bnscloud', // 产线环境
+ target: 'http://192.168.0.14:1999/bnscloud', // 测试环境
+ // target: 'http://192.168.0.50:58080/bnscloud', // 本地环境
+ changeOrigin: true,
+ pathRewrite: {
+ ['^' + process.env.VUE_APP_BASE_API]: '',
},
- disableHostCheck: true,
+ },
+ // springdoc proxy
+ '^/v3/api-docs/(.*)': {
+ target: baseUrl,
+ changeOrigin: true,
+ },
},
- css: {
- loaderOptions: {
- sass: {
- sassOptions: { outputStyle: 'expanded' },
- },
+ disableHostCheck: true,
+ },
+ css: {
+ loaderOptions: {
+ sass: {
+ sassOptions: {outputStyle: 'expanded'},
+ },
+ },
+ },
+ configureWebpack: {
+ name: name,
+ resolve: {
+ alias: {
+ '@': resolve('src'),
+ },
+ },
+ plugins: [
+ // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+ new CompressionPlugin({
+ cache: false, // 不启用文件缓存
+ test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
+ filename: '[path][base].gz[query]', // 压缩后的文件名
+ algorithm: 'gzip', // 使用gzip压缩
+ minRatio: 0.8, // 压缩比例,小于 80% 的文件不会被压缩
+ deleteOriginalAssets: false, // 压缩后删除原文件
+ }),
+ ],
+ },
+ 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()
+
+ 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
+ test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+ priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+ },
+ commons: {
+ name: 'chunk-commons',
+ test: resolve('src/components'), // can customize your rules
+ minChunks: 3, // minimum common number
+ priority: 5,
+ reuseExistingChunk: true,
+ },
},
- },
- configureWebpack: {
- name: name,
- resolve: {
- alias: {
- '@': resolve('src'),
- },
- },
- plugins: [
- // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
- new CompressionPlugin({
- cache: false, // 不启用文件缓存
- test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式
- filename: '[path][base].gz[query]', // 压缩后的文件名
- algorithm: 'gzip', // 使用gzip压缩
- minRatio: 0.8, // 压缩比例,小于 80% 的文件不会被压缩
- deleteOriginalAssets: false, // 压缩后删除原文件
- }),
- ],
- },
- 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()
-
- 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
- test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
- priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
- },
- 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')
- })
- },
+ })
+ config.optimization.runtimeChunk('single')
+ })
+ },
}