功能优化

.env.development

@@ -4,6 +4,7 @@ VITE_SERVER_PORT = 8888
 VITE_BASE_API = /api
 VITE_FILE_API = /api
 VITE_BASE_PATH = http://10.10.4.58
+//VITE_BASE_PATH = http://20.0.16.174
 VITE_EDITOR = vscode
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm
 // 如果使用docker-compose开发模式，设置为下面的地址或本机主机IP

src/view/performance/chejianbaogong.vue

@@ -2687,8 +2687,7 @@ const setTeams = async(row) => {
 	  sczl_namekey=`sczl_name${i+1}`
 	  formData.value[sczl_bhkey] =row[i].split(' ')[0];
 	  formData.value[sczl_namekey] = row[i].split(' ')[1];
-	  console.log(formData)
-	
+	  // console.log(formData)	
 	}
 	console.log(formData)
 
@@ -3315,16 +3314,28 @@ const RemodelGetTab = async() => {
 }
 //设置机台状态
 const SetMachineStatus = async (row) => {
+	let classString = '';
+	const sczl_bh_values = [formData.value.sczl_bh1, formData.value.sczl_bh2, formData.value.sczl_bh3, formData.value.sczl_bh4, formData.value.sczl_bh5, formData.value.sczl_bh6];
+	
+	for (let i = 0; i < sczl_bh_values.length; i++) {
+	  if (sczl_bh_values[i]) {
+	    classString += sczl_bh_values[i] + ',';
+	  }
+	}
+	
+	// 去除最后一个逗号
+	classString = classString.slice(0, -1);
+	
+	
    const response = await setMachineStatus({
 	 machine: JTMC.split("#")[0],
 	 order:row['工单编号|质量信息'].split('|')[0],
 	 yjno:'1',
 	 gy_name:row['工序名称'],
-	 sczl_bzdh:BZMC.value,
 	 status:'生产',
 	 production_now:0,
 	 production_all:0,
-	 class:'ZM00361,ZM00743,ZM01269,ZM02842'
+	 class:classString
   });
   if (response.code === 0) {
   }
@@ -4528,9 +4539,9 @@ const setMachineTeams = async(row) => {
 			production_all:0,
 			team_id:formData.value.班组Id
 			})
+	MachineWorkOrderEdits(row)
     if (res.code === 0) {
-      // EquipmentSchedulingEdits(row)
-	  MachineWorkOrderEdits(row)
+      // EquipmentSchedulingEdits(row) 
       ElMessage({
 		        type: 'success',
 		        message: '成功'

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -13,16 +13,29 @@
 			<el-button type="primary" @click="onDel"  v-if="DelType === true" >删除</el-button>
 			<el-button type="primary" @click="onADD" v-if="AddType === true">新增</el-button>
 			<!-- <el-button type="primary" @click="onClear2" >换型清场</el-button> -->
-		</header>
+		</header>
+		
+		
+		
+		
     <el-container>
-      <el-aside width="200px">
-        <div class="JKWTree-tree">
-
-          <h3  >设备运行跟踪</h3>
-          <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" ></el-tree>
-        </div>
-
-      </el-aside>
+      <layout-sider
+        :resize-directions="['right']"
+        :width="220"
+        style="margin-right: 10px;"
+      >
+        <div
+          class="JKWTree-tree"
+          style="height: 70vh;"
+        >
+          <h3>设备运行跟踪</h3>
+          <el-tree
+            :data="treeData"
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </layout-sider>
       <el-container>
         <el-main>
 			
@@ -1886,7 +1899,8 @@ import {
 } from "@/api/mes/job";
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
 // 全量引入格式化工具 请按需保留
-import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
+import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { useUserStore } from '@/pinia/modules/user'