lex 2 лет назад
Родитель
Сommit
b21f78e809

+ 3 - 3
src/views/process/list/create.vue

@@ -177,11 +177,11 @@ export default {
         }
       });
     },
-    getAllOrgan() {
+    async getAllOrgan() {
       // 获取分部
       console.log(this.tenantId, "tenantId");
       if (this.userType.indexOf("SYSTEM") != -1) {
-        queryAllOrgan({ tenantId: this.tenantId }).then((res) => {
+        await queryAllOrgan({ tenantId: this.tenantId }).then((res) => {
           if (res.code == 200) {
             const result = res.data;
             const filterOrganId = [
@@ -198,7 +198,7 @@ export default {
           }
         });
       } else {
-        queryTeacherOrgan({ tenantId: this.tenantId }).then((res) => {
+        await queryTeacherOrgan({ tenantId: this.tenantId }).then((res) => {
           if (res.code == 200) {
             const result = res.data;
             const filterOrganId = [

+ 93 - 100
vue.config.js

@@ -1,22 +1,22 @@
-'use strict'
-const path = require('path')
-const defaultSettings = require('./src/settings.js')
+"use strict";
+const path = require("path");
+const defaultSettings = require("./src/settings.js");
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+  return path.join(__dirname, dir);
 }
 
-const name = defaultSettings.title || 'ferry' // page title
+const name = defaultSettings.title || "ferry"; // 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 method:
 // port = 9527 npm run dev OR npm run dev --port = 9527
-const port = process.env.port || process.env.npm_config_port || 9527 // dev port
+const port = process.env.port || process.env.npm_config_port || 9527; // dev port
 
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
-const target = 'https://mantest.dayaedu.com'
+const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
+const target = "https://manonline.dayaedu.com";
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**
@@ -26,9 +26,9 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/',
-  outputDir: 'web',
-  assetsDir: 'static/web',
+  publicPath: "/",
+  outputDir: "web",
+  assetsDir: "static/web",
   lintOnSave: false, // process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {
@@ -36,7 +36,7 @@ module.exports = {
     open: true,
     overlay: {
       warnings: false,
-      errors: true
+      errors: true,
     },
     proxy: {
       // change xxx-api/login => mock/login
@@ -47,141 +47,134 @@ module.exports = {
       // http://47.114.176.40:8000
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
-      '/api-auth': {
+      "/api-auth": {
         target: target,
         // target : target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-auth': ''
-        }
+          "^api-auth": "",
+        },
       },
-      '/api-task': {
+      "/api-task": {
         target: target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-task': ''
-        }
+          "^api-task": "",
+        },
       },
-      '/api-oa': {
+      "/api-oa": {
         target: target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-task': ''
-        }
+          "^api-task": "",
+        },
       },
-      '/api-web': {
+      "/api-web": {
         target: target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-web': ''
-        }
+          "^api-web": "",
+        },
       },
-      '/api-cms': {
+      "/api-cms": {
         target: target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-cms': ''
-        }
+          "^api-cms": "",
+        },
       },
-      '/api-teacher': {
+      "/api-teacher": {
         target: target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-teacher': ''
-        }
+          "^api-teacher": "",
+        },
       },
-      '/jiari': {
-        target: 'http://tool.bitefu.net',
-        changeOrigin: true
+      "/jiari": {
+        target: "http://tool.bitefu.net",
+        changeOrigin: true,
       },
     },
   },
   configureWebpack: {
-    plugins: [
-      new MonacoWebpackPlugin()
-    ],
+    plugins: [new MonacoWebpackPlugin()],
     name: name,
     resolve: {
       alias: {
-        '@': resolve('src')
-      }
-    }
+        "@": resolve("src"),
+      },
+    },
   },
   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/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();
 
     // set preserveWhitespace
     config.module
-      .rule('vue')
-      .use('vue-loader')
-      .loader('vue-loader')
-      .tap(options => {
-        options.compilerOptions.preserveWhitespace = true
-        return options
+      .rule("vue")
+      .use("vue-loader")
+      .loader("vue-loader")
+      .tap((options) => {
+        options.compilerOptions.preserveWhitespace = true;
+        return options;
       })
-      .end()
+      .end();
 
     config
       // https://webpack.js.org/configuration/devtool/#development
-      .when(process.env.NODE_ENV === 'development',
-        config => config.devtool('cheap-source-map')
-      )
+      .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', [{
+    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')
-        }
-      )
-  }
-}
+            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");
+    });
+  },
+};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/index.html


+ 0 - 0
web/static/web/js/app.e3af0a14.js → web/static/web/js/app.c67b652c.js


+ 0 - 0
web/static/web/js/chunk-03d0b210.1852d787.js → web/static/web/js/chunk-03d0b210.abde99e7.js


+ 0 - 0
web/static/web/js/chunk-2fb5ed3e.5e26de87.js → web/static/web/js/chunk-2fb5ed3e.52916bce.js


+ 0 - 0
web/static/web/js/chunk-5bbf57e0.4384e41a.js → web/static/web/js/chunk-5bbf57e0.39073c2d.js


+ 0 - 0
web/static/web/js/chunk-634f4dba.60fa4a81.js → web/static/web/js/chunk-634f4dba.984f88fb.js


+ 0 - 0
web/static/web/js/chunk-642b99a0.d5a8c54f.js → web/static/web/js/chunk-642b99a0.3316687c.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/static/web/js/chunk-b3049fb0.98612501.js


+ 0 - 0
web/static/web/js/chunk-e352499e.e9ee0a98.js → web/static/web/js/chunk-e352499e.900cf011.js


+ 0 - 0
web/static/web/js/chunk-libs.f3a71ad9.js → web/static/web/js/chunk-libs.2d470597.js


Некоторые файлы не были показаны из-за большого количества измененных файлов