From dc3f36181c09dcced8226f1b43fbbaa614df1c6b Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Mon, 27 Dec 2021 09:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/utils.js | 152 ++++++++++++++++++------------------ config/index.js | 2 +- src/assets/css/electron.css | 5 ++ 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/build/utils.js b/build/utils.js index 4125875..07c06bc 100644 --- a/build/utils.js +++ b/build/utils.js @@ -4,99 +4,101 @@ const config = require('../config') const ExtractTextPlugin = require('extract-text-webpack-plugin') const packageConfig = require('../package.json') -exports.assetsPath = function (_path) { - const assetsSubDirectory = process.env.NODE_ENV === 'production' - ? config.build.assetsSubDirectory - : config.dev.assetsSubDirectory +exports.assetsPath = function(_path) { + const assetsSubDirectory = process.env.NODE_ENV === 'production' ? + config.build.assetsSubDirectory : + config.dev.assetsSubDirectory - return path.posix.join(assetsSubDirectory, _path) + return path.posix.join(assetsSubDirectory, _path) } -exports.cssLoaders = function (options) { - options = options || {} +exports.cssLoaders = function(options) { + options = options || {} - const cssLoader = { - loader: 'css-loader', - options: { - sourceMap: options.sourceMap - } - } + const cssLoader = { + loader: 'css-loader', + options: { + sourceMap: options.sourceMap + } + } - const postcssLoader = { - loader: 'postcss-loader', - options: { - sourceMap: options.sourceMap - } - } + const postcssLoader = { + loader: 'postcss-loader', + options: { + sourceMap: options.sourceMap + } + } - // generate loader string to be used with extract text plugin - function generateLoaders (loader, loaderOptions) { - const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader] + // generate loader string to be used with extract text plugin + function generateLoaders(loader, loaderOptions) { + const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader] - if (loader) { - loaders.push({ - loader: loader + '-loader', - options: Object.assign({}, loaderOptions, { - sourceMap: options.sourceMap - }) - }) - } + if (loader) { + loaders.push({ + loader: loader + '-loader', + options: Object.assign({}, loaderOptions, { + sourceMap: options.sourceMap + }) + }) + } - // Extract CSS when that option is specified - // (which is the case during production build) - if (options.extract) { - return ExtractTextPlugin.extract({ - use: loaders, - publicPath:'../../', - fallback: 'vue-style-loader' - }) - } else { - return ['vue-style-loader'].concat(loaders) - } - } + // Extract CSS when that option is specified + // (which is the case during production build) + if (options.extract) { + return ExtractTextPlugin.extract({ + use: loaders, + publicPath:'../', + fallback: 'vue-style-loader' + }) + } else { + return ['vue-style-loader'].concat(loaders) + } + } - // https://vue-loader.vuejs.org/en/configurations/extract-css.html - return { - css: generateLoaders(), - postcss: generateLoaders(), - less: generateLoaders('less'), - sass: generateLoaders('sass', { indentedSyntax: true }), - scss: generateLoaders('sass'), - stylus: generateLoaders('stylus'), - styl: generateLoaders('stylus') - } + // https://vue-loader.vuejs.org/en/configurations/extract-css.html + return { + css: generateLoaders(), + postcss: generateLoaders(), + less: generateLoaders('less'), + sass: generateLoaders('sass', { + indentedSyntax: true + }), + scss: generateLoaders('sass'), + stylus: generateLoaders('stylus'), + styl: generateLoaders('stylus') + } } // Generate loaders for standalone style files (outside of .vue) -exports.styleLoaders = function (options) { - const output = [] - const loaders = exports.cssLoaders(options) +exports.styleLoaders = function(options) { + const output = [] + const loaders = exports.cssLoaders(options) - for (const extension in loaders) { - const loader = loaders[extension] - output.push({ - test: new RegExp('\\.' + extension + '$'), - use: loader - }) - } + for (const extension in loaders) { + const loader = loaders[extension] + output.push({ + test: new RegExp('\\.' + extension + '$'), + use: loader + }) + } - return output + return output } exports.createNotifierCallback = () => { - const notifier = require('node-notifier') + const notifier = require('node-notifier') - return (severity, errors) => { - if (severity !== 'error') return + return (severity, errors) => { + if (severity !== 'error') return - const error = errors[0] - const filename = error.file && error.file.split('!').pop() + const error = errors[0] + const filename = error.file && error.file.split('!').pop() - notifier.notify({ - title: packageConfig.name, - message: severity + ': ' + error.name, - subtitle: filename || '', - icon: path.join(__dirname, 'logo.png') - }) - } + notifier.notify({ + title: packageConfig.name, + message: severity + ': ' + error.name, + subtitle: filename || '', + icon: path.join(__dirname, 'logo.png') + }) + } } diff --git a/config/index.js b/config/index.js index 0cf1b24..1f0f155 100644 --- a/config/index.js +++ b/config/index.js @@ -9,7 +9,7 @@ module.exports = { // Paths assetsSubDirectory: 'static', - assetsPublicPath: './', + assetsPublicPath: '/', proxyTable: {}, // Various Dev Server settings diff --git a/src/assets/css/electron.css b/src/assets/css/electron.css index 6240462..a3445f6 100644 --- a/src/assets/css/electron.css +++ b/src/assets/css/electron.css @@ -393,6 +393,11 @@ img { padding: 48px 40px; display: flex; flex-wrap: wrap; + overflow: hidden; + overflow-y: scroll; +} +.attendance-right::-webkit-scrollbar{ + display: none; } .attendance-left-item-box {display: flex;align-items: center;font-size: 24px;color: #FFE68F;width: 100%;height: 76px;padding: 0 10px;} .attendance-active {background-color: #6348b0;}