Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -32,6 +32,7 @@
               <el-button type="primary" icon="edit" @click="pd_gxclhconClick" class="bt">工序产量核查</el-button>
               <el-button type="primary" icon="edit" @click="pd_lcdlistonClick" class="bt">流程单查询</el-button>
 
+
             </el-form-item>
           </el-form>
 
@@ -241,14 +242,13 @@
             </div>
           </el-dialog>
 
-
         </div>
       </layout-header>
 
       <layout>
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
-            <el-tree :data="treeData" :props="defaultProps" :current-node-key="currentNodeKey" @node-click="handleNodeClick"></el-tree>
+            <el-tree :data="treeData" :props="defaultProps" class="treecolor"  :current-node-key="currentNodeKey" @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
         <layout-content>
@@ -691,20 +691,31 @@ const tableData = ref([]);
 const _machine = ref(null);
 const treeType = ref('customTree') // dataTree // 计划中，排产中 ,dataTree 车间
 const handleNodeClick = async (node) => {
-  // console.log(node)
-  // console.log(node['$treeNodeId'])
+  // 取消所有节点的颜色
+  const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
+  allNodes.forEach(node => {
+    node.querySelector('.el-tree-node__label').style.color = '';
+  });
+  // 获取点击的节点
+  const clickedNodeId = node['$treeNodeId'];
+  console.log(clickedNodeId);
+  const clickedNode = document.querySelector(`.treecolor .el-tree-node[data-key="${clickedNodeId}"]`);
+  if (clickedNode) {
+    console.log(clickedNode);
+    // 给当前点击的节点改变颜色
+    clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
+  }
+
   if (node.type && node.type === '__customer') {
     treeType.value = 'customTree'
     schandleNodeClick(node)
   } else if (!node.children) {
     treeType.value = 'dataTree'
-    const custom_code = node.label;
     // 使用字符串分割获取#前面的数据
-    const dataBeforeHash = custom_code.split('#')[0].trim();
-    _machine.value = dataBeforeHash + '#';
-    console.log('机台' + _machine.value)
+    _machine.value = node.label.split('#')[0].trim() + '#';
+    console.log('机台-------' + _machine.value)
     const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
-    console.log(zhubiao)
+    // console.log(zhubiao)
     chejianData.value = zhubiao.data['排程'];
     chejianfuData.value = zhubiao.data['制程'];
   }
@@ -1611,10 +1622,7 @@ const rowContextMenu = (row) => {
 :deep(.hui-plan-usage-low div) {
   color: #8c939d !important;
 }
-/*点击车间机台*/
-:deep(.el-background-color) {
-  color: red !important;
-}
+
 /*工序状态更正颜色【蓝色】*/
 :deep(.lan-plan-usage-low div) {
   color: blue !important;

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -133,39 +133,11 @@
                   <el-input v-model="yycpzlformData['fangan']" />
                 </el-form-item>
               </el-form-item>
-
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: right;margin-left: 25%">
               <el-button @click="yycpzlhandleCancel">放弃</el-button>
               <el-button type="primary" @click="yycpzlhandleConfirm">执行</el-button>
             </div>
-
-<!--            <el-table ref="multipleTable"-->
-<!--                      :show-overflow-tooltip="true"-->
-<!--                      :row-style="{ height: '0px' }"-->
-<!--                      :cell-style="{ padding: '0px' }"-->
-<!--                      :header-row-style="{ height: '0px' }"-->
-<!--                      :header-cell-style="{ padding: '0px' }"-->
-<!--                      @row-click="yyzltableRowClick"-->
-<!--                      highlight-current-row="true"-->
-<!--                      style="width: 100%;height: 30vh;" border tooltip-effect="dark"-->
-<!--                      :data="yyzltableData" row-key="ID">-->
-<!--              <el-table-column align="left" label="工单编号" width="100">-->
-<!--                <template v-slot="{ row }"><span>{{ row.工单编号 }}</span></template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column align="left" label="客户编号" width="100">-->
-<!--                <template v-slot="{ row }"><span>{{ row.客户编号 }}</span></template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column align="left" label="客户名称" width="120">-->
-<!--                <template v-slot="{ row }"><span>{{ row.客户名称 }}</span></template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column align="left" label="产品编号" width="100">-->
-<!--                <template v-slot="{ row }"><span>{{ row.产品编号 }}</span></template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column align="left" label="产品名称">-->
-<!--                <template v-slot="{ row }"><span>{{ row.产品名称 }}</span></template>-->
-<!--              </el-table-column>-->
-<!--            </el-table>-->
           </el-dialog>
 
           <el-dialog v-model="openFangan" title="请选择方案" style="width: 300px;" destroy-on-close>
@@ -437,6 +409,7 @@
           <div class="JKWTree-tree" style="height: 200px">
             <h3>工单管理</h3>
             <el-tree :data="treeData.data"  @node-click="handleNodeClick"></el-tree>
+<!--            <el-tree :data="treeData.data" class="treecolor"  @node-click="handleNodeClick"></el-tree>-->
           </div>
         </layout-sider>
 
@@ -2902,6 +2875,21 @@ DataListdata();
 const tableData = reactive([])
 const _Gd_khdh = ref(null)
 const handleNodeClick = async (node) => {
+  // // 取消所有节点的颜色
+  // const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
+  // allNodes.forEach(node => {
+  //   node.querySelector('.el-tree-node__label').style.color = '';
+  // });
+  // // 获取点击的节点
+  // const clickedNodeId = node['$treeNodeId'];
+  // console.log(clickedNodeId);
+  // const clickedNode = document.querySelector(`.treecolor .el-tree-node[data-key="${clickedNodeId}"]`);
+  // if (clickedNode) {
+  //   console.log(clickedNode);
+  //   // 给当前点击的节点改变颜色
+  //   clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
+  // }
+
   searchInfo.value = '';
   gytableData.value = [];
   yjtableData.value = [];