Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-ui/.env.production

@@ -7,12 +7,9 @@ ENV = 'production'
 #管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
 
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
 #数据擎模块IP
 VUE_APP_BASE_API2 = 'http://62.234.61.92:8099/'
 #表单引擎模块IP
 VUE_APP_BASE_API3 = 'http://62.234.61.92:8088/'
 #流程引擎模块IP
-VUE_APP_BASE_API4 = 'http://62.234.61.92:8055/'
+VUE_APP_BASE_API4 = 'http://62.234.61.92:8055/'

zkqy-ui/babel.config.js

@@ -9,5 +9,5 @@ module.exports = {
       // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
       'plugins': ['dynamic-import-node']
     }
-  }
+  },
 }

zkqy-ui/src/components/updateModule/bpmn-js/lib/features/context-pad/ContextPadProvider.js

@@ -31,10 +31,10 @@ import {
  * A provider for BPMN 2.0 elements context pad
  */
 export default function ContextPadProvider(
-    config, injector, eventBus,
-    contextPad, modeling, elementFactory,
-    connect, create, popupMenu,
-    canvas, rules, translate) {
+  config, injector, eventBus,
+  contextPad, modeling, elementFactory,
+  connect, create, popupMenu,
+  canvas, rules, translate) {
 
   config = config || {};
 
@@ -56,9 +56,9 @@ export default function ContextPadProvider(
     this._autoPlace = injector.get('autoPlace', false);
   }
 
-  eventBus.on('create.end', 250, function(event) {
+  eventBus.on('create.end', 250, function (event) {
     var context = event.context,
-        shape = context.shape;
+      shape = context.shape;
 
     if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
       return;
@@ -87,7 +87,7 @@ ContextPadProvider.$inject = [
   'translate'
 ];
 
-ContextPadProvider.prototype.getMultiElementContextPadEntries = function(elements) {
+ContextPadProvider.prototype.getMultiElementContextPadEntries = function (elements) {
   var modeling = this._modeling;
 
   var actions = {};
@@ -99,7 +99,7 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
         className: 'bpmn-icon-trash',
         title: this._translate('Remove'),
         action: {
-          click: function(event, elements) {
+          click: function (event, elements) {
             modeling.removeElements(elements.slice());
           }
         }
@@ -114,14 +114,14 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
  * @param {djs.model.Base[]} elements
  * @return {boolean}
  */
-ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
+ContextPadProvider.prototype._isDeleteAllowed = function (elements) {
 
   var baseAllowed = this._rules.allowed('elements.delete', {
     elements: elements
   });
 
   if (isArray(baseAllowed)) {
-    return every(baseAllowed, function(element) {
+    return every(baseAllowed, function (element) {
       return includes(baseAllowed, element);
     });
   }
@@ -129,18 +129,18 @@ ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
   return baseAllowed;
 };
 
-ContextPadProvider.prototype.getContextPadEntries = function(element) {
+ContextPadProvider.prototype.getContextPadEntries = function (element) {
   var contextPad = this._contextPad,
-      modeling = this._modeling,
+    modeling = this._modeling,
 
-      elementFactory = this._elementFactory,
-      connect = this._connect,
-      create = this._create,
-      popupMenu = this._popupMenu,
-      canvas = this._canvas,
-      rules = this._rules,
-      autoPlace = this._autoPlace,
-      translate = this._translate;
+    elementFactory = this._elementFactory,
+    connect = this._connect,
+    create = this._create,
+    popupMenu = this._popupMenu,
+    canvas = this._canvas,
+    rules = this._rules,
+    autoPlace = this._autoPlace,
+    translate = this._translate;
 
   var actions = {};
 
@@ -155,7 +155,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   function removeElement(e, element) {
-    modeling.removeElements([ element ]);
+    modeling.removeElements([element]);
   }
 
   function getReplaceMenuPosition(element) {
@@ -163,10 +163,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     var Y_OFFSET = 5;
 
     var diagramContainer = canvas.getContainer(),
-        pad = contextPad.getPad(element).html;
+      pad = contextPad.getPad(element).html;
 
     var diagramRect = diagramContainer.getBoundingClientRect(),
-        padRect = pad.getBoundingClientRect();
+      padRect = pad.getBoundingClientRect();
 
     var top = padRect.top - diagramRect.top;
     var left = padRect.left - diagramRect.left;
@@ -206,7 +206,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     }
 
 
-    var append = autoPlace ? function(event, element) {
+    var append = autoPlace ? function (event, element) {
       var shape = elementFactory.createShape(assign({ type: type }, options));
 
       autoPlace.append(element, shape);
@@ -226,7 +226,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
 
   function splitLaneHandler(count) {
 
-    return function(event, element) {
+    return function (event, element) {
 
       // actual split
       modeling.splitLane(element, count);
@@ -238,7 +238,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
 
-  if (isAny(businessObject, [ 'bpmn:Lane', 'bpmn:Participant' ]) && isExpanded(element)) {
+  if (isAny(businessObject, ['bpmn:Lane', 'bpmn:Participant']) && isExpanded(element)) {
 
     var childLanes = getChildLanes(element);
 
@@ -248,7 +248,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-lane-insert-above',
         title: translate('Add Lane above'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
             modeling.addLane(element, 'top');
           }
         }
@@ -290,7 +290,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-lane-insert-below',
         title: translate('Add Lane below'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
             modeling.addLane(element, 'bottom');
           }
         }
@@ -336,10 +336,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       });
     } else
 
-    if (isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')) {
+      if (isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')) {
 
-      assign(actions, {
-        'append.compensation-activity':
+        assign(actions, {
+          'append.compensation-activity':
             appendAction(
               'bpmn:Task',
               'bpmn-icon-task',
@@ -348,37 +348,37 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
                 isForCompensation: true
               }
             )
-      });
-    } else
-
-    if (!is(businessObject, 'bpmn:EndEvent') &&
-        !businessObject.isForCompensation &&
-        !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
-        !isEventSubProcess(businessObject)) {
-
-      assign(actions, {
-        'append.end-event': appendAction(
-          'bpmn:EndEvent',
-          'bpmn-icon-end-event-none',
-          translate('Append EndEvent')
-        ),
-        'append.gateway': appendAction(
-          'bpmn:ExclusiveGateway',
-          'bpmn-icon-gateway-none',
-          translate('Append Gateway')
-        ),
-        'append.append-task': appendAction(
-          'bpmn:Task',
-          'bpmn-icon-task',
-          translate('Append Task')
-        ),
-        'append.intermediate-event': appendAction(
-          'bpmn:IntermediateThrowEvent',
-          'bpmn-icon-intermediate-event-none',
-          translate('Append Intermediate/Boundary Event')
-        )
-      });
-    }
+        });
+      } else
+
+        if (!is(businessObject, 'bpmn:EndEvent') &&
+          !businessObject.isForCompensation &&
+          !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
+          !isEventSubProcess(businessObject)) {
+
+          assign(actions, {
+            'append.end-event': appendAction(
+              'bpmn:EndEvent',
+              'bpmn-icon-end-event-none',
+              translate('Append EndEvent')
+            ),
+            // 'append.gateway': appendAction(
+            //   'bpmn:ExclusiveGateway',
+            //   'bpmn-icon-gateway-none',
+            //   translate('Append Gateway')
+            // ),
+            // 'append.append-task': appendAction(
+            //   'bpmn:Task',
+            //   'bpmn-icon-task',
+            //   translate('Append Task')
+            // ),
+            // 'append.intermediate-event': appendAction(
+            //   'bpmn:IntermediateThrowEvent',
+            //   'bpmn-icon-intermediate-event-none',
+            //   translate('Append Intermediate/Boundary Event')
+            // )
+          });
+        }
   }
 
   if (!popupMenu.isEmpty(element, 'bpmn-replace')) {
@@ -390,7 +390,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-screw-wrench',
         title: translate('Change type'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
 
             var position = assign(getReplaceMenuPosition(element), {
               cursor: { x: event.x, y: event.y }
@@ -431,10 +431,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-connection-multi',
         title: translate(
           'Connect using ' +
-            (businessObject.isForCompensation
-              ? ''
-              : 'Sequence/MessageFlow or ') +
-            'Association'
+          (businessObject.isForCompensation
+            ? ''
+            : 'Sequence/MessageFlow or ') +
+          'Association'
         ),
         action: {
           click: startConnect,
@@ -458,7 +458,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     });
   }
 
-  if (isAny(businessObject, [ 'bpmn:DataObjectReference', 'bpmn:DataStoreReference' ])) {
+  if (isAny(businessObject, ['bpmn:DataObjectReference', 'bpmn:DataStoreReference'])) {
     assign(actions, {
       'connect': {
         group: 'connect',
@@ -479,7 +479,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   // delete element entry, only show if allowed by rules
-  var deleteAllowed = rules.allowed('elements.delete', { elements: [ element ] });
+  var deleteAllowed = rules.allowed('elements.delete', { elements: [element] });
 
   if (isArray(deleteAllowed)) {
 
@@ -512,7 +512,7 @@ function isEventType(eventBo, type, definition) {
   var isDefinition = false;
 
   var definitions = eventBo.eventDefinitions || [];
-  forEach(definitions, function(def) {
+  forEach(definitions, function (def) {
     if (def.$type === definition) {
       isDefinition = true;
     }

zkqy-ui/src/main.js

@@ -1,23 +1,23 @@
 import Vue from 'vue'
 import { useAntd } from 'k-form-design/packages/core/useComponents'
 import KFormDesign from 'k-form-design/packages/use.js'
-// import 'k-form-design/lib/k-form-design.css'
-require('k-form-design/lib/k-form-design.css')
+import 'k-form-design/lib/k-form-design.css'
+// require('k-form-design/lib/k-form-design.css')
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
-// import './assets/styles/element-variables.scss'
-require('./assets/styles/element-variables.scss')
+import './assets/styles/element-variables.scss'
+// require('./assets/styles/element-variables.scss')
 
 // 以下为bpmn工作流绘图工具的样式
-// import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
-// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
-// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
-// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
-require('bpmn-js/dist/assets/diagram-js.css')  // 左边工具栏以及编辑节点的样式
-require('bpmn-js/dist/assets/bpmn-font/css/bpmn.css')
-require('bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css')
-require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
+import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+// require('bpmn-js/dist/assets/diagram-js.css')  // 左边工具栏以及编辑节点的样式
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn.css')
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css')
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
 // import 'bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css'
 // 左边工具栏以及编辑节点的样式
 // import 'bpmn-js-properties-panel/dist/assets/properties-panel.css'
@@ -25,8 +25,8 @@ require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
 
 // bpmnPro start
 import { vuePlugin } from "@packages/highlight";
-// import "highlight.js/styles/atom-one-dark-reasonable.css";
-require("highlight.js/styles/atom-one-dark-reasonable.css");
+import "highlight.js/styles/atom-one-dark-reasonable.css";
+// require("highlight.js/styles/atom-one-dark-reasonable.css");
 Vue.use(vuePlugin);
 
 import Common from "@packages/common";
@@ -35,16 +35,16 @@ Vue.use(Common);
 import ResetPopover from "@utils/resetPopover";
 Vue.directive("r-popover", ResetPopover);
 
-// import "@packages/theme/index.scss";
-require("@packages/theme/index.scss");
+import "@packages/theme/index.scss";
+// require("@packages/theme/index.scss");
 
 // bpmnPro end
 
 
-// import '@/assets/styles/index.scss' // global css
-// import '@/assets/styles/zkqy.scss' // zkqy css
-require('@/assets/styles/index.scss')  // global css
-require('@/assets/styles/zkqy.scss')  // zkqy css
+import '@/assets/styles/index.scss' // global css
+import '@/assets/styles/zkqy.scss' // zkqy css
+// require('@/assets/styles/index.scss')  // global css
+// require('@/assets/styles/zkqy.scss')  // zkqy css
 import App from './App'
 import store from './store'
 
@@ -53,10 +53,10 @@ import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 
-// import './assets/icons' // icon
-// import './permission' // permission control
-require('./assets/icons')  // icon
-require('./permission')  // permission control
+import './assets/icons' // icon
+import './permission' // permission control
+// require('./assets/icons')  // icon
+// require('./permission')  // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/zkqy";

zkqy-ui/src/router/index.js

@@ -191,8 +191,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        // component: () => import('@/views/system/data/index'),
-        component: (resolve) => require(['@/views/system/data/index'], resolve),
+        component: () => import('@/views/system/data/index'),
+        // component: (resolve) => require(['@/views/system/data/index'], resolve),
         name: 'AuthRole',
         meta: { title: '数据源配置', activeMenu: '/system/data' }
       }
@@ -206,8 +206,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        // component: () => import('@/views/system/user/authRole'),
-        component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+        component: () => import('@/views/system/user/authRole'),
+        // component: (resolve) => require(['@/views/system/user/authRole'], resolve),
         name: 'AuthRole',
         meta: { title: '分配角色', activeMenu: '/system/user' }
       }
@@ -221,8 +221,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'fromModel/:index',
-        // component: () => import('@/views/system/fromModel/index'),
-        component: (resolve) => require(['@/views/system/fromModel/index'], require),
+        component: () => import('@/views/system/fromModel/index'),
+        // component: (resolve) => require(['@/views/system/fromModel/index'], resolve),
         name: 'fromModel',
         meta: { title: '表单建模', activeMenu: '/system/fromModel/index' }
       },
@@ -243,8 +243,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'user/:roleId(\\d+)',
-        // component: () => import('@/views/system/role/authUser'),
-        component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+        component: () => import('@/views/system/role/authUser'),
+        // component: (resolve) => require(['@/views/system/role/authUser'], resolve),
         name: 'AuthUser',
         meta: { title: '分配用户', activeMenu: '/system/role' }
       }
@@ -258,8 +258,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:dictId(\\d+)',
-        // component: () => import('@/views/system/dict/data'),
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
+        component: () => import('@/views/system/dict/data'),
+        // component: (resolve) => require(['@/views/system/dict/data'], resolve),
         name: 'Data',
         meta: { title: '字典数据', activeMenu: '/system/dict' }
       }
@@ -274,8 +274,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:dictId(\\d+)',
-        // component: () => import('@/views/system/tenant/dict/data'),
-        component: (resolve) => require(['@/views/system/tenant/dict/data'], resolve),
+        component: () => import('@/views/system/tenant/dict/data'),
+        // component: (resolve) => require(['@/views/system/tenant/dict/data'], resolve),
         name: 'TenantData',
         meta: { title: '字典数据', activeMenu: '/system/tenant/dict' }
       }
@@ -290,8 +290,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:jobId(\\d+)',
-        // component: () => import('@/views/monitor/job/log'),
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+        component: () => import('@/views/monitor/job/log'),
+        // component: (resolve) => require(['@/views/monitor/job/log'], resolve),
         name: 'JobLog',
         meta: { title: '调度日志', activeMenu: '/monitor/job' }
       }
@@ -305,7 +305,9 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+        component: () => import('@/views/tool/gen/editTable'),
+
+        // component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
         name: 'GenEdit',
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }

zkqy-ui/src/store/modules/permission.js

@@ -127,8 +127,8 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    // return () => import(`@/views/${view}`)
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return () => import(`@/views/${view}`)
+    // return (resolve) => require([`@/views/${view}`], resolve)
   }
 }
 

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

@@ -35,10 +35,10 @@ export const formList = [
     formKey: "KB01",
     formName: "不需表单",
   },
-  {
-    formKey: "EditFinishTime",
-    formName: "编辑完成时间",
-  },
+  // {
+  //   formKey: "EditFinishTime",
+  //   formName: "编辑完成时间",
+  // },
   {
     formKey: "FinishTask",
     formName: "完成任务",
@@ -47,13 +47,13 @@ export const formList = [
     formKey: "QualityControlCardSubCardProcessing",
     formName: "质控卡分卡处理",
   },
-  {
-    formKey: "EditQualityCard ",
-    formName: "质控卡修改",
-  },
+  // {
+  //   formKey: "EditQualityCard ",
+  //   formName: "质控卡修改",
+  // },
   {
     formKey: "ScrapDisposition",
     formName: "产品报废处理",
   },
-  
 ]
+

zkqy-ui/src/views/system/tenant/index.vue

@@ -664,6 +664,7 @@ export default {
             });
           }
         }
+        this.reset();
       });
     },
     /** 提交按钮 */

zkqy-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.110.59:8080`,
+        // target: `http://192.168.110.76:8080`,
         target: `http://62.234.61.92:8080`,
         changeOrigin: true,
         pathRewrite: {
@@ -173,3 +173,5 @@ module.exports = {
       )
   }
 }
+
+