diff --git a/.env.development b/.env.development index f264639..c4d1aa9 100644 --- a/.env.development +++ b/.env.development @@ -4,6 +4,6 @@ ENV = 'development' # base api VUE_APP_BASE_API = '/dashboard' -VUE_APP_BASE_API2 = 'http://192.168.0.108:9027' +VUE_APP_BASE_API2 = 'http://192.168.0.110:9027' BASE_API = 'http://10.10.3.35:9070' diff --git a/.env.production b/.env.production index 7db257e..c40cab6 100644 --- a/.env.production +++ b/.env.production @@ -4,3 +4,5 @@ ENV = 'production' # base api VUE_APP_BASE_API = '/dashboard' BASE_API = 'http://47.116.52.164:10002' + +VUE_APP_BASE_API2 = 'http://39.101.188.84:9027' diff --git a/src/views/privateOrder/security/components/componentRight.vue b/src/views/privateOrder/security/components/componentRight.vue index 318e790..397718d 100644 --- a/src/views/privateOrder/security/components/componentRight.vue +++ b/src/views/privateOrder/security/components/componentRight.vue @@ -30,7 +30,9 @@ {{ notificationFinishList[3].completionCount }} /{{ notificationFinishList[3].notificationCount }} -
{{ notificationFinishList[3].completionPercent | numFilter }}%
+
+ {{ notificationFinishList[3].completionPercent | numFilter }}% +
@@ -49,7 +51,9 @@
{{ item.notificationCount }}
{{ item.completionCount }}
-
{{ item.completionPercent | numFilter }}%
+
+ {{ item.completionPercent | numFilter }}% +
@@ -214,10 +218,10 @@ class="file-content" >
- - +
-
--> +
@@ -555,8 +559,9 @@ export default { e.target.dataset.url.lastIndexOf(".") + 1 ); if (this.fileExtension == "pdf") { - this.pdfUrl = process.env.VUE_APP_BASE_API2 + e.target.dataset.url; - this.dialogDetails = true; + // this.pdfUrl = process.env.VUE_APP_BASE_API2 + e.target.dataset.url; + this.getNumPages(process.env.VUE_APP_BASE_API2 + e.target.dataset.url); + // this.dialogDetails = true; } else if ( this.fileExtension === "docx" || this.fileExtension === "doc" diff --git a/vue.config.js b/vue.config.js index 02b1e4c..a5df024 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,20 +1,20 @@ -'use strict' -const path = require('path') -const defaultSettings = require('./src/settings.js') -const webpack = require('webpack') +"use strict"; +const path = require("path"); +const defaultSettings = require("./src/settings.js"); +const webpack = require("webpack"); function resolve(dir) { - return path.join(__dirname, dir) + return path.join(__dirname, dir); } -const name = defaultSettings.title || '太仓市网络综合治理平台' // page title +const name = defaultSettings.title || "太仓市网络综合治理平台"; // page title // If your port is set to 80, // use administrator privileges to execute the command line. // For example, Mac: sudo npm run // You can change the port by the following methods: // port = 9528 npm run dev OR npm run dev --port = 9528 -const port = process.env.port || process.env.npm_config_port || 9109 // dev port +const port = process.env.port || process.env.npm_config_port || 9109; // dev port // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = { @@ -26,10 +26,10 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ // publicPath: './', - publicPath: '/demo/taicangzongzhi2', - outputDir: 'dist', - assetsDir: 'static', - lintOnSave: process.env.NODE_ENV === 'development', + publicPath: "/demo/taicangzongzhi", + outputDir: "dist", + assetsDir: "static", + lintOnSave: process.env.NODE_ENV === "development", productionSourceMap: false, // css 相关选项 css: { @@ -37,19 +37,19 @@ module.exports = { loaderOptions: { // sass 必须没有分号 scss必须有分号 scss: { - prependData: '@import "@/styles/variables.scss";' - } + prependData: '@import "@/styles/variables.scss";', + }, }, - sourceMap: true + sourceMap: true, }, devServer: { - host: '0.0.0.0', + host: "0.0.0.0", disableHostCheck: true, port: port, open: false, overlay: { warnings: false, - errors: true + errors: true, }, proxy: { [process.env.VUE_APP_BASE_API]: { @@ -57,18 +57,18 @@ module.exports = { ws: false, changeOrigin: true, pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } + ["^" + process.env.VUE_APP_BASE_API]: "", + }, }, - '/fileApi': { - target: 'http://39.101.188.84:9027', // 这是本地地址 http://47.116.52.164:10002/sitefiles/wxb/ + "/fileApi": { + target: "http://39.101.188.84:9027", // 这是本地地址 http://47.116.52.164:10002/sitefiles/wxb/ ws: false, changeOrigin: true, pathRewrite: { - ['^' + '/fileApi']: '' - } - } - } + ["^" + "/fileApi"]: "", + }, + }, + }, }, configureWebpack: { // provide the app's title in webpack's name field, so that @@ -76,94 +76,94 @@ module.exports = { name: name, resolve: { alias: { - '@': resolve('src') + "@": resolve("src"), }, - modules: [path.resolve('node_modules'), 'node_modules'] + modules: [path.resolve("node_modules"), "node_modules"], }, plugins: [ new webpack.ProvidePlugin({ - jQuery: 'jquery', - $: 'jquery' - }) + jQuery: "jquery", + $: "jquery", + }), ], externals: { - AMap: 'AMap' // 高德地图配置 - } + AMap: "AMap", // 高德地图配置 + }, }, chainWebpack(config) { // it can improve the speed of the first screen, it is recommended to turn on preload - config.plugin('preload').tap(() => [ + config.plugin("preload").tap(() => [ { - rel: 'preload', + rel: "preload", // to ignore runtime.js // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171 fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/], - include: 'initial' - } - ]) + include: "initial", + }, + ]); // when there are many pages, it will cause too many meaningless requests - config.plugins.delete('prefetch') + config.plugins.delete("prefetch"); // set svg-sprite-loader - config.module.rule('svg').exclude.add(resolve('src/icons')).end() + config.module.rule("svg").exclude.add(resolve("src/icons")).end(); config.module - .rule('icons') + .rule("icons") .test(/\.svg$/) - .include.add(resolve('src/icons')) + .include.add(resolve("src/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.when(process.env.NODE_ENV !== "development", (config) => { config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [ + .plugin("ScriptExtHtmlWebpackPlugin") + .after("html") + .use("script-ext-html-webpack-plugin", [ { // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - } + inline: /runtime\..*\.js$/, + }, ]) - .end() + .end(); config.optimization.splitChunks({ - chunks: 'all', + chunks: "all", cacheGroups: { libs: { - name: 'chunk-libs', + name: "chunk-libs", test: /[\\/]node_modules[\\/]/, priority: 10, - chunks: 'initial' // only package third parties that are initially dependent + chunks: "initial", // only package third parties that are initially dependent }, elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package + 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 + test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm }, commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules + name: "chunk-commons", + test: resolve("src/components"), // can customize your rules minChunks: 3, // minimum common number priority: 5, - reuseExistingChunk: true - } - } - }) + reuseExistingChunk: true, + }, + }, + }); // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk - config.optimization.runtimeChunk('single') - }) + config.optimization.runtimeChunk("single"); + }); config.module - .rule('swf') + .rule("swf") .test(/\.swf$/) - .use('url-loader') - .loader('url-loader') + .use("url-loader") + .loader("url-loader") .options({ - limit: 10000 - }) - } -} + limit: 10000, + }); + }, +};