wyh 2 年之前
父節點
當前提交
876275a88a
共有 3 個文件被更改,包括 75 次插入32 次删除
  1. 2 0
      itdmWeb/package.json
  2. 46 20
      itdmWeb/vue.config.js
  3. 27 12
      itdmWeb/yarn.lock

+ 2 - 0
itdmWeb/package.json

@@ -18,6 +18,7 @@
     "axios": "^0.18.0",
     "caniuse-lite": "^1.0.30001492",
     "china-area-data": "^5.0.1",
+    "chosen-js": "^1.8.7",
     "clipboard": "^2.0.4",
     "codemirror": "^5.46.0",
     "cron-parser": "^2.10.0",
@@ -27,6 +28,7 @@
     "echarts": "4.9.0",
     "enquire.js": "^2.1.6",
     "font-awesome": "^4.7.0",
+    "jquery": "^3.7.0",
     "js-cookie": "^2.2.0",
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",

+ 46 - 20
itdmWeb/vue.config.js

@@ -1,12 +1,39 @@
 const path = require('path')
-const CompressionPlugin = require("compression-webpack-plugin")
+const CompressionPlugin = require('compression-webpack-plugin')
 
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
+const webpack = require('webpack')
+  // module.exports = {
+  //     configureWebpack: {
+  //         plugins: [
+  //             new webpack.ProvidePlugin({
+  //                 $: "jquery",
+  //                 jQuery: "jquery",
+  //                 "window.jQuery": "jquery",
+  //                 "window.$": "jquery",
+  //                 Popper: ["popper.js", "default"]
+  //             })
+  //         ]
+  //     }
+  // },
 
 // vue.config.js
 module.exports = {
+
+  // jquery本地化
+  configureWebpack: {
+      plugins: [
+          new webpack.ProvidePlugin({
+              $: 'jquery',
+              jQuery: 'jquery',
+              'window.jQuery': 'jquery',
+              'window.$': 'jquery',
+              Popper: ['popper.js', 'default']
+          })
+      ]
+  },
   /*
     Vue-cli3:
     Crashed when using Webpack `import()` #2463
@@ -14,8 +41,8 @@ module.exports = {
    */
   // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
-  //qiankuan打包时放开
-  //outputDir: "../dist/main",
+  // qiankuan打包时放开
+  // outputDir: "../dist/main",
   // 多入口配置
   // pages: {
   //   index: {
@@ -24,14 +51,14 @@ module.exports = {
   //     filename: 'index.html',
   //   }
   // },
-  //打包app时放开该配置
-  //publicPath:'/',
-  configureWebpack: config => {
-    //生产环境取消 console.log
-    if (process.env.NODE_ENV === 'production') {
-      config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
-    }
-  },
+  // 打包app时放开该配置
+  // publicPath:'/',
+  // configureWebpack: config => {
+  //   // 生产环境取消 console.log
+  //   if (process.env.NODE_ENV === 'production') {
+  //     config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
+  //   }
+  // },
   chainWebpack: (config) => {
     config.resolve.alias
       .set('@$', resolve('src'))
@@ -40,7 +67,7 @@ module.exports = {
       .set('@comp', resolve('src/components'))
       .set('@views', resolve('src/views'))
 
-    //生产环境,开启js\css压缩
+    // 生产环境,开启js\css压缩
     if (process.env.NODE_ENV === 'production') {
         config.plugin('compressionPlugin').use(new CompressionPlugin({
           test: /\.(js|css|less)$/, // 匹配文件名
@@ -68,7 +95,6 @@ module.exports = {
       .use()
       .loader('babel-loader')
       .end()
-
   },
 
   css: {
@@ -78,9 +104,9 @@ module.exports = {
           /* less 变量覆盖,用于自定义 ant design 主题 */
           'primary-color': '#1890FF',
           'link-color': '#1890FF',
-          'border-radius-base': '4px',
+          'border-radius-base': '4px'
         },
-        javascriptEnabled: true,
+        javascriptEnabled: true
       }
     }
   },
@@ -104,17 +130,17 @@ module.exports = {
         pathRewrite: {
           '/jeecg-boot': ''  //默认所有请求都加了jeecg-boot前缀,需要去掉
         }
-      },*/
+      }, */
       /* 注意:jeecgboot前端做了改造,此处不需要配置跨域和后台接口(只需要改.env相关配置文件即可)
-          issues/3462 很多人此处做了配置,导致刷新前端404问题,请一定注意*/
+          issues/3462 很多人此处做了配置,导致刷新前端404问题,请一定注意 */
       '/jeecg-boot': {
-        // target: 'http://192.168.1.15:8080',
         target: 'http://localhost:8080',
+        // target: 'http://localhost:8080',
         ws: false,
         changeOrigin: true
-      },
+      }
     }
   },
 
   lintOnSave: undefined
-}
+}

