From 07f49a3d0c85f282cc5394a9067ddbbeba1d24b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sun, 10 Oct 2021 20:39:35 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix=E4=B8=BB=E9=A2=98=E6=98=BE=E7=A4=BAbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Vue/src/assets/styles/index.scss | 33 ------------------- ZR.Vue/src/layout/index.vue | 2 +- ZR.Vue/src/main.js | 2 +- ZR.Vue/src/views/tool/gen/index.vue | 11 ++++--- ZR.Vue/vue.config.js | 51 +++++++++++++++-------------- 5 files changed, 35 insertions(+), 64 deletions(-) diff --git a/ZR.Vue/src/assets/styles/index.scss b/ZR.Vue/src/assets/styles/index.scss index 7fbd419..e1a2728 100644 --- a/ZR.Vue/src/assets/styles/index.scss +++ b/ZR.Vue/src/assets/styles/index.scss @@ -419,39 +419,6 @@ aside { color: #FFFFFF; } -/* text color */ -.text-navy { - color: #1ab394; -} - -.text-primary { - color: inherit; -} - -.text-success { - color: #1c84c6; -} - -.text-info { - color: #23c6c8; -} - -.text-warning { - color: #f8ac59; -} - -.text-danger { - color: #ed5565; -} - -.text-muted { - color: #888888; -} - -/* image */ -.img-circle { - border-radius: 50%; -} .img-lg { width: 120px; diff --git a/ZR.Vue/src/layout/index.vue b/ZR.Vue/src/layout/index.vue index fb51949..24bfc21 100644 --- a/ZR.Vue/src/layout/index.vue +++ b/ZR.Vue/src/layout/index.vue @@ -8,7 +8,7 @@ - + diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js index 2333caf..5bfaecc 100644 --- a/ZR.Vue/src/main.js +++ b/ZR.Vue/src/main.js @@ -4,7 +4,7 @@ import Cookies from 'js-cookie' import Element from 'element-ui' import 'normalize.css/normalize.css' // a modern alternative to CSS resets -import '@/assets/styles/element-variables.scss' +import './assets/styles/element-variables.scss' import '@/assets/styles/index.scss' // global css import App from './App' diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue index 4dcc7ec..84e72e0 100644 --- a/ZR.Vue/src/views/tool/gen/index.vue +++ b/ZR.Vue/src/views/tool/gen/index.vue @@ -97,8 +97,8 @@ import { import { downloadFile } from "@/utils/zipdownload.js"; import importTable from "./importTable"; import { Loading } from "element-ui"; -import hljs from 'highlight.js' -import 'highlight.js/styles/idea.css' //这里有多个样式，自己可以根据需要切换 +import hljs from "highlight.js"; +import "highlight.js/styles/idea.css"; //这里有多个样式，自己可以根据需要切换 export default { name: "CodeGenerator", @@ -159,8 +159,11 @@ export default { * 编辑表格 */ handleEditTable(row) { - console.log(row); - this.$router.push("/tool/gen/editTable?tableId=" + row.tableId); + this.$router.push({ + path: "/gen/editTable", + params: { tableId: row.tableId }, + }); + // this.$router.push({ path: "/job/log", params: param }); }, // 代码预览 handlePreview(row) { diff --git a/ZR.Vue/vue.config.js b/ZR.Vue/vue.config.js index f39f6ea..badd996 100644 --- a/ZR.Vue/vue.config.js +++ b/ZR.Vue/vue.config.js @@ -47,7 +47,7 @@ module.exports = { configureWebpack: { name: name, resolve: { - //设置路径别名，@代表根目录， @代表 src/文件夹 + //设置路径别名，@代表根目录， @代表 src/文件夹 alias: { '@': resolve('src') } @@ -98,33 +98,34 @@ module.exports = { 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.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: './',//到根目录下 + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './' //到根目录下 } } ) From 8903af1bd011eb065c4cca0fabbf6d42bcc8747b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sun, 10 Oct 2021 20:40:24 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Vue/src/views/monitor/job/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ZR.Vue/src/views/monitor/job/index.vue b/ZR.Vue/src/views/monitor/job/index.vue index b17a013..39b168a 100644 --- a/ZR.Vue/src/views/monitor/job/index.vue +++ b/ZR.Vue/src/views/monitor/job/index.vue @@ -24,7 +24,7 @@ 删除 --> - 日志 + 日志 @@ -46,7 +46,7 @@