设备运行跟踪弹出，非二级选中

src/api/jixiaoguanli/baogong.js

@@ -35,6 +35,13 @@ export const setMachineTeam = (data) => {
     data
   })
 }
+export const MachineWorkOrderEdit = (data) => {
+  return service({
+    url:'/mes_server/Reporting_Work/MachineWorkOrderEdit',
+    method: 'post',
+    data
+  })
+}
 export const ModelChangeRecord = (params) => {
   return service({
     url: '/mes_server/facility/ModelChangeRecord',
@@ -49,7 +56,13 @@ export const RemodelDetail = (params) => {
     params
   })
 }
-
+export const ChanliangDel = (params) => {
+  return service({
+    url: '/mes_server/facility/ChanliangDel',
+    method: 'get',
+    params
+  })
+}
 //客诉记录
 export const  ComplaintRecord= (params) => {
   return service({

src/api/jixiaoguanli/jitairibaobiao.js

@@ -958,6 +958,13 @@ export const remodelGetTab = (data) => {
     data
   })
 }
+export const ChanliangDel = (params) => {
+  return service({
+    url: '/mes_server/facility/ChanliangDel',
+    method: 'get',
+    params
+  })
+}
 export const ModelChangeRecord = (params) => {
   return service({
     url: '/mes_server/facility/ModelChangeRecord',

src/view/performance/Dayreportattached.vue

@@ -137,9 +137,9 @@
 					 @node-dblclick="handleNodeDoubleClick"
 					 ></el-tree>     
 		  </el-dialog>
-		  <el-dialog v-model="BzVisible" title="选择" destroy-on-close width="200px" >
+		  <el-dialog v-model="BzVisible" title="选择" destroy-on-close width="200px" @keydown="selectBZ($event)" >
 		    <el-table tooltip-effect="dark" :data="selectDataBz" row-key="ID"
-		      highlight-current-row="true" border style="width:100%"
+		      highlight-current-row="true" border style="width:100%" ref="table2"
 		      @row-dblclick="SelectClickBz"
 		    >
 		      <el-table-column prop="sczl_bzdh" label="班组" width="150" />			        	 
@@ -557,23 +557,46 @@ const getBzsubmit = () => {
 	selectDataBz.splice(0, selectDataBz.length, ...data)
 	if(!GetjtbhVisible.value){
 		BzVisible.value=true
+		setCurrent(selectDataBz[0])
 	}
 	
 			
 }
-
+const table2 = ref()
+const setCurrent = (row) => {
+  setTimeout(()=>{
+	  table2.value?.setCurrentRow(row)
+	  // SelectClick(row)
+	  // console.log(row)
+	  // console.log(table)
+	  const {sczl_bzdh } = row
+	  	formData.value.sczl_bzdh=row.sczl_bzdh
+	  	console.log(row)
+  })
+}
 //班组选择
 const selectDataBz = reactive([])
 const BzVisible = ref(false)
 const SelectClickBz = (row, column, event) => {
-  const {sczl_bzdh } = row
-
-	formData.value.sczl_bzdh=row.sczl_bzdh
-
-  BzVisible.value = false
+ const {sczl_bzdh } = row
+ 
+ 	formData.value.sczl_bzdh=row.sczl_bzdh
+ 
+ BzVisible.value = false
+}
+const selectBZ = (event) => {
+	// console.log(selectDataBz.length);
+	if (event.keyCode === 40) { // Enter 或向下箭头
+	    setCurrent(selectDataBz[1]);
+		
+	} else if (event.keyCode === 38) {
+		setCurrent(selectDataBz[0]);
+	
+	} else if (event.keyCode === 13) {
+		    BzVisible.value = false
+	}
 }
 
-
 // 更新数据
 const updateDetailData = async() => {
   const restoredData = {

src/view/performance/chejianbaogong.vue

@@ -8,7 +8,7 @@
 			<el-button type="primary" size="large" @click="onzhicheng"  >制程检验</el-button>
 			<el-button type="primary" size="large" @click="ondianjian"  >设备点检</el-button>
 			<el-button type="primary" size="large" @click="onxuncha" >管理巡查</el-button>
-<!--			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>-->
+			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>
 			<el-button type="primary" size="large" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" size="large" @click="onClear" >换型清场</el-button>
 			<el-button type="primary" size="large" @click="oncomplaints" >客诉记录</el-button>
@@ -2207,7 +2207,9 @@ import {
   remodelDataDel,
   PrintDetailAdd,
   PrintDetailEdit,
-  chanliangEdit
+  chanliangEdit,
+  ChanliangDel,
+  MachineWorkOrderEdit
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -4477,6 +4479,7 @@ const yjupdateCompanyFunc = async(row) => {
 }
 
 const setMachineTeams = async(row) => {
+	console.log(row.UniqId)
     const res = await setMachineTeam({
 			machine: JTMC.split("#")[0],
 			order:row['工单编号|质量信息'].split('|')[0],
@@ -4490,12 +4493,22 @@ const setMachineTeams = async(row) => {
 			})
     if (res.code === 0) {
       EquipmentSchedulingEdits(row)
+	  MachineWorkOrderEdits(row)
       ElMessage({
 		        type: 'success',
 		        message: '成功'
 		    })
     }
 }
+const MachineWorkOrderEdits = async(row) => {
+    const res = await MachineWorkOrderEdit({
+		    UniqId:row.UniqId,
+			machine: JTMC,
+			})
+    if (res.code === 0) {
+
+    }
+}
 
 const EquipmentSchedulingEdits = async(row) => {
   console.log(row)

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -4,7 +4,7 @@
 	    <header>
 			<el-button type="primary" @click="onBZ">班组维护</el-button>
 			<el-button type="primary" @click="onzhicheng"  >制程检验</el-button>
-			<!-- <el-button type="primary" @click="onDel">删除</el-button> -->
+			<el-button type="primary" @click="onDel">删除</el-button>
 			<el-button type="primary" @click="onxuncha">管理巡查</el-button>
 			<el-button type="primary" @click="ondianjian">设备点检</el-button>
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
@@ -24,7 +24,14 @@
       </el-aside>
       <el-container>
         <el-main>
-
+			
+			
+<div class="button-container" v-if="showbutton" style="height: 50%;width: 100%; flex: 1; border: 0px magenta solid; margin: 0; padding: 0;">
+		    <button v-for="(item, index) in machineData" :key="index" class="custom-button" @click="handleButtonClick(item.设备编号)">
+		      <img :src="`/src/assets/${item.状态}.png`" :alt="altText" style="max-width: 100%; height: auto;"/>
+		      <span style="margin-top: 8px;">{{ item.设备编号 + ' - ' + item.设备名称 }}</span>
+		    </button>
+</div>
           
 <div class="gva-search-box" v-if="JTMCOn" style="overflow: hidden; padding: 0; display: flex;">
 
@@ -139,7 +146,7 @@
 	</div>
                     
 </div>
-          <div v-if="JTMCOn" class="gva-table-box">
+          <div v-if="JTMCOn" class="gva-table-box" >
             <div class="gva-btn-list">
             </div>
             <el-tabs v-model="activName" type="card" @tab-click="handleClick">
@@ -984,13 +991,14 @@
 		
 		
 		<div v-if="dateOn" >
+			          
 					  <el-tabs v-model="activName" type="card" @tab-click="handleClick">
 					    <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
 					      <el-table ref="multipleTable"
 					                :show-overflow-tooltip="true"
 					                :row-style="{ height: '20px' }"
 					                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-					                :header-cell-style="{ padding: '0px' }"
+					                :header-cell-style="{ padding: '0px' }" @row-click="getUid"
 					                highlight-current-row="true" @row-dblclick="gytableDatadoubleClick"
 					                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
 					        <el-table-column type="selection" width="55" />
@@ -1853,6 +1861,7 @@ import {
    chanliangEdit,
    productionGdmc,
    productionYjmc,
+   ChanliangDel
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -1878,6 +1887,7 @@ let JTMC=ref()
 let date=ref()
 let titinfo=ref()
 let JTMCOn=ref()
+let showbutton=ref()
 let dateOn=ref()
 const  activName  = ref('first')
 let productCode=ref()
@@ -1891,6 +1901,9 @@ const handleNodeClick = (nodeData,node) => {
    if (nodeData.level === 1) {
         console.log(node.label); // 第一级节点
 		CJMC.value=node.label
+		showbutton.value=true
+		JTMCOn.value=false
+		dateOn.value=false
 		MachinelList()
 		// MachineVisible.value=true
       } else if (nodeData.level === 2) {
@@ -1898,6 +1911,7 @@ const handleNodeClick = (nodeData,node) => {
 		JTMC=node.label.split("-")[0]
 		JTMCOn.value=true
 		dateOn.value=false
+		showbutton.value=false
 		FacilityProduction()
 		FacilityWorklist()		
 		// FacilityTeam(JTMC)
@@ -1912,6 +1926,7 @@ const handleNodeClick = (nodeData,node) => {
 		  drzcDatas.value=[]
 		  columnNames=[]
 		  drzcData=[]
+		  showbutton.value=false
 		  FacilityInspect()
 		  FacilitychanLiang()
 		  
@@ -1930,8 +1945,7 @@ const MachinelList = async () => {
 	machineData.splice(0, machineData.length, ...response.data);
 	console.log(machineData)
 	// return require(`@/assets/${machineData.状态}.png`);
-	
-	MachineVisible.value=true
+	// MachineVisible.value=true
   }
 }
 
@@ -1941,8 +1955,8 @@ function handleButtonClick(deviceId) {
 	 MachineVisible.value=false
 	 // dialogSbyxgl.value=true
 	 JTMC=deviceId.split("-")[0]
-	 JTMCOn.value=true
-	 dateOn.value=false
+	 // JTMCOn.value=true
+	 // dateOn.value=false
 	 console.log(JTMC)
 	 GetdialogSbyxgl()
 	 
@@ -2283,9 +2297,25 @@ const getTableList = async() => {
 getTableData()
 //删除
 function onDel() {
+	Chanliangdel()
+}
+// 日产量上报删除
+const Chanliangdel = async() => {
 	
+    const res = await ChanliangDel({ UniqId:uid.value})
+    if (res.msg === '成功') {
+    ElMessage({
+      type: 'success',
+      message: '成功'
+    })
+	FacilitychanLiang()
+    }else{
+		ElMessage({
+		  type: 'success',
+		  message: '失败'
+		})
+	}
 }
-
 //制程检验
 const zhichengstatus=ref(false)
 const xunchaData = ref([]);
@@ -2983,6 +3013,12 @@ function gytableDatadoubleClick(row, column, event) {
  MachineChanliang(row.UniqId)
  
 }
+const uid=ref()
+function getUid(row, column, event) {
+ uid.value=row.UniqId
+ console.log(uid)
+}
+
 //获取详细信息
 const MachineChanliang = async(value) => {
  const response = await MachineChanliangDetail({UniqId:value});