JY05

src/view/performance/chejianbaogong.vue

@@ -834,7 +834,7 @@
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
 		      <el-aside width="180px" style="margin: 0;">
-		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
+		        <div class="JKWTree-tree" style="height: 55vh; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="huanxingtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="huanxingNodeClick"></el-tree>
 		        </div>
@@ -900,7 +900,7 @@
 		          </el-table>
 		        </el-tab-pane>
 		      
-		        <el-tab-pane label="附加检验记录"  @click="showTable('附加检验记录')"  name="second">
+		        <el-tab-pane label="当前设备换型记录"  @click="showTable('当前设备换型记录')"  name="second">
 		          <el-table
 		            tooltip-effect="dark"
 		            :data="fujiaselectData"
@@ -912,23 +912,111 @@
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
-				    <el-table-column
-				      v-slot="scope"
-				      label="不检测" 
-				      width="75"
-				    >
-				       <el-checkbox v-model="scope.row.notjc"></el-checkbox>
-				    </el-table-column>
 		            <el-table-column
-		              prop="缺陷备注"
-		              label="缺陷及记录"
-		              width="720"
+		              prop="日期"
+		              label="日期"
+		              width="100"
 		            />
 		            <el-table-column
-		              prop="编号"
-		              label="编号"
+		              prop="机台编号"
+		              label="机台编号"
 		              width="80"
 		            />
+					<el-table-column
+					  prop="班组"
+					  label="班组"
+					  width="70"
+					/>
+					<el-table-column
+					  prop="工单编号A"
+					  label="工单编号A"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="印件名称A"
+					  label="印件名称A"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="印件工序A"
+					  label="印件工序A"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="码包号A"
+					  label="码包号A"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="工单编号B"
+					  label="工单编号B"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="印件名称B"
+					  label="印件名称B"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="印件工序B"
+					  label="印件工序B"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="码包号B"
+					  label="码包号B"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="清场项目A"
+					  label="菲林_标样_签样品_留样品"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="清场项目B"
+					  label="版材_纸张_电化铝_油墨"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="清场项目C"
+					  label="过版纸_废品_次品"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="清场项目D"
+					  label="半成品_成品_零头"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="清场项目E"
+					  label="操作台桌面_抽屉_地面"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="机长"
+					  label="机长"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="班长"
+					  label="带班长"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="质量巡查员"
+					  label="质量巡查员"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="创建时间"
+					  label="创建时间"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="UNIQID"
+					  label="UNIQID"
+					  width="80"
+					/>
 		          </el-table>
 		        </el-tab-pane>
 		      </el-tabs>
@@ -1607,6 +1695,7 @@ let checked3=ref(false)
 const detailData = reactive([])
 const treeData=ref([])
 const huanxingtreeData=ref([])
+const huanxingstatus=ref(false)
 const zhichengtreeData=ref([{
 	label: '首件与过程确认'
 },{
@@ -1664,6 +1753,15 @@ const ent = (event,id1,id2,id3) => {
   }
 }
 
+const huanxingNodeClick = (node) => {
+  //存放当前节点的nodeId
+  if(node.machine){
+	  huanxingstatus.value=true
+	  console.log(node)
+  }else{
+	  console.log('2')
+  }
+}
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
   if(nodeData.level === 1){
@@ -2038,7 +2136,7 @@ const RemodelGetTab = async() => {
 		  if(response.data[key][0]){
 			  let children =[]
 			  for (let i = 0; i < response.data[key].length; i++) {
-				  children.push({label:response.data[key][i]})
+				  children.push({label:response.data[key][i],machine:key})
 			  }
 			  arr.push({
 				  label:key,
@@ -2256,7 +2354,7 @@ const GetMachineMac = async () => {
 	xmlhttp.open("get", "http://127.0.0.1:8090/init")
 	// 5. 发送
 	xmlhttp.send();
-  const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
+  const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
   console.log(response);
   if (response.code === 0) {
     // 将接口返回的数据添加到树型结构中