Browse Source

修改工序描述取值

sh4wmoo 2 years ago
parent
commit
b4a20aa028

+ 2 - 7
src/components/business/process/node-modal/node-modal.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div" ref="node-modal-div" v-if="existsFlag">
     <DkModal
-      title="工艺节点"
+      :title="'工艺节点 - '+nodeData.nodeKindName"
       v-model="modalDisplay"
       :mask-closable="false"
       :mask="false"
@@ -18,12 +18,7 @@
         <DkFormItem prop="nodeName" :required="true">
           <InputPop v-model="nodeData.nodeName" ref="nodeName"/>
         </DkFormItem>
-        <!--    节点种类    -->
-        <DkFormItem prop="nodeKind" :required="true">
-          <SelectPop ref="nodeKind" v-model="nodeData.nodeKind" label-key="kindName" value-key="kindCode"
-                     :multiple="false" disabled :options="nodeKindList"/>
-          <!--          <InputPop v-model="nodeData.nodeKind" ref="nodeName" :readonly="true"/>-->
-        </DkFormItem>
+
         <!--    流程类型  工艺节点-计件&&节点流程-结束,报损标识不可用(否)。其他可用) -->
         <DkFormItem prop="flowKind" :required="true">
           <SelectPop ref="flowKind" v-model="nodeData.flowKind" label-key="kindName" value-key="kindCode"

+ 34 - 9
src/config/index.js

@@ -1872,15 +1872,40 @@ export default {
     finishCheck: '工艺节点-成检',
     recover: '工艺节点-回收',
     shaping: '工艺节点-成型',
-    registerName: '标准计件',
-    climbKilnName: '装窑车',
-    inKilnName: '窑车入窑',
-    outKilnName: '窑车出窑',
-    uninstallKilnName: '卸窑车',
-    halfCheckName: '半成品检验',
-    finishCheckName: '成品检验',
-    recoverName: '废品回收',
-    shapingName: '成型绑码',
+  },
+
+  /**
+   * @desc   : 工序类别名称
+   * @author : 张潇木
+   * @date   : 2023/5/24 10:12
+   */
+  nodeKindName:{
+    register: '标准计件',
+    climbKiln: '装窑车',
+    inKiln: '窑车入窑',
+    outKiln: '窑车出窑',
+    uninstallKiln: '卸窑车',
+    halfCheck: '半成品检验',
+    finishCheck: '成品检验',
+    recover: '废品回收',
+    shaping: '成型绑码',
+  },
+
+  /**
+   * @desc   : 工序类别描述
+   * @author : 张潇木
+   * @date   : 2023/5/24 10:12
+   */
+  nodeKindDesc:{
+    register: '计件',
+    climbKiln: '登窑',
+    inKiln: '入窑',
+    outKiln: '出窑',
+    uninstallKiln: '卸窑',
+    halfCheck: '半检',
+    finishCheck: '成检',
+    recover: '回收',
+    shaping: '成型',
   },
 
   /**

+ 18 - 18
src/view/process/process-flow/config/ProcessConfig.js

@@ -904,34 +904,34 @@ export default class Process {
       //region 计件模型
       const countImages = [
         {
-          label: '计件',
+          label: config.nodeKindDesc.register,
           image:getImg('登记.png'),
           nodeKind:config.nodeKind.register,
-          nodeKindName:config.nodeKind.registerName
+          nodeKindName:config.nodeKindName.register
         },
         {
-          label: '登窑',
+          label: config.nodeKindDesc.climbKiln,
           image:getImg('装卸.png'),
           nodeKind:config.nodeKind.climbKiln,
-          nodeKindName:config.nodeKind.climbKilnName
+          nodeKindName:config.nodeKindName.climbKiln
         },
         {
-          label: '入窑',
+          label: config.nodeKindDesc.inKiln,
           image:getImg('火炉.png'),
           nodeKind:config.nodeKind.inKiln,
-          nodeKindName:config.nodeKind.inKilnName
+          nodeKindName:config.nodeKindName.inKiln
         },
         {
-          label: '出窑',
+          label: config.nodeKindDesc.outKiln,
           image:getImg('火炉.png'),
           nodeKind:config.nodeKind.outKiln,
-          nodeKindName:config.nodeKind.outKilnName
+          nodeKindName:config.nodeKindName.outKiln
         },
         {
-          label: '卸窑',
+          label: config.nodeKindDesc.uninstallKiln,
           image:getImg('装卸.png'),
           nodeKind:config.nodeKind.uninstallKiln,
-          nodeKindName:config.nodeKind.uninstallKilnName
+          nodeKindName:config.nodeKindName.uninstallKiln
         },
       ]
       const countNodes = countImages.map((item) =>
@@ -951,16 +951,16 @@ export default class Process {
       //region 检验模型
       const testImages = [
           {
-            label: '半检',
+            label: config.nodeKindDesc.halfCheck,
             image:getImg('检查.png'),
             nodeKind:config.nodeKind.halfCheck,
-            nodeKindName:config.nodeKind.halfCheckName
+            nodeKindName:config.nodeKindName.halfCheck
           },
           {
-            label: '成检',
+            label: config.nodeKindDesc.finishCheck,
             image:getImg('检查.png'),
             nodeKind:config.nodeKind.finishCheck,
-            nodeKindName:config.nodeKind.finishCheckName
+            nodeKindName:config.nodeKindName.finishCheck
           },
         ]
       const testNodes = testImages.map((item) =>
@@ -980,16 +980,16 @@ export default class Process {
       //region 特殊模型
       const specialImages = [
         {
-          label: '回收',
+          label: config.nodeKindDesc.recover,
           image:getImg('回收.png'),
           nodeKind:config.nodeKind.recover,
-          nodeKindName:config.nodeKind.recoverName
+          nodeKindName:config.nodeKindName.recover
         },
         {
-          label: '成型',
+          label: config.nodeKindDesc.shaping,
           image:getImg('马桶.png'),
           nodeKind:config.nodeKind.shaping,
-          nodeKindName:config.nodeKind.shapingName
+          nodeKindName:config.nodeKindName.shaping
         },
       ]
       const specialNodes = specialImages.map((item) =>

+ 0 - 2
src/view/process/process-flow/process-setting.vue

@@ -176,8 +176,6 @@ export default {
     this.graph = Process.init(this.$refs.container)
     //监听删除节点
     this.bindDeleteNodes()
-    // this.graph.zoomToFit({ maxScale: 1 });// 将画布中元素缩小或者放大一定级别,让画布正好容纳所有元素,可以通过 maxScale 配置最大缩放级别
-    // this.graph.centerContent(); // 将画布中元素居中展示
   },
   computed: {
     ...mapState(['process']),