lph преди 1 година
родител
ревизия
2cafe5d411
променени са 3 файла, в които са добавени 94 реда и са изтрити 175 реда
  1. 0 3
      zkqy-ui/babel.config.js
  2. 0 58
      zkqy-ui/src/views/system/bpmnPro/data/index.js
  3. 94 114
      zkqy-ui/vue.config.js

+ 0 - 3
zkqy-ui/babel.config.js

@@ -10,7 +10,4 @@ module.exports = {
       'plugins': ['dynamic-import-node']
     }
   },
-  plugins: [
-    ["@babel/plugin-proposal-optional-chaining"]  //解析 可选链式语法
-  ]
 }

+ 0 - 58
zkqy-ui/src/views/system/bpmnPro/data/index.js

@@ -56,62 +56,4 @@ export const formList = [
     formName: "产品报废处理",
   },
 ]
-export const formList = [
-  {
-    formKey: "AssignEmployees",
-    formName: "分配班组",
-  },
-  {
-    formKey: "NodeShow",
-    formName: "节点展示",
-  },
-  {
-    formKey: "Notes",
-    formName: "物料备注",
-  },
-  {
-    formKey: "ProductionProcesses",
-    formName: "工序:领料",
-  },
-  {
-    formKey: "PersonalDistribution",
-    formName: "工序:检验",
-  },
-  {
-    formKey: "RecordQuality",
-    formName: "记录质控卡",
-  },
-  {
-    formKey: "GY06",
-    formName: "节点回退",
-  },
-  {
-    formKey: "Print",
-    formName: "打印交接单",
-  },
-  {
-    formKey: "KB01",
-    formName: "不需表单",
-  },
-  {
-    formKey: "EditFinishTime",
-    formName: "编辑完成时间",
-  },
-  {
-    formKey: "FinishTask",
-    formName: "完成任务",
-  },
-  {
-    formKey: "QualityControlCardSubCardProcessing",
-    formName: "质控卡分卡处理",
-  },
-  {
-    formKey: "EditQualityCard ",
-    formName: "质控卡修改",
-  },
-  {
-    formKey: "ScrapDisposition",
-    formName: "产品报废处理",
-  },
 
-]

+ 94 - 114
zkqy-ui/vue.config.js

@@ -66,132 +66,112 @@ module.exports = {
         }
       },
     },
-    '/DB': {
-      target: `http://62.234.61.92:8099`,
-      changeOrigin: true,
-      pathRewrite: {
-        ['^' + '/DB']: ''
-      }
-    },
-    '/FORM': {
-      target: `http://62.234.61.92:8088`,
-      changeOrigin: true,
-      pathRewrite: {
-        ['^' + '/FORM']: ''
-      }
-    },
-    '/BPM': {
-      target: `http://62.234.61.92:8055`,
-      changeOrigin: true,
-      pathRewrite: {
-        ['^' + '/BPM']: ''
-      }
-    },
+    disableHostCheck: true
   },
-  disableHostCheck: true
-},
   css: {
-  loaderOptions: {
-    sass: {
-      sassOptions: { outputStyle: "expanded" }
-    },
-    less: {
-      modifyVars: {
-        "primary-color": "#13c2c2",
+    loaderOptions: {
+      sass: {
+        sassOptions: { outputStyle: "expanded" }
+      },
+      less: {
+        modifyVars: {
+          "primary-color": "#13c2c2",
           // "primary-color": "#9867f7",
           "layout-color": "#9867f7"
-        // "layout-color": "#ee88aa"
-      },
-      javascriptEnabled: true
+          // "layout-color": "#ee88aa"
+        },
+        javascriptEnabled: true
+      }
     }
-  }
-},
-configureWebpack: {
-  name: name,
+  },
+  configureWebpack: {
+    name: name,
     resolve: {
-    alias: {
-      '@': resolve('src'),
+      alias: {
+        '@': resolve('src'),
         '@packages': resolve('src/views/system/bpmnPro/components'),
-          '@utils': resolve('src/utils/bpmn')
-    }
-  },
-  plugins: [
-    // http://doc.zkqy.vip/zkqy-vue/other/faq.html#使用gzip解压缩静态文件
-    new CompressionPlugin({
-      cache: false,                   // 不启用文件缓存
-      test: /\.(js|css|html)?$/i,     // 压缩文件格式
-      filename: '[path].gz[query]',   // 压缩后的文件名
-      algorithm: 'gzip',              // 使用gzip压缩
-      minRatio: 0.8,                   // 压缩率小于1才会压缩
+        '@utils': resolve('src/utils/bpmn')
+      }
+    },
+    plugins: [
+      // http://doc.zkqy.vip/zkqy-vue/other/faq.html#使用gzip解压缩静态文件
+      new CompressionPlugin({
+        cache: false,                   // 不启用文件缓存
+        test: /\.(js|css|html)?$/i,     // 压缩文件格式
+        filename: '[path].gz[query]',   // 压缩后的文件名
+        algorithm: 'gzip',              // 使用gzip压缩
+        minRatio: 0.8,                   // 压缩率小于1才会压缩
 
-    }),
-    new MonacoWebpackPlugin()
-  ],
+      }),
+      new MonacoWebpackPlugin()
+    ],
     // devtool: isDev ? "source-map" : false
   },
-chainWebpack(config) {
-  config.plugins.delete('preload') // TODO: need test
-  config.plugins.delete('prefetch') // TODO: need test
+  chainWebpack(config) {
+    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('icons')
-    .test(/\.svg$/)
-    .include.add(resolve('src/assets/icons'))
-    .end()
-    .use('svg-sprite-loader')
-    .loader('svg-sprite-loader')
-    .options({
-      symbolId: 'icon-[name]'
-    })
-    .end()
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/assets/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/assets/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
 
-  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
+      .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'),
-        {
-          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-          to: './' //到根目录下
-        }
+            })
+          config.optimization.runtimeChunk('single'),
+          {
+            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+            to: './' //到根目录下
+          }
 
-      }
-    )
-}
+        }
+      )
+  }
 }
+
+