bug-5492-13

src/components/base/dk-table/dk-table-column.vue

@@ -9,8 +9,8 @@
     <template #header="{ row,column,columnIndex }">
       <!--树结构折叠展开-->
       <div v-if="treeFlag" class="seq-class">
-        <img src="@/assets/icons/展开.png" style="width: 24px;height: 24px;" @click="$emit('expandAll')"/>
-        <img src="@/assets/icons/收起.png" style="width: 24px;height: 24px;margin-left: 3px" @click="$emit('unExpandAll')"/>
+        <img src="@/assets/icons/open.png" style="width: 24px;height: 24px;" @click="$emit('expandAll')"/>
+        <img src="@/assets/icons/close.png" style="width: 24px;height: 24px;margin-left: 3px" @click="$emit('unExpandAll')"/>
       </div>
       <!--可操作添加删除表头-->
       <div v-else-if="headerOperateFlag" class="seq-class">

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

@@ -8,7 +8,16 @@ import { Clipboard } from '@antv/x6-plugin-clipboard'
 import { History } from '@antv/x6-plugin-history'
 import { Export } from '@antv/x6-plugin-export'
 import { MiniMap } from '@antv/x6-plugin-minimap'
-import { getImg } from '../../../../libs/base/x6-utils'
+import climbKiln from '@/assets/icons/climbKiln.png'
+import finishCheck from '@/assets/icons/finishCheck.png'
+import halfCheck from '@/assets/icons/halfCheck.png'
+import inKiln from '@/assets/icons/inKiln.png'
+import outKiln from '@/assets/icons/outKiln.png'
+import recover from '@/assets/icons/recover.png'
+import register from '@/assets/icons/register.png'
+import shaping from '@/assets/icons/shaping.png'
+import uninstallKiln from '@/assets/icons/uninstallKiln.png'
+import dklogo from '@/assets/images/dklogo.png'
 import router from '@/router'
 import config from '@/config'
 import { mapState, mapMutations } from 'vuex'
@@ -890,7 +899,7 @@ export default class Process {
         left.className = 'custom-html-left'
         right.className = 'custom-html-right'
         let img = document.createElement('img')
-        img.src = cell.getData().image
+        img.src = self.getCellImg(cell)
         img.width = 32
         img.height = 32
         let title = document.createElement('div')
@@ -940,7 +949,6 @@ export default class Process {
     const countImages = [
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.register)?.gradeKindDesc,
-        image: getImg('登记.png'),
         nodeKind: config.nodeKind.register,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.register)?.kindName,
         flgJobDefect: true,
@@ -953,7 +961,6 @@ export default class Process {
       },
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.climbKiln)?.gradeKindDesc,
-        image: getImg('装卸.png'),
         nodeKind: config.nodeKind.climbKiln,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.climbKiln)?.kindName,
         flgJobDefect: true,
@@ -966,7 +973,6 @@ export default class Process {
       },
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.inKiln)?.gradeKindDesc,
-        image: getImg('火炉.png'),
         nodeKind: config.nodeKind.inKiln,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.inKiln)?.kindName,
         flgJobDefect: true,
@@ -979,7 +985,6 @@ export default class Process {
       },
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.outKiln)?.gradeKindDesc,
-        image: getImg('火炉1.png'),
         nodeKind: config.nodeKind.outKiln,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.outKiln)?.kindName,
         flgJobDefect: true,
@@ -992,7 +997,6 @@ export default class Process {
       },
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.uninstallKiln)?.gradeKindDesc,
-        image: getImg('装卸1.png'),
         nodeKind: config.nodeKind.uninstallKiln,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.uninstallKiln)?.kindName,
         flgJobDefect: true,
@@ -1011,7 +1015,6 @@ export default class Process {
         data: {
           nodeName: item.label,
           nodeKind: item.nodeKind,
-          image: item.image,
           nodeKindName: item.nodeKindName,
           flgJobDefect: item.flgJobDefect,
           flowKind: item.flowKind,
@@ -1029,7 +1032,6 @@ export default class Process {
     const testImages = [
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.halfCheck)?.gradeKindDesc,
-        image: getImg('检查.png'),
         nodeKind: config.nodeKind.halfCheck,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.halfCheck)?.kindName,
         flgJobDefect: true,
@@ -1042,7 +1044,6 @@ export default class Process {
       },
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.finishCheck)?.gradeKindDesc,
-        image: getImg('检查.png'),
         nodeKind: config.nodeKind.finishCheck,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.finishCheck)?.kindName,
         flgJobDefect: true,
