Compare commits

..

No commits in common. "1a96e4e6a2908d037f8159ac8c9c4ced0be05750" and "ba5526d7d838beb9d9539cdf518035c12ad62bdc" have entirely different histories.

6 changed files with 25 additions and 52 deletions

View File

@ -105,7 +105,6 @@ router.beforeEach((to, from, next) => {
return next({ name: 'login' }) return next({ name: 'login' })
} }
window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0) window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
debugger
fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList) fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
next({ ...to, replace: true }) next({ ...to, replace: true })
}).catch(() => { }).catch(() => {
@ -138,7 +137,6 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
*/ */
function fnAddDynamicMenuRoutes (menuList = [], routes = []) { function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
var temp = [] var temp = []
debugger
for (var i = 0; i < menuList.length; i++) { for (var i = 0; i < menuList.length; i++) {
if (menuList[i].children && menuList[i].children.length >= 1) { if (menuList[i].children && menuList[i].children.length >= 1) {
temp = temp.concat(menuList[i].children) temp = temp.concat(menuList[i].children)
@ -189,7 +187,6 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
}, },
{ path: '*', redirect: { name: '404' } } { path: '*', redirect: { name: '404' } }
]) ])
console.log('查询路由', routes)
window.SITE_CONFIG.dynamicMenuRoutes = routes window.SITE_CONFIG.dynamicMenuRoutes = routes
window.SITE_CONFIG.dynamicMenuRoutesHasAdded = true window.SITE_CONFIG.dynamicMenuRoutesHasAdded = true
} }

View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-27 11:27:22 * @Date: 2022-06-27 11:27:22
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-10-19 11:10:50 * @LastEditTime: 2022-08-23 10:37:29
* @Description: 能力申请 * @Description: 能力申请
--> -->
<template> <template>
@ -168,7 +168,7 @@ export default {
created () { created () {
bus.$off('competencyApplicationInit') bus.$off('competencyApplicationInit')
bus.$on('competencyApplicationInit', () => { bus.$on('competencyApplicationInit', () => {
this.getDataList() this.getDataList();
bus.$emit('updateTaskNum') bus.$emit('updateTaskNum')
}) })
} }

View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51 * @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.wuhongjian * @LastEditors: Light
* @LastEditTime: 2022-10-20 16:16:16 * @LastEditTime: 2022-10-20 15:03:33
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->

View File

@ -60,7 +60,6 @@
"body-parser": "^1.20.0", "body-parser": "^1.20.0",
"chalk": "^4.1.1", "chalk": "^4.1.1",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"compression-webpack-plugin": "^6.1.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-19 17:44:14 * @LastEditTime: 2022-08-25 11:18:05
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>

View File

@ -18,19 +18,7 @@ const {
donation, donation,
} = require('./src/config') } = require('./src/config')
const { webpackBarName, webpackBanner, donationConsole } = require('vab-config') const { webpackBarName, webpackBanner, donationConsole } = require('vab-config')
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = [
'js',
'css',
'html',
'svg',
'json',
'txt',
'ico',
]
// gzip
const isPro = process.env.NODE_ENV === 'production'
// const isPro = false
if (donation) donationConsole() if (donation) donationConsole()
const { version, author } = require('./package.json') const { version, author } = require('./package.json')
const Webpack = require('webpack') const Webpack = require('webpack')
@ -104,6 +92,7 @@ module.exports = {
chainWebpack(config) { chainWebpack(config) {
config.resolve.symlinks(true) config.resolve.symlinks(true)
config.module.rule('svg').exclude.add(resolve('src/icon/remixIcon')).end() config.module.rule('svg').exclude.add(resolve('src/icon/remixIcon')).end()
config.module config.module
.rule('remixIcon') .rule('remixIcon')
.test(/\.svg$/) .test(/\.svg$/)
@ -121,21 +110,21 @@ module.exports = {
config.when(process.env.NODE_ENV !== 'development', (config) => { config.when(process.env.NODE_ENV !== 'development', (config) => {
config.performance.set('hints', false) config.performance.set('hints', false)
config.devtool('none') config.devtool('none')
// config.optimization.splitChunks({ config.optimization.splitChunks({
// chunks: 'all', chunks: 'all',
// cacheGroups: { cacheGroups: {
// libs: { libs: {
// name: 'vue-admin-beautiful-libs', name: 'vue-admin-beautiful-libs',
// test: /[\\/]node_modules[\\/]/, test: /[\\/]node_modules[\\/]/,
// priority: 10, priority: 10,
// chunks: 'initial', chunks: 'initial',
// }, },
// }, },
// }) })
// config config
// .plugin('banner') .plugin('banner')
// .use(Webpack.BannerPlugin, [`${webpackBanner}${time}`]) .use(Webpack.BannerPlugin, [`${webpackBanner}${time}`])
// .end() .end()
config.module config.module
.rule('images') .rule('images')
.use('image-webpack-loader') .use('image-webpack-loader')
@ -145,19 +134,7 @@ module.exports = {
}) })
.end() .end()
}) })
if (isPro) {
// 使gzip
config.plugin('compressionPlugin').use(
new CompressionWebpackPlugin({
// filename: '[path].gz[query]',
algorithm: 'gzip',
test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
threshold: 10240, // 10240
minRatio: 0.8, //
deleteOriginalAssets: false, //
})
)
}
if (build7z) { if (build7z) {
config.when(process.env.NODE_ENV === 'production', (config) => { config.when(process.env.NODE_ENV === 'production', (config) => {
config config