+ 27 - 12
itdmWeb/yarn.lock

@@ -3198,6 +3198,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001087, can
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001097.tgz"
   integrity sha512-TeuSleKt/vWXaPkLVFqGDnbweYfq4IaZ6rUugFf3rWY6dlII8StUZ8Ddin0PkADfgYZ4wRqCdO2ORl4Rn5eZIA==
 
+caniuse-lite@^1.0.30001492:
+  version "1.0.30001497"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001497.tgz#0e5387b98e7dbf9c4f743fb16e92cbf0ca780714"
+  integrity sha512-I4/duVK4wL6rAK/aKZl3HXB4g+lIZvaT4VLAn2rCgJ38jVLb0lv2Xug6QuqmxXFVRJMF74SPPWPJ/1Sdm3vCzw==
+
 case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"
@@ -3326,6 +3331,11 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chosen-js@^1.8.7:
+  version "1.8.7"
+  resolved "https://registry.yarnpkg.com/chosen-js/-/chosen-js-1.8.7.tgz#9bfa5597f5081d602ff4ae904af9aef33265bb1d"
+  integrity sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==
+
 chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
@@ -7288,6 +7298,11 @@ javascript-stringify@^1.6.0:
   resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz"
   integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=
 
+jquery@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.0.tgz#fe2c01a05da500709006d8790fe21c8a39d75612"
+  integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==
+
 js-base64@^2.1.9:
   version "2.6.3"
   resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz"
@@ -12454,15 +12469,15 @@ vuex@^3.1.0:
   resolved "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz"
   integrity sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==
 
-vxe-table-plugin-antd@1.8.10:
-  version "1.8.10"
-  resolved "https://registry.npmjs.org/vxe-table-plugin-antd/-/vxe-table-plugin-antd-1.8.10.tgz"
-  integrity sha512-XsNToY1zSmuLo/oQfSeDjnD4I03U+YYiMcBiduW8/BhZ7/eSTF4L2Rmu7cSDbLJefPwxsQKRd+jlFeF7T433Mw==
+vxe-table-plugin-antd@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/vxe-table-plugin-antd/-/vxe-table-plugin-antd-3.0.7.tgz#1e84b8b6b4caf5cf7dc338c7708763da1fd00463"
+  integrity sha512-lVBSqL8ATYWGbdKx0AH57KpVy0eOai9vUXlU4BfemlyB1ITDuurfpnk7d1Almos0oZsdT7ijPukXP/DO/DA5sA==
 
-vxe-table@2.9.13:
-  version "2.9.13"
-  resolved "https://registry.npmjs.org/vxe-table/-/vxe-table-2.9.13.tgz"
-  integrity sha512-MOaJLLJtdgVbiZX8netLqG8+daB7IbjBM9+5Ppt+seyjBrNV2C4dd8JkGpGX5zPThSzkYPGz66vo404Yu5Q/EA==
+vxe-table@^3.6.13:
+  version "3.6.13"
+  resolved "https://registry.yarnpkg.com/vxe-table/-/vxe-table-3.6.13.tgz#dd9184c725e1c833b1d1c29c29c161765f3e89e4"
+  integrity sha512-Lm4J1dH4CAHnHWO/JKPo77SCaggPTdk7RFhCNvkMWRsReBvWwTR4zBUnEwmnomhNorRVdBYETjOnsbfor7us9Q==
 
 warning@^4.0.0:
   version "4.0.3"
@@ -12865,10 +12880,10 @@ ws@^6.0.0, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-xe-utils@2.4.8:
-  version "2.4.8"
-  resolved "https://registry.npmjs.org/xe-utils/-/xe-utils-2.4.8.tgz"
-  integrity sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q==
+xe-utils@^3.5.11:
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/xe-utils/-/xe-utils-3.5.11.tgz#a2c0a78a8c48796e4784a9d9d4aa475314cc1f7c"
+  integrity sha512-lyKc/lTBga1Zb63p+FED8mtxLnYIjSS8PVJM1N64NGdCu/3d1XubaVeke2p91RHssP0ExVAl2LUqZYperoz76Q==
 
 xregexp@^4.2.4:
   version "4.3.0"