Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
3 weeks ago · 5701e2338c
parent 243549edfe 0e27c2dc10
commit 5701e2338c
6 changed files with 37 additions and 19 deletions
--- a/public/config.js
+++ b/public/config.js
@ -2,9 +2,15 @@ window.LOAD_Remind = 86400000
 window.TIMED_Trigger=86400000
 window.YINGDU_Trigger=3000 //硬度检测 轮巡时间

-window.PROCESS_FLOW_CARD_HEAT_METER="http://192.168.169.172:9000/jmreport/view/1154214123878776832"//工艺流程卡地址 热表公用
+window.PROCESS_FLOW_CARD_HEAT_METER="http://192.168.169.172:9000/jmreport/view/1179931264832327680"//工艺流程卡地址 热表公用
+
+window.PROCESS_FLOW_CARD_HEAT_SINTER="http://192.168.169.172:9000/jmreport/view/1179931277666897920"//工艺流程卡地址 烧结
+
+// 车间订单  标签打印  ?wold=20215636716975144988num=12
+window.PROCESS_FLOW_CARD_PRINT="http://192.168.169.172:9000/jmreport/view/11963457061889843202"
+// 车间订单 配套单打印  192.168.169.172:9000/jmreport/view/1196345720432840704?yold=2021505360038002689
+window.PROCESS_FLOW_CARD_PRINT_SUPPORT="http://192.168.169.172:9000/jmreport/view/11963457061889843202"

-window.PROCESS_FLOW_CARD_HEAT_SINTER="http://192.168.169.172:9000/jmreport/view/1154632438942031872"//工艺流程卡地址 烧结

 window.SCHEDULING_DASHBOARD = "http://192.168.169.172:8088/SCHEDULING_DASHBOARD"  //排产看板地址
 window.SCHEDULING_EXCEPTION = "http://192.168.169.172:8088/SCHEDULING_EXCEPTION"  //排产异常地址
@ -14,6 +20,9 @@ window.PROCESS_QUALITY_RECORD = "http://192.168.169.172:9000/jmreport/view/11531

 window.WARE_MATERIAL_STOCK = "http://192.168.169.172:9000/jmreport/view/1186917825215324160"  //仓管-库存汇总-存料登记卡打印

+
+
+
 // 配套单打印 /jmreport/view/1188705683594706944?yoId=2008439579960193026
 window.COMPANION = "http://192.168.169.172:9000/jmreport/view/1188705683594706944"

--- a/src/views/processManagement/components/assignDaialog.vue
+++ b/src/views/processManagement/components/assignDaialog.vue
@ -55,7 +55,7 @@ export default {
            type: 'select',
            filterable:true,
            clearable: true,
-            dicUrl: '/blade-system/user/page?current=1&&size=99999',
+            dicUrl: '/blade-system/user/list-process-engineer',
            props: {
              label: 'realName',
              value: 'id',
--- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
+++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
@ -691,6 +691,7 @@ export default {
            search: false,
            sortable: true,
            overHidden: true,
+            cell: true,
          },
          {
            label: '面积(d㎡)',
@ -698,13 +699,13 @@ export default {
            search: false,
            sortable: true,
            overHidden: true,
-            cell: true,
+            cell: false,
          },

          {
            label: '总面积',
            prop: 'totalArea',
-            cell: true,
+            cell: false,
            search: false,
            sortable: true,
            overHidden: true,
--- a/src/views/processManagement/sinTer/index.vue
+++ b/src/views/processManagement/sinTer/index.vue
@ -237,15 +237,18 @@ export default {
            symbol: 'roundRect',
            itemStyle: {
              color: '#284c89',
+              borderWidth: 2,
+              borderColor: '#fff',
+              borderRadius: 4, // 圆角半径，值越大圆角越明显
            },
            // 动态计算节点大小：宽度=最长文本宽度，高度=行数*行高+内边距
-            symbolSize: params => {
+            symbolSize: (val, params) => {
              // 容错：params为空/无name时给默认值
              const nodeName = params?.name || '未知节点';
              const childCount = params?.children?.length || 0;
              const childText = `${childCount}个子件`;
              // 计算文本宽度
-              const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 20;
+              const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 30;
              return [Math.max(textWidth, 100), 60]; // 高度设为60px（适配两行文本）
            },

@ -258,9 +261,11 @@ export default {
              lineHeight: 20,
              color: '#fff',
              formatter: params => {
-                const childText =params.data.quota>=0?`${params.data.quota}个`:''
+                const childText = params.data.quota >= 0 ? `${params.data.quota}个` : '';
                // 去掉模板字符串缩进，用\n换行，避免多余空白
-                return `${params.name}${childText ? '\n' + childText : ''}`;
+                return `${params.data.partCode}\n${params.name}${
+                  childText ? '\n' + childText : ''
+                }`;
              },
            },
          },
--- a/src/views/productionManagement/productionMonitoring/index.vue
+++ b/src/views/productionManagement/productionMonitoring/index.vue
@ -341,6 +341,7 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
+            searchOrder:19,
          },
          {
            label: '批次号',
@ -349,6 +350,7 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
+            searchOrder:18,
          },
          {
            label: '流程卡号',
@ -357,6 +359,7 @@ export default {
            sortable: true,
            overHidden: true,
            width: 150,
+            searchOrder:20,
          },
          {
            label: '产品型号',
--- a/src/views/qualityManagement/similarParts/index.vue
+++ b/src/views/qualityManagement/similarParts/index.vue
@ -40,7 +40,7 @@
      :isShow="isShowImport"
      templateUrl="/blade-desk/dsSimilarParts/import-template"
      templateName="相似零件导入模板.xls"
-      importUrl="/blade-desk//dsSimilarParts/import-excel-simple"
+      importUrl="/blade-desk/dsSimilarParts/import-excel-simple"
      @closeDialog="closeDialog"
    ></basic-import>
  </basic-container>
@ -131,17 +131,17 @@ export default {
        column: [
          {
            label: '零件',
-            prop: 'partOne',
+            prop: 'partOneCode',
            search: true,
            sortable: true,
            span: 24,
-            type: 'select',
-            filterable: true,
-            dicUrl: '/blade-desk/dsPart/getPartList',
-            props: {
-              label: 'partCode',
-              value: 'id',
-            },
+            // type: 'select',
+            // filterable: true,
+            // dicUrl: '/blade-desk/dsPart/getPartList',
+            // props: {
+            //   label: 'partCode',
+            //   value: 'id',
+            // },
            rules: [
              {
                required: true,
@ -155,7 +155,7 @@ export default {
          },
          {
            label: '相似零件',
-            prop: 'partTwo',
+            prop: 'partTwoCode',
            search: true,
            sortable: true,
            span: 24,