From f3298cdb83deeb2c55242cef5c699769b0c14416 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 1 Nov 2019 15:12:00 +0800 Subject: [PATCH 01/77] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 5 ++ .../lessoncategory/edit/lesson/publish.vue | 1 - .../lessoncategory/edit/sorttree/index.vue | 52 +++++++++++-------- src/views/planMonitor/detail.vue | 11 ++-- src/views/publish/productStatus/index.vue | 16 +++--- src/views/publish/publishLesson/index.vue | 7 --- 6 files changed, 47 insertions(+), 45 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index efd7cd250..78eefdbaa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -758,6 +758,7 @@ export const asyncRouter = [ } }, { + // 用户管理 path: 'userManage', component: UserControl, meta: { @@ -765,6 +766,7 @@ export const asyncRouter = [ } }, { + // 缓存管理 path: 'cache', component: CacheControl, meta: { @@ -800,6 +802,7 @@ export const asyncRouter = [ } }, { + // 子系统生成 path: 'systemGenerate', component: SystemGenerate, meta: { @@ -807,6 +810,7 @@ export const asyncRouter = [ } }, { + // 产品编辑 path: 'product', component: MapProduct, meta: { @@ -814,6 +818,7 @@ export const asyncRouter = [ } }, { + // 实训录制 path: 'record', redirect: 'record/training/0/null', component: Trainingrecord, diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue index b076887b3..519822be6 100644 --- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue +++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue @@ -22,7 +22,6 @@ \ No newline at end of file + diff --git a/src/views/scriptManage/display/index.vue b/src/views/scriptManage/display/index.vue index 8b3b9ba60..ccb392c6f 100644 --- a/src/views/scriptManage/display/index.vue +++ b/src/views/scriptManage/display/index.vue @@ -16,37 +16,35 @@ import TipScriptRecord from './tipScriptRecord'; import drapLeft from '@/views/components/drapLeft/index'; export default { - name: 'ScriptDisplay', - components: { - Display, - TipScriptRecord, - drapLeft - }, - data() { - return { - widthLeft: 780, - size: { - width: document.documentElement.clientWidth - 780, - height: document.documentElement.clientHeight - }, - group: this.$route.query.group - }; - }, - computed: { - }, - watch: { - '$store.state.app.windowSizeCount': function() { - this.size = { width: this.$store.state.app.width - 780, height: this.$store.state.app.height}; - }, - widthLeft: function(val) { - this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height}; - } - }, - methods: { - drapWidth(width) { - this.widthLeft = Number(width); - } - } + name: 'ScriptDisplay', + components: { + Display, + TipScriptRecord, + drapLeft + }, + data() { + return { + widthLeft: 780, + size: { + width: document.documentElement.clientWidth - 780, + height: document.documentElement.clientHeight + }, + group: this.$route.query.group + }; + }, + watch: { + '$store.state.app.windowSizeCount': function() { + this.size = { width: this.$store.state.app.width - 780, height: this.$store.state.app.height}; + }, + widthLeft: function(val) { + this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height}; + } + }, + methods: { + drapWidth(width) { + this.widthLeft = Number(width); + } + } }; diff --git a/src/views/lesson/lessoncategory/edit/sorttree/index.vue b/src/views/lesson/lessoncategory/edit/sorttree/index.vue index 852ffe0aa..42d6893d5 100644 --- a/src/views/lesson/lessoncategory/edit/sorttree/index.vue +++ b/src/views/lesson/lessoncategory/edit/sorttree/index.vue @@ -52,11 +52,6 @@ export default { } }; }, - computed: { - height() { - return this.$store.state.app.height - 180; - } - }, methods: { convertTreeData(list, data) { let tree = []; diff --git a/src/views/screenMonitor/index.vue b/src/views/screenMonitor/index.vue index 8a9d0ad70..05c2994e4 100644 --- a/src/views/screenMonitor/index.vue +++ b/src/views/screenMonitor/index.vue @@ -1,14 +1,12 @@ @@ -19,41 +17,41 @@ import drapLeft from '@/views/components/drapLeft/index'; import localStore from 'storejs'; export default { - name: 'Exam', - components: { - demonList, - drapLeft - }, - data() { - return { - listShow: true, - widthLeft: 450 - }; - }, - computed: { - ...mapGetters([ - 'lessonbar' - ]), - height() { - return this.$store.state.app.height; - } - }, - watch: { - 'lessonbar.opened': function (val) { - this.listShow = val; - } - }, - mounted() { - this.widthLeft = Number(localStore.get('LeftWidth')); - }, - methods: { - refresh() { - this.$refs && this.$refs.demonList && this.$refs.demonList.refresh(); - }, - drapWidth(width) { - this.widthLeft = Number(width); - } - } + name: 'Exam', + components: { + demonList, + drapLeft + }, + data() { + return { + listShow: true, + widthLeft: 450 + }; + }, + computed: { + ...mapGetters([ + 'lessonbar' + ]), + height() { + return this.$store.state.app.height; + } + }, + watch: { + 'lessonbar.opened': function (val) { + this.listShow = val; + } + }, + mounted() { + this.widthLeft = Number(localStore.get('LeftWidth')); + }, + methods: { + refresh() { + this.$refs && this.$refs.demonList && this.$refs.demonList.refresh(); + }, + drapWidth(width) { + this.widthLeft = Number(width); + } + } }; - diff --git a/src/views/screenMonitor/home.vue b/src/views/screenMonitor/home.vue deleted file mode 100644 index 82bbd39b0..000000000 --- a/src/views/screenMonitor/home.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - diff --git a/src/views/screenMonitor/index.vue b/src/views/screenMonitor/index.vue deleted file mode 100644 index 05c2994e4..000000000 --- a/src/views/screenMonitor/index.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - diff --git a/src/views/screenMonitor/list/demonList.vue b/src/views/screenMonitor/list/demonList.vue deleted file mode 100644 index 2eadafb6f..000000000 --- a/src/views/screenMonitor/list/demonList.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - diff --git a/vue.config.js b/vue.config.js index b2e7bb0a5..cd7b21d7e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ const defaultSettings = require('./src/settings.js'); const CopyWebpackPlugin = require('copy-webpack-plugin'); function resolve(dir) { - return path.join(__dirname, dir); + return path.join(__dirname, dir); } const name = defaultSettings.title; // page title @@ -15,134 +15,135 @@ const port = 9527; // dev port // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = { - /** + /** * You will need to set publicPath if you plan to deploy your site under a sub path, * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/, * then publicPath should be set to "/bar/". * In most cases please use '/' !!! * Detail: https://cli.vuejs.org/config/#publicpath */ - publicPath: '/', - outputDir: 'dist', - assetsDir: 'static', - lintOnSave: false, - productionSourceMap: false, - devServer: { - port: port, - open: true, - overlay: { - warnings: false, - errors: true - } - // proxy: { - // // change xxx-api/login => mock/login - // // detail: https://cli.vuejs.org/config/#devserver-proxy - // [process.env.VUE_APP_BASE_API]: { - // target: `http://localhost:${port}/mock`, - // changeOrigin: true, - // pathRewrite: { - // ['^' + process.env.VUE_APP_BASE_API]: '' - // } - // } - // }, - // after: require('./mock/mock-server.js') - }, - configureWebpack: { - // provide the app's title in webpack's name field, so that - // it can be accessed in index.html to inject the correct title. - name: name, - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - '@': resolve('src') - } - }, - plugins: [ - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, './static'), - to: 'static', - ignore: ['.*'] - } - ]) - ] - }, - chainWebpack(config) { - config.plugins.delete('preload'); // TODO: need test - config.plugins.delete('prefetch'); // TODO: need test + publicPath: '/', + outputDir: 'dist', + assetsDir: 'static', + lintOnSave: false, + productionSourceMap: false, + cssSourceMap: true, + devServer: { + port: port, + open: true, + overlay: { + warnings: false, + errors: true + } + // proxy: { + // // change xxx-api/login => mock/login + // // detail: https://cli.vuejs.org/config/#devserver-proxy + // [process.env.VUE_APP_BASE_API]: { + // target: `http://localhost:${port}/mock`, + // changeOrigin: true, + // pathRewrite: { + // ['^' + process.env.VUE_APP_BASE_API]: '' + // } + // } + // }, + // after: require('./mock/mock-server.js') + }, + configureWebpack: { + // provide the app's title in webpack's name field, so that + // it can be accessed in index.html to inject the correct title. + name: name, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: { + '@': resolve('src') + } + }, + plugins: [ + new CopyWebpackPlugin([ + { + from: path.resolve(__dirname, './static'), + to: 'static', + ignore: ['.*'] + } + ]) + ] + }, + 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/icons')) - .end(); - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/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/icons')) + .end(); + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end(); - // set preserveWhitespace - config.module - .rule('vue') - .use('vue-loader') - .loader('vue-loader') - .tap(options => { - options.compilerOptions.preserveWhitespace = true; - return options; - }) - .end(); + // set preserveWhitespace + config.module + .rule('vue') + .use('vue-loader') + .loader('vue-loader') + .tap(options => { + options.compilerOptions.preserveWhitespace = true; + return options; + }) + .end(); - config - // https://webpack.js.org/configuration/devtool/#development - .when(process.env.NODE_ENV === 'development', - config => config.devtool('cheap-source-map') - ); + config + // https://webpack.js.org/configuration/devtool/#development + .when(process.env.NODE_ENV === 'development', + config => config.devtool('cheap-source-map') + ); - 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'); - } - ); - } + 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 075cdf5fd9f9b5952354472908edd66f3e55b8e8 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 4 Nov 2019 10:59:50 +0800 Subject: [PATCH 07/77] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/orderauthor/author/create.vue | 22 +++---------- src/views/orderauthor/author/detail.vue | 20 ++++-------- src/views/orderauthor/author/draft/edit.vue | 32 +++++++------------ src/views/orderauthor/author/index.vue | 19 ++++++----- src/views/publish/examRule/draft/examFrom.vue | 6 ++-- src/views/publish/runPlanTemplate/index.vue | 1 - 6 files changed, 35 insertions(+), 65 deletions(-) diff --git a/src/views/orderauthor/author/create.vue b/src/views/orderauthor/author/create.vue index 370694929..238804941 100644 --- a/src/views/orderauthor/author/create.vue +++ b/src/views/orderauthor/author/create.vue @@ -31,18 +31,19 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ea3bb8a51..545cef836 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,6 +1,9 @@ @@ -103,10 +105,12 @@ import { loginTitle } from '@/scripts/ConstDic'; import { removeToken, removeDesignToken} from '@/utils/auth'; import LangStorage from '@/utils/lang'; import { UrlConfig } from '@/router/index'; +import logoImgXty from '@/assets/logo_xty.png'; +import FloatPart from './floatPart'; export default { name: 'Login', - components: { QrcodeVue }, + components: { QrcodeVue, FloatPart }, data() { const validateUsername = (rule, value, callback) => { if (value.length < 5) { @@ -124,6 +128,7 @@ export default { }; return { bgImg: bgImg, + logoImg: logoImgXty, QCode: QCode, isAutoLogin: false, loginForm: { @@ -405,9 +410,13 @@ export default { .text-box{ position: absolute; top: 10%; - font-size: 30px; + font-size: 40px; font-weight: bold; } + .logo{ + width: 80px; + vertical-align: middle; + } .language_box{ position: absolute; top: 20px; diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue index 947c71a46..042721dee 100644 --- a/src/views/planMonitor/detail.vue +++ b/src/views/planMonitor/detail.vue @@ -156,9 +156,9 @@ export default { } else { const query = { skinCode: skinCode, mapId: this.$route.params.mapId, planId: planId, planName: planName }; if (/^\/design\/userlist/.test(this.$route.fullPath)) { - this.$router.push({ path: `${UrlConfig.plan.usertool}`, query: query }); + this.$router.push({ path: `/plan/usertool`, query: query }); } else { - this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query }); + this.$router.push({ path: `/plan/tool`, query: query }); } } }, diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue index 6eee0fad5..008f69ea0 100644 --- a/src/views/planMonitor/editTool/index.vue +++ b/src/views/planMonitor/editTool/index.vue @@ -39,12 +39,9 @@ diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue index 63fe96ec4..0fd494f35 100644 --- a/src/views/scriptManage/create.vue +++ b/src/views/scriptManage/create.vue @@ -10,7 +10,6 @@ - + From 8f8caba6a3486d122dc30a2e81a963e7fdb533d2 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 5 Nov 2019 16:45:09 +0800 Subject: [PATCH 21/77] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/news/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/news/index.vue b/src/views/news/index.vue index 03d579b7b..be1de1761 100644 --- a/src/views/news/index.vue +++ b/src/views/news/index.vue @@ -6,9 +6,9 @@