liuhairui 1 年之前
父節點
當前提交
84253444a8
共有 2 個文件被更改,包括 21 次插入9 次删除
  1. 7 6
      src/view/DecisionSupport/operation/operation.vue
  2. 14 3
      src/view/DecisionSupport/outputsum/index.vue

+ 7 - 6
src/view/DecisionSupport/operation/operation.vue

@@ -44,7 +44,7 @@
                         @row-dblclick="updateCompanyFunc"
                         @selection-change="handleSelectionChange"
                         :show-overflow-tooltip="true">
-                <el-table-column align="left" label="设备编号"   prop="设备编号"  width="81" />
+                <el-table-column align="left" label="设备编号"   prop="设备编号"  width="110" />
                 <el-table-column align="left" sortable label="设备名称"   prop="设备名称"  width="280" />
                 <el-table-column align="left" sortable label="产量"   prop="产量" width="110" />
                 <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时" width="150" />
@@ -80,16 +80,17 @@
                           @selection-change="selectionChange($event, '印件资料')"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jqtabledata" row-key="ID">
                   <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" sortable label="设备编号" prop="设备编号"  width="100"/>
+                  <el-table-column align="left" sortable label="设备编号" prop="设备编号"  width="110"/>
                   <el-table-column align="left" sortable label="设备名称" prop="设备名称"  width="340"/>
-                  <el-table-column align="left" sortable label="日期" prop="日期"  width="100"/>
+                  <el-table-column align="left" sortable label="日期" prop="日期"  width="110"/>
+				  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="110"/>
                   <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="340"/>
                   <el-table-column align="left" sortable label="工序名称" prop="工序名称"  width="110"/>
                   <el-table-column align="left" sortable label="产量" prop="产量"  width="110"/>
-                  <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时"  width="110"/>
+                  <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时"  width="140"/>
                   <el-table-column align="left" sortable label="保养工时" prop="保养工时"  width="110"/>
-                  <el-table-column align="left" sortable label="打样总工时" prop="打样总工时"  width="120"/>
-                  <el-table-column align="left" sortable label="打样补产工时" prop="打样补产工时"  width="110"/>
+                  <el-table-column align="left" sortable label="打样总工时" prop="打样总工时"  width="140"/>
+                  <el-table-column align="left" sortable label="打样补产工时" prop="打样补产工时"  width="140"/>
                   <el-table-column align="left" sortable label="装板补产工时" prop="装板补产工时"  width="160"/>
                   <el-table-column align="left" sortable label="异常停机工时" prop="异常停机工时"  width="160"/>
                   <el-table-column align="left" sortable label="墨色数" prop="墨色数"  width="160"/>

+ 14 - 3
src/view/DecisionSupport/outputsum/index.vue

@@ -1476,8 +1476,12 @@ const DataListdata = async () => {
     obj.label = item.date;
     obj.children = [];
     item.sbbh.forEach((child) => {
-        obj.children.push({label: child});
+        obj.children.push({
+            label: child,
+            parentDate: item.date // 添加上级日期并避免重复
+        });
     });
+	console.log(obj)
     treeData.value.push(obj);
 });
   } catch (error) {
@@ -1526,12 +1530,16 @@ const handleNodeClick = async (node) => {
     // 给当前点击的节点改变颜色
     clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
   }
+    console.log(node)
+	
   tabledate2.value=[]
   if(node.children !==undefined ){
-    params.value.mouth= node.label
+	  params.value.mouth= node.parentDate
+    // params.value.mouth= node.label
   }
  if (node.children === undefined){
    params.value.sist = node.label
+   params.value.mouth= node.parentDate
     ProductList(params.value)
  }
   // _WorkList_page(); 
@@ -2301,7 +2309,10 @@ const _getSH = async () => {
     const map = {};
     // 构建树形结构
     data.forEach(item => {
-      map[item.sys_bh] = { ...item, children: [], label: `${item.sys_bh}---${item.sys_mc}---${item.sys_rate0}---${item.sys_rate1}` };
+      map[item.sys_bh] = {
+		  ...item, children: [],
+		   label: `${item.sys_bh}---${item.sys_mc}---${item.sys_rate0}---${item.sys_rate1}`
+	   };
     });
     data.forEach(item => {
       if (item.sys_bh.length === 3) {