diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue index 2c1d577..e1944e2 100644 --- a/src/components/TableModel/index.vue +++ b/src/components/TableModel/index.vue @@ -1,303 +1,305 @@ diff --git a/src/views/base/edgeInsert/components/form-insert-all.vue b/src/views/base/edgeInsert/components/form-insert-all.vue index c2715dc..5f90654 100644 --- a/src/views/base/edgeInsert/components/form-insert-all.vue +++ b/src/views/base/edgeInsert/components/form-insert-all.vue @@ -1,357 +1,370 @@ diff --git a/src/views/base/edgeInsert/index.vue b/src/views/base/edgeInsert/index.vue index 9c3536e..20c56a1 100644 --- a/src/views/base/edgeInsert/index.vue +++ b/src/views/base/edgeInsert/index.vue @@ -10,10 +10,14 @@ @transIdList="getIdList" > - - + @@ -93,84 +94,78 @@ - - + - + diff --git a/src/views/base/warnAlert/config.js b/src/views/base/warnAlert/config.js index aefe169..ab8487b 100644 --- a/src/views/base/warnAlert/config.js +++ b/src/views/base/warnAlert/config.js @@ -1,35 +1,40 @@ -import { - queryDeviceTypeApi - } from '@/api/base/device' - - export const queryDeviceTypes = () => { - queryDeviceTypeApi({'dictType':'dev_type'}).then(res => { - formLabel[1].f_selList = res.data.map(item => { +import { queryDeviceTypeApi } from "@/api/base/device"; + +export const queryDeviceTypes = () => { + queryDeviceTypeApi({ dictType: "dev_type" }) + .then((res) => { + formLabel[1].f_selList = res.data.map((item) => { return { label: item.dictLabel, - value: item.dictCode - } - }) - }).catch(err => {}) - } + value: item.dictCode, + }; + }); + }) + .catch((err) => {}); +}; export const formLabel = [ - { f_label: '设备名称', f_model: 'devName', f_type: 'ipt' }, - { f_label: '设备类型', f_model: 'devType', f_type: 'sel',f_selList: [] }, - { f_label: '预警日期', f_model: 'time', f_type: 'dateRange' , dateType:['startTime','endTime']}, -] + { f_label: "设备名称", f_model: "devName", f_type: "ipt" }, + { f_label: "设备类型", f_model: "devType", f_type: "sel", f_selList: [] }, + { + f_label: "预警日期", + f_model: "time", + f_type: "dateRange", + dateType: ["startTime", "endTime"], + }, +]; export const columnsList = [ - { t_props: 'devTypeName', t_label: '预警设备类型' }, - { t_props: 'devName', t_label: '预警设备名称', }, - { t_props: 'devCode', t_label: '预警设备编号', }, - { t_props: 'warnName', t_label: '预警内容', t_slot: 'warnName' }, - { t_props: 'jcTime', t_label: '预警时间', }, - { t_props: 'status', t_label: '状态', }, - { t_props: 'remarks', t_label: '预警处置',t_slot: 'remarks'}, -] + { t_props: "devTypeName", t_label: "预警设备类型" }, + { t_props: "devName", t_label: "预警设备名称" }, + { t_props: "devCode", t_label: "预警设备编号" }, + { t_props: "warnName", t_label: "预警内容", t_slot: "warnName" }, + { t_props: "jcTime", t_label: "预警时间" }, + { t_props: "status", t_label: "状态" }, + { t_props: "remarks", t_label: "预警处置", t_slot: "remarks" }, +]; export const dialogConfig = { - outerWidth: '40%', - outerTitle: '', - outerVisible: false, + outerWidth: "40%", + outerTitle: "", + outerVisible: false, }; diff --git a/src/views/base/warnAlert/index.vue b/src/views/base/warnAlert/index.vue index 80623b9..f136269 100644 --- a/src/views/base/warnAlert/index.vue +++ b/src/views/base/warnAlert/index.vue @@ -8,77 +8,72 @@ :request-api="queryWarnAlertListApi" ref="tableRef" > - - - + - diff --git a/vue.config.js b/vue.config.js index cf54ba3..2d5e433 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,15 +1,15 @@ -'use strict' -const path = require('path') +"use strict"; +const path = require("path"); function resolve(dir) { - return path.join(__dirname, dir) + return path.join(__dirname, dir); } -const CompressionPlugin = require('compression-webpack-plugin') +const CompressionPlugin = require("compression-webpack-plugin"); -const name = process.env.VUE_APP_TITLE || '博诺思管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || "博诺思管理系统"; // 网页标题 -const port = process.env.port || process.env.npm_config_port || 80 // 端口 +const port = process.env.port || process.env.npm_config_port || 80; // 端口 // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -20,119 +20,118 @@ module.exports = { // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。 publicPath: process.env.NODE_ENV === "production" ? "/" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', + outputDir: "dist", // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', + assetsDir: "static", // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', + lintOnSave: process.env.NODE_ENV === "development", // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 productionSourceMap: false, // webpack-dev-server 相关配置 devServer: { - host: '0.0.0.0', + 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://localhost:18080`, + target: `http://192.168.2.12:18080`, changeOrigin: true, pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } + ["^" + process.env.VUE_APP_BASE_API]: "", + }, }, - "/api" : { - "target" : "http://192.168.0.21:17861", + "/api": { + target: "192.168.2.12:18080", //设置允许跨域——此处我经过测试发现可有可无 - "changeOrigin" : true, - "pathRewrite" : { - "^/api" : "" - } + changeOrigin: true, + pathRewrite: { + "^/api": "", + }, }, }, - disableHostCheck: true + disableHostCheck: true, }, css: { loaderOptions: { sass: { - sassOptions: { outputStyle: "expanded" } - } - } + sassOptions: { outputStyle: "expanded" }, + }, + }, }, configureWebpack: { name: name, resolve: { alias: { - '@': resolve('src') - } + "@": resolve("src"), + }, }, plugins: [ // http://doc.bonus.vip/bonus-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 // 压缩后删除原文件 - }) + 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 + 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('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') + .rule("icons") .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) + .include.add(resolve("src/assets/icons")) .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') + .use("svg-sprite-loader") + .loader("svg-sprite-loader") .options({ - symbolId: 'icon-[name]' + symbolId: "icon-[name]", }) - .end() + .end(); - config.when(process.env.NODE_ENV !== 'development', config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ + 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() + 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.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"); + }); + }, +};