@@ -1061,7 +1062,6 @@ export default class Process {
         data: {
           nodeName: item.label,
           nodeKind: item.nodeKind,
-          image: item.image,
           nodeKindName: item.nodeKindName,
           flgJobDefect: item.flgJobDefect,
           flowKind: item.flowKind,
@@ -1079,7 +1079,6 @@ export default class Process {
     const specialImages = [
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.recover)?.gradeKindDesc,
-        image: getImg('回收.png'),
         nodeKind: config.nodeKind.recover,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.recover)?.kindName,
         flgJobDefect: true,
@@ -1093,7 +1092,6 @@ export default class Process {
       },
       {
         label: nodeKindList.find(it => it.kindCode == config.nodeKind.shaping)?.gradeKindDesc,
-        image: getImg('马桶.png'),
         nodeKind: config.nodeKind.shaping,
         nodeKindName: nodeKindList.find(it => it.kindCode == config.nodeKind.shaping)?.kindName,
         flgJobDefect: true,
@@ -1112,7 +1110,6 @@ export default class Process {
         data: {
           nodeName: item.label,
           nodeKind: item.nodeKind,
-          image: item.image,
           nodeKindName: item.nodeKindName,
           flgJobDefect: item.flgJobDefect,
           flowKind: item.flowKind,
@@ -1180,4 +1177,22 @@ export default class Process {
   }
 
   // endregion
+  static imgList={
+    'climbKiln':climbKiln,
+    'finishCheck':finishCheck,
+    'halfCheck':halfCheck,
+    'inKiln':inKiln,
+    'outKiln':outKiln,
+    'recover':recover,
+    'register':register,
+    'shaping':shaping,
+    'uninstallKiln':uninstallKiln,
+  }
+
+  static getCellImg(cell) {
+    let nodeKindValue=cell.getData().nodeKind
+    let nodeKindKey=Object.keys(config.nodeKind).find(key => config.nodeKind[key] === nodeKindValue);
+    // console.log('1',self.imgList[nodeKindKey])
+    return this.imgList[nodeKindKey]
+  }
 }

src/view/process/process-flow/index.vue

@@ -74,6 +74,7 @@
         <DkTableColumn field="recycledKindName" :title="$t('recycledKind')"></DkTableColumn>
         <DkTableColumn field="flgCheckLabel" type="switch"></DkTableColumn>
         <DkTableColumn field="pdtLabelKindsName" :title="$t('pdtLabelKinds')"></DkTableColumn>
+        <DkTableColumn field="flgJobDefect" type="switch"></DkTableColumn>
         <DkTableColumn field="flgScrap" type="switch" :title="$t('scrapFlg')"></DkTableColumn>
         <DkTableColumn field="cntPdtModelName" :title="$t('cntPdtModel')"></DkTableColumn>
         <DkTableColumn field="cntCarModelName" :title="$t('cntCarModel')"></DkTableColumn>

src/view/process/process-flow/process-setting.vue

@@ -209,6 +209,42 @@ export default {
       whList:[],//仓库
       leftMouseContent:'点击切换左键移动画布',
       leftMouseIcon:'md-crop',
+      //条件label样式
+      conditionLabel:{
+        markup: [
+          {
+            tagName: 'rect',
+            selector: 'labelBody',
+          },
+          {
+            tagName: 'text',
+            selector: 'labelText',
+          },
+        ],
+        attrs: {
+          labelText: {
+            fontSize:22,
+            text: '!',
+            fill: '#4169E1',
+            textAnchor: 'middle',
+            textVerticalAnchor: 'middle',
+          },
+          labelBody: {
+            ref: 'labelText',
+            refX: -8,
+            refY: -1,
+            refWidth: '100%',
+            refHeight: '100%',
+            refWidth2: 16,
+            refHeight2: 2,
+            stroke: '#4169E1',
+            fill: '#fff',
+            strokeWidth: 1,
+            rx: 6,
+            ry: 6,
+          },
+        },
+      },
     }
   },
   created() {
@@ -385,6 +421,25 @@ export default {
           it.toggleCollapse(isCollapsed)
         }
       })
+      this.resetLabels();
+    },
+
+    /**
+     * @desc   : 重写路线label样式（避免db层面修改数据，而画面上依旧有条件label样式）
+     * @author : 张潇木
+     * @date   : 2024/4/24 9:30
+     */
+    resetLabels(){
+      let allEdges=this.graph.getEdges()
+      allEdges.forEach(edge=>{
+        //设置样式
+        if(Object.keys(edge.data).length!=0&&
+          ((edge?.data?.pdtGradeIds&&edge?.data?.pdtGradeIds.length>0)||(edge?.data?.moldlineTags&&edge?.data?.moldlineTags.length>0)||edge?.data?.pdtList.length>0)){
+          edge.setLabels(this.conditionLabel)
+        }else{
+          edge.removeLabelAt(0);
+        }}
+      )
     },
 
     /**

vue.config.js

@@ -51,6 +51,14 @@ module.exports = {
       'Quill': 'quill/dist/quill.js'
     }])
 
+    config.module.rule('images').use('url-loader')
+      .loader('url-loader')
+      .options({
+         limit: 1024, //1KB以下使用base64
+         name: 'img/[name].[hash:8].[ext]'
+      })
+
+
     // svg图标
     config.module.rule('svg').exclude.add(resolve('src/components/svgs')).end()
     config.module.rule('icons').test(/\.svg$/).include.add(resolve('src/components/svgs')).end()