Browse Source

更新台架详情信息 新增台架模型 去掉打印与断点

zhangmingyan 10 months ago
parent
commit
dc3a528f86

File diff suppressed because it is too large
+ 218 - 0
public/models/mesh3Draco.gltf


+ 6 - 7
src/components/BenchDetail/index.vue

@@ -50,7 +50,7 @@
                 <el-col :span=5>
                   <div>Status:</div>
                   <div>IP</div>
-                  <div>Mac Adress</div>
+                  <div>Mac Address</div>
                 </el-col>
                 <el-col :span=8>
                   <div> {{ bench.slave[0].status }}</div>
@@ -65,7 +65,7 @@
                 <el-col :span=5>
                   <div>Status</div>
                   <div>IP</div>
-                  <div>Mac Adress</div>
+                  <div>Mac Address</div>
                 </el-col>
                 <el-col :span=8>
                   <div> {{ bench.slave[1].status }}</div>
@@ -107,7 +107,7 @@ export default {
         { label: 'ID', prop: 'id' },
         { label: 'NAME', prop: 'name' },
         { label: 'IP', prop: 'ip' },
-        { label: 'BINDing', prop: 'binding' },
+        { label: 'BINDING', prop: 'binding' },
         { label: 'STATUS', prop: 'status' },
         // 其他列配置...
       ],
@@ -121,11 +121,11 @@ export default {
         { label: 'Error Code', prop: 'errorCode' },
         { label: 'Error Message', prop: 'errorMessage',width: '120px' },
         { label: 'Description', prop: 'description' },
-        { label: 'DataCreate', prop: 'dataCreate' },
+        { label: 'CreateData', prop: 'dataCreate' },
         { label: 'Reporter', prop: 'reporter' },
-        { label: 'Datemodifed', prop: 'datemodifed' },
+        { label: 'ModifiedDate', prop: 'datemodifed' },
         { label: 'Modifier', prop: 'modifier' },
-        { label: 'STATUS', prop: 'status' },
+        { label: 'Status', prop: 'status' },
         { label: 'Comment', prop: 'comment' },
         // 其他列配置...
       ],
@@ -150,7 +150,6 @@ export default {
     async getDetail(params) {
         const res = await detail(params);
         const data = res?.data?.data;
-        console.log(data)
         this.data = data;
         this.basicInfo = data?.groups?.['Basic Information'];
         this.equipmentTableData = data?.equipment;

+ 0 - 1
src/components/SearchBar/index.vue

@@ -50,7 +50,6 @@ export default {
     },
     onBlur(e) {
       // this.show = false;
-      // console.log('=======-------======', e.currentTarget.classList)
       // this.$emit("blur");
     },
     goBack() {

+ 0 - 1
src/components/SearchBarMain/index.vue

@@ -44,7 +44,6 @@ export default {
     },
     onBlur(e) {
       // this.show = false;
-      // console.log('=======-------======', e.currentTarget.classList)
       // this.$emit("blur");
     },
     goBack() {

+ 0 - 6
src/components/TabList/index.vue

@@ -708,7 +708,6 @@ export default {
   },
   mounted() {
     bus.on("benchInfoVisible", (param) => {
-      // console.log('benchInfoVisible', param);
       if (this.benchList.find((b) => b.benchId == param.benchId)) {
         this.$store.dispatch("benchList/setCurrentBench", param);
         // window.selectBench(param.benchId);
@@ -716,13 +715,11 @@ export default {
         for (var index = 0; index < items.length; index++) {
           items[index].style.background = "#00000032";
           let title = items[index].getElementsByClassName("item-title");
-          console.log("textContent", title[0].textContent);
           if (items[index].dataset.index == param.benchId) {
             items[index].style.background = "#000000C0";
           }
         }
       }
-      // console.log('this.currentBench', this.currentBench);
     });
 
     bus.on("benchDisplayLowerVisibleChange", (param) => {
@@ -836,7 +833,6 @@ export default {
   },
   methods: {
     changeTab(index) {
-      console.log("tab 切换 index", index);
       this.activeTab = index;
     },
     doManualCase() {
@@ -888,7 +884,6 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val.map((v) => v.id);
-      console.log("multipleSelection", this.multipleSelection);
     },
     switchScreen() {
       if (this.currentScreen == "upper") {
@@ -897,7 +892,6 @@ export default {
         this.currentScreen = "upper";
       }
       bus.emit("switchScreen", { currentScreen: this.currentScreen });
-      console.log("this.currentScreen", this.currentScreen);
     },
   },
 };

+ 0 - 1
src/components/homeProgress/index.vue

@@ -26,7 +26,6 @@ export default {
   },
   methods: {},
   mounted() {
-    console.log("window.location.pathname", window.location.pathname);
     if (this.isOpen3d) {
       this.progressVisible = true;
     }

+ 0 - 1
src/lib/ws/websocket.js

@@ -42,7 +42,6 @@ class IO {
         } catch (e) {
             // 重新连接WebSocket
             this.ws_recontent(this.url, callback);
-            console.log(e);
         }
     }
 

+ 0 - 3
src/service/ws.js

@@ -109,9 +109,7 @@ export default class wsService {
                     reject
                 };
                 if (this._websocket.readyState == 1) {
-                    // console.log("this._websocket.readyState == 1");
                     // if (!this.wsClosed) {
-                        // console.log('msg',msg);
                     this._websocket.send(msg);
                 }
                 // setTimeout(() => {
@@ -146,7 +144,6 @@ export default class wsService {
     }
 
     singleFingerTouch(id, x, y, screenType = 1, debug = false) {
-        console.log('tag',id,x,y)
         return this.send("single_finger_touch", {
             bench_id:id,
             x: x,

+ 0 - 5
src/store/modules/bench/mutations.js

@@ -120,14 +120,10 @@ export default {
     }
   },
   removeBenchImgList(state, data) {
-    console.log('data------------------', data);
-    console.log('state.benchImgList-1', state.benchImgList);
     let newBenchImgList = state.benchImgList.filter((item) => {
       return item.alt != data.benchId;
     })
-    console.log('newBenchImgList', JSON.parse(JSON.stringify(newBenchImgList)));
     state.benchImgList = newBenchImgList;
-    console.log('state.benchImgList-2', state.benchImgList);
   },
   filterBenchList(state, data) {
     let option = state.filterMapList.find(option => option.type == data.type);
@@ -188,7 +184,6 @@ export default {
   setTaskList(state, taskList) {
     taskList.forEach((task) => {
       task.groups = JSON.parse(task.groups)
-      console.log('groups', task.groups);
       //let basicInfo = bench.groups["Basic Information"]
       //let benchInfo = bench.groups["Bench Information"]
       //for(let key in basicInfo) {

+ 2 - 2
src/store/modules/case/mutations.js

@@ -80,7 +80,7 @@ export default {
   },
   setAutoStatus(state, data) {
     // state.autoTaskSubmitLoading = false;
-    debugger
+    // debugger
     state.autoTaskStatus = data.res.data.result == 'SUCCESS' ? 'running': data.res.data.result;
     // state.autoTaskStatusMap[data.id] = data.res.data.result == 'SUCCESS' ? 'running': data.res.data.result;
     state.planExecId = data.res.data.info[0];
@@ -145,7 +145,7 @@ export default {
         finishedCaseNum++;
       }
     }
-    debugger
+    // debugger
     state.autoTaskItemsMap[data.info.planId] = data.res.data.list;
     let rate = (finishedCaseNum / planCaseNum) * 100;
     state.autoTaskPercentMap[data.info.planId] = rate;

+ 0 - 1
src/store/modules/plan/actions.js

@@ -4,7 +4,6 @@ export default {
   async fetchPlanList({ commit }, data) {
     try {
       const planList = await planApi.fetchPlanList(data)
-      console.log('planList',planList);
       commit("setMaualPlanList", planList.data.data);
     } catch (err) {
       console.log("error", "服务异常", 1000);

+ 0 - 2
src/store/modules/plan/mutations.js

@@ -59,7 +59,6 @@ export default {
   },
   setMaualPlanList(state, planList) {
     let maualPlanList = state.planList;
-    console.log('=======1111111')
     maualPlanList.forEach(p => {
       let plan = planList.find(s => s.id == p.id);
       if (plan) {
@@ -125,7 +124,6 @@ export default {
     });
   },
   clearPlanList(state) {
-    console.log('=======2222222')
     while(state.planList.length) {
       state.planList.pop()
     }

+ 0 - 2
src/store/modules/task/mutations.js

@@ -1,6 +1,5 @@
 export default {
   setTaskList(state, taskList) {
-    console.log('setTaskList',taskList);
     taskList.forEach((task, i) => {
       if(!state.taskList.some(t => t.id == task.id)) {
         task.checked = false;
@@ -9,7 +8,6 @@ export default {
         state.taskList.push(task)
       }
     });
-    console.log('taskList',state.taskList);
 
     //taskList.forEach((task) => {
     //  if (task.id) {

+ 132 - 23
src/uwb-sample.js

@@ -17,6 +17,7 @@ window.benchListInterval = null;
 window.otherInterval = null;
 var fbxLoader1Loaded = false;
 var fbxLoader2Loaded = false;
+var fbxLoader3Loaded = false
 var oldStatus = '';
 
 let textureLoader = new THREE.TextureLoader();
@@ -35,7 +36,6 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
     var sqlstr = "SELECT * FROM dat_bench_extend order by bench_id asc";
 
     //sqlstr = sqlstr.format(two_seconds_ago, two_seconds_ago)
-    console.log(sqlstr);
     let msg = {
       cmd: "query", // server端要进行判断的
       data: {
@@ -46,6 +46,7 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
     };
     // 触发事件进行从服务器获取数据
     window.vm.$socket.emit("REPT", msg, (datas) => {
+      // debugger
       g_PosArrayResult = datas.data;
       window.benchDBList = datas.data;
       var now = new Date();
@@ -210,12 +211,10 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
           mesh.position.set(x, y + 10, z);
           mesh.rotation.set(-Math.PI / 2, 0, 0);
           window.waterMap[bench_id] = mesh;
-          console.log('添加模型和水滴1111',benchIdList)
           if (sdkInstance) {
             if (benchIdList.indexOf(Number(bench_id)) > 0) {
               if (window.benchMeshWaterMap[bench_id]) {
                 window.benchMeshWaterMap[bench_id] = mesh;
-                console.log('添加benchid', bench_id)
                 sdkInstance.sceneRenderer.scene.add(mesh)
               }
               else {
@@ -316,7 +315,6 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
             let bench_img = item.bench_img;
             let show_remote_button = item.show_remote_button;
             if (benchType == 1) {
-              console.log("控制台查看加载gltf文件返回的对象结构", fbx);
               var childMesh = fbx.scene.children[0].children[0];
               let childMeshTmp = new THREE.Mesh(childMesh.geometry, childMesh.material)
               let scale = 5;
@@ -335,9 +333,6 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
                 benchImg: bench_img,
               };
               childMeshTmp.userData = customData;
-
-
-              console.log('添加模型和水滴1111')
               if (benchIdList.indexOf(Number(bench_id)) > 0) {
                 if (!window.benchMeshMap[bench_id]) {
                   window.benchMeshMap[bench_id] = childMeshTmp;
@@ -446,7 +441,6 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
             let bench_img = item.bench_img;
 
             if (benchType == 2) {
-              console.log("控制台查看加载gltf文件返回的对象结构", fbx);
               var childMesh = fbx.scene.children[0];
               let childMeshTmp = new THREE.Mesh(childMesh.geometry, childMesh.material)
               let scale = 0.05;
@@ -503,7 +497,6 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
                       }
                     )
                   }
-                  console.log('benchPosList',window.benchPosList)
                   window.showBenchPos(window.benchPosList);
                   //setInterval(()=>{
                   //  getsqlDataRealTime();
@@ -514,6 +507,135 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
           }
         })
       }
+
+      var fbxLoader3 = new THREE.GLTFLoader();
+      fbxLoader3.setDRACOLoader(dracoLoader);
+      if (!fbxLoader3Loaded) {
+
+        fbxLoader3.load("../models/mesh3Draco.gltf", function (fbx) {
+          console.log('1loadzmg211111111111111111111')
+          let benchIdList = window.store.getters['benchList/getBenchList'].map(m => m.id);
+          //fbxLoader3Loaded = true;
+          let result = g_PosArrayResult;
+          for (var item of result) {
+            let x = item.x;
+            let y = item.y;
+            let z = item.z;
+            let ang_x = 0.0;
+            let ang_y = 0.0;
+            let ang_z = 0.0;
+            let benchType = item.bench_type
+            //if (item.use_fix_pos == 1) {
+            if (true) {
+              x = JSON.parse(JSON.stringify(item.fix_pos_x));
+              y = JSON.parse(JSON.stringify(item.fix_pos_y));
+              z = JSON.parse(JSON.stringify(item.fix_pos_z));
+              ang_x = JSON.parse(JSON.stringify(item.fix_angle_x));
+              ang_y = JSON.parse(JSON.stringify(item.fix_angle_y));
+              ang_z = JSON.parse(JSON.stringify(item.fix_angle_z));
+            }
+            else {
+            }
+
+            var distance = 10000.0;
+
+            var xSubTmp = x;
+            var ySubTmp = y;
+            var zSubTmp = z;
+            var ang_xSubTmp = ang_x;
+            var ang_ySubTmp = ang_y;
+            var ang_zSubTmp = ang_z;
+
+            if (g_PosArrayResult) {
+              var iCount = 0;
+              for (var itemSub of g_PosArrayResult) {
+
+                iCount++;
+                var xSub = itemSub.x;
+                var ySub = itemSub.y;
+                var zSub = itemSub.z;
+                var ang_xSub = 0.0;
+                var ang_ySub = 0.0;
+                var ang_zSub = 0.0;
+                xSub = itemSub.fix_pos_x;
+                ySub = itemSub.fix_pos_y;
+                zSub = itemSub.fix_pos_z;
+                ang_xSub = itemSub.fix_angle_x;
+                ang_ySub = itemSub.fix_angle_y;
+                ang_zSub = itemSub.fix_angle_z;
+                var disTmp = Math.sqrt(Math.pow(x - xSub, 2) + Math.pow(y - ySub, 2) + Math.pow(z - zSub, 2))
+                if (disTmp < distance) {
+                  distance = disTmp;
+                  xSubTmp = xSub;
+                  ySubTmp = ySub;
+                  zSubTmp = zSub;
+                  ang_xSubTmp = ang_xSub;
+                  ang_ySubTmp = ang_ySub;
+                  ang_zSubTmp = ang_zSub;
+                }
+              }
+            }
+
+
+            x = xSubTmp;
+            y = ySubTmp;
+            z = zSubTmp;
+            ang_x = ang_xSubTmp;
+            ang_y = ang_ySubTmp;
+            ang_z = ang_zSubTmp;
+            x = JSON.parse(JSON.stringify(xSubTmp));
+            y = JSON.parse(JSON.stringify(ySubTmp));
+            z = JSON.parse(JSON.stringify(zSubTmp));
+            ang_x = JSON.parse(JSON.stringify(ang_xSubTmp));
+            ang_y = JSON.parse(JSON.stringify(ang_ySubTmp));
+            ang_z = JSON.parse(JSON.stringify(ang_zSubTmp));
+
+            let card_id = item.card_id;
+            let bench_id = item.bench_id;
+            let bench_img = item.bench_img;
+            let show_remote_button = item.show_remote_button;
+            if (benchType == 3) {
+              console.log("控制台查看加载gltf文件返回的对象结构", fbx);
+              var childMesh = fbx.scene.children[0].children[0];
+              // var childMesh = fbx.scene.children[0];
+              let childMeshTmp = new THREE.Mesh(childMesh.geometry, childMesh.material)
+              let scale = 0.1;
+              childMeshTmp.scale.set(scale, scale, scale)
+              //fbx.scene.children[0].scale.set(5, 5, 5)
+              //fbx.scene.children[0].position.set(8.7, -1.6, 5.4)
+              childMeshTmp.position.set(x, y, z)
+              var Euler = new THREE.Euler(Math.PI * ang_x, Math.PI * ang_y, Math.PI * ang_z);
+              //var Euler = new THREE.Euler( Math.PI*1.5, Math.PI*0, Math.PI*0);
+              var quaternion = new THREE.Quaternion();
+              childMeshTmp.quaternion.copy(quaternion.setFromEuler(Euler))
+              var customData = {
+                benchId: bench_id,
+                benchFlag: true,
+                bShowRemoteButton: show_remote_button == 1 ? true : false,
+                benchImg: bench_img,
+              };
+              childMeshTmp.userData = customData;
+              if (benchIdList.indexOf(Number(bench_id)) > 0) {
+                if (!window.benchMeshMap[bench_id]) {
+                  window.benchMeshMap[bench_id] = childMeshTmp;
+                  sdkInstance.sceneRenderer.scene.add(childMeshTmp)
+                }
+                else {
+                  let deleteChildMesh = window.benchMeshMap[bench_id];
+                  sdkInstance.sceneRenderer.scene.remove(deleteChildMesh)
+                  deleteChildMesh.geometry.dispose(); // 清理几何体
+                  deleteChildMesh.material.dispose(); // 清理材质
+                  deleteChildMesh = null; // 置空指向该3D模型的变量
+                  window.benchMeshMap[bench_id] = childMeshTmp;
+                  sdkInstance.sceneRenderer.scene.add(childMeshTmp);
+                }
+              }
+
+            }
+
+          };
+        })
+      }
     });
   }
 
@@ -524,7 +646,6 @@ function getsqlDataRealTime() {
     var sqlstr = "select t3.* ,t4.fix_pos_x, t4.fix_pos_y, t4.fix_pos_z,t4.fix_angle_x, t4.fix_angle_y, t4.fix_angle_z, t4.bench_type, t4.bench_id, t4.bench_img, t4.use_fix_pos from (SELECT t1.* FROM his_location_tadiao_result_unity t1 INNER JOIN (SELECT MAX(loc_time) AS max_loc_time FROM his_location_tadiao_result_unity GROUP BY card_id) t2 ON t1.loc_time = t2.max_loc_time) as t3 INNER JOIN dat_bench_extend t4 ON (t4.card_id=t3.card_id)";
 
     //sqlstr = sqlstr.format(two_seconds_ago, two_seconds_ago)
-    console.log(sqlstr);
     let msg = {
       cmd: "query", // server端要进行判断的
       data: {
@@ -630,7 +751,6 @@ function getsqlDataRealTime() {
           })
         }
       }
-      console.log('benchPosList', window.benchPosList)
       window.showBenchPos(window.benchPosList);
     });
   }
@@ -639,7 +759,6 @@ function getsqlDataRealTime() {
 
 // uwb 插件初始化
 function uwbInit(originPointPose) {
-  console.log("=====初始化uwb 实例=====");
   const uwbIns = new UWB({
     upAxis: "y-up",
     LR: "r",
@@ -649,7 +768,6 @@ function uwbInit(originPointPose) {
 }
 
 export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
-  console.log("uwbMain enter");
   finalMode = finalMode || "floorplan";
   var radius = 0.3;
   var height = 0.5;
@@ -738,7 +856,6 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
       }
 
       sdkInstance.on("endLoading", (mode) => {
-        console.log(mode, '-----+++++-----')
         console.log('endLoading')
         vrBgContainer.style.display = "none";
 
@@ -832,9 +949,8 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
             let bool = false;
             let bool1 = false;
             intersects.forEach(m => {
-              console.log('点击水滴', event, m && m.object && m.object.geometry && m.object.geometry.type, m.object)
+              // console.log('点击水滴', event, m && m.object && m.object.geometry && m.object.geometry.type, m.object)
               if (m.object.geometry.type != "PlaneBufferGeometry") {
-                console.log('onmousedown', 111)
                 if (m.object.userData && m.object.userData.benchFlag == true) {
                   if (!bool) {
                     bool = true;
@@ -861,7 +977,6 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
 
                 }
               } else if (m.object.geometry.type == "PlaneBufferGeometry") {
-                console.log('onmousedown', 222)
                 if (m.object.userData && m.object.userData.benchFlag == true) {
                   window.handleListClick(m.object.userData.benchId)
                 }
@@ -891,10 +1006,6 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
             mouse.y = -((event.clientY + Math.abs(marginTop)) / parseFloat(housePlayer.style.height)) * 2 + 1;
           }
 
-
-
-          console.log('======鼠标坐标=====', mouse)
-
           raycaster.setFromCamera(mouse, sdkInstance.player.cameras.floorplan);
           let intersects = raycaster.intersectObjects(sdkInstance.sceneRenderer.scene.children);
 
@@ -905,7 +1016,6 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
             for (let z = 0; z < intersects.length; z++) {
               let m = intersects[z];
               if (m && m.object && (m.object.userData.type == 'water')) {
-                console.log('===== bench selected =====')
                 //window.store.dispatch('benchList/setMouseOverBench', {
                 //  bench_id: m.object.userData.benchId,
                 //  pageX: event.x,
@@ -978,7 +1088,6 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
       if (newMode === "transitioning") {
         return;
       }
-      console.log(newMode, '@@@@@@@@@@@@@')
     });
   });
 }

+ 1 - 97
src/views/ordinaryPage/index.vue

@@ -812,7 +812,6 @@ export default {
         return state.benchList.mouseoverbenchid
       },
       images: (state) => {
-        console.log(state.benchList.benchImgList, "imageList");
         return state.benchList.benchImgList;
       },
       isOpenSquare: (state) => {
@@ -828,7 +827,6 @@ export default {
         return state.taskList.taskList;
       },
       planList: (state) => {
-        console.log(state.planList.planList, "planList==============");
         let planList = state.planList.planList.concat(
           state.planList.autoPlanList
         );
@@ -905,7 +903,6 @@ export default {
 	
     // 调用定时器方法,返回定时器id,用于按条件清空
     that.timerId = that.myInterval((count) => {
-      // console.log(count)
       this.$store.dispatch("benchList/fetchBenchList");
       if (!this.waterdotrefresh) {
         this.waterdotrefresh = true;
@@ -913,7 +910,6 @@ export default {
       }
       this.refreshBenchStatus()
       if (count > 30000) {
-        console.log("end");
         that.clearMyInterval(that.timerId);
       }
     }, 10000);
@@ -938,7 +934,6 @@ export default {
   async mounted() {
     that = this;
     //this.getBenchList();
-    console.log(this.benchList, "benchList");
     this.tabs[0].list = this.benchList;
     this.tabs[1].list = this.taskList;
     this.tabs[2].list = this.issueList;
@@ -963,21 +958,17 @@ export default {
 
       var objRBL = this.remoteBenchList;
       if (objRBL) {
-        console.log("objRBL", objRBL);
         wsArrayLength = objRBL.length;
         for (var iW = 0; iW < objRBL.length; iW++) {
           var i = JSON.parse(JSON.stringify(iW));
           let benchId = JSON.parse(JSON.stringify(objRBL[i]));
           setTimeout(() => {
-            console.log("connect bench", benchId);
             wsArray[i]
               ?.connectBench({ bench_id: String(benchId) })
               .then((res) => {
-                console.log("connect bench success", benchId);
                 self.getBenchImage(benchId, 1, wsArray[i], () => {});
               })
               .catch((err) => {
-                console.log("connect bench failed", benchId);
                 this.$message({
                   message: "This bench is offline",
                   // message: "",
@@ -994,9 +985,7 @@ export default {
         this.benchLog.unshift(param);
         // document.getElementsByClassName("bmLogBottom")[0].scrollIntoView();
         if (Object.keys(param.action).length != 0) {
-          // console.log("actionType", param.action.actionType);
           let position = param.action.pos;
-          // console.log("position", position);
           if (param.action.actionType == "swipe on") {
             this.ifBmBenchTrailUpperCursorSwipe = true;
             this.trailCursorPosition.left = (position[0] / 1540) * 100;
@@ -1027,9 +1016,7 @@ export default {
             this.trailCursorPosition.left = ((position[0] * 2) / 1540) * 100;
             this.trailCursorPosition.top = ((position[1] * 2) / 720) * 100;
           } else if (param.action.actionType == "audio") {
-            // console.log("newLog", param);
             let fileName = param.action.file_name;
-            console.log("audiofileName", fileName);
             this.audioName = fileName;
             bus.emit("planAudioEmit");
           }
@@ -1089,7 +1076,6 @@ export default {
 	      window.vm.$socket.emit("REPT", msg, (datas) => {
 	        let result = datas.data;
 	        for (var item of result) {
-	          console.log("hhhh",item)
 	
 	          var currentBench = this.benchList.find((a) => a.id == item.bench_id);
 	          if (currentBench) {
@@ -1146,7 +1132,6 @@ export default {
       this.isShowCaseList = true;
     },
     submitManualCase(item) {
-      console.log(this.currentCase, "manualcasedetail============");
       this.isShowCaseCommit = true;
       this.isShowCaseDetail = false;
     },
@@ -1177,8 +1162,6 @@ export default {
       this.isShowAutoCaseCommit = false;
     },
     selectRowPlan(id, auto, name) {
-      console.log(id, "selectrowdata");
-      debugger
       if (!auto || auto == "undefined" || auto == "false") {
         this.currentPlanId = id;
         this.currentPlanName = name;
@@ -1254,7 +1237,6 @@ export default {
       this.isShowIssueList = false;
       this.isShowIssueDetail = true;
       this.currentIssue = row;
-      console.log(row, "==============issue============");
     },
     clickBackToPlanList() {
       this.isShowPlanList = true;
@@ -1271,7 +1253,6 @@ export default {
       for (var index = 0; index < items.length; index++) {
         items[index].style.background = "#00000032";
         let title = items[index].getElementsByClassName("item-title");
-        console.log("textContent", title[0].textContent);
         let itemOther = this.benchList.find(
           (b) => parseInt(b.id) == parseInt(title[0].textContent)
         );
@@ -1290,7 +1271,6 @@ export default {
       this.$store.dispatch('benchList/setFilterBenchFlag', true);
     },
     onBlur(e) {
-      console.log("=====----====", e.target.classList);
       if (
         Array.prototype.indexOf.call(e.target.classList, "ordinary-left") > -1
       ) {
@@ -1334,22 +1314,17 @@ export default {
           page_size: 10000,
         });
       });
-      console.log(task, "任务详情");
     },
     handleClickIssue(issueId) {
-      console.log(issueId, "issueid");
     },
     showBenchPos(benchList) {
-      console.log("benchList", benchList);
       for (var item of benchList) {
         var currentBench = this.benchList.find((b) => b.id == item.benchId);
         if (currentBench) {
-          //console.log('currentBench',currentBench);
           currentBench.left = item.x - 548 + 48;
           currentBench.top = item.y - 137 - 150 + 11;
           currentBench.benchId = item.benchId;
           currentBench.benchType = item.benchType;
-          console.log('item.benchImg',item.benchImg);
           currentBench.image = require("../../assets/bench_img/"+item.benchImg);
           if (currentBench.benchType == 2) {
             //currentBench.image = require("../../assets/mechine2.png");
@@ -1391,9 +1366,7 @@ export default {
               }', '${item.auto}')">To Do</div>
           </div>`;
     },
-    planRender(item) {
-      console.log(item, "plan", this.autoTaskStatusMap[item.id]);
-      
+    planRender(item) {      
       return `<div onClick="selectRowPlan('${item.uuid || item.id}', '${
         item.auto
       }', '${item.name}')" class="item-box" style="display:${
@@ -1440,16 +1413,13 @@ export default {
       return "row-class";
     },
     getImgList(objRBL) {
-      console.log("zmg3", objRBL);
       let benchId = objRBL.pop();
       if (benchId == null) {
-        console.log("zmg2");
         setTimeout(() => {
           let href = window.location.href;
           if (href.indexOf("benchid=") != -1) {
             let benchid = href.substring(href.indexOf("benchid=") + 8);
             let remoteBenchList = this.remoteBenchList;
-            console.log("benchid", benchid);
             console.log(
               "item == benchId",
               remoteBenchList.find((item) => item == benchid)
@@ -1462,8 +1432,6 @@ export default {
         return;
       }
       let self = this;
-
-      console.log("benchId", benchId);
       ws.connectBench({ bench_id: String(benchId) })
         .then((res) => {
           ws.getImage(String(benchId), 1).then((res) => {
@@ -1475,7 +1443,6 @@ export default {
           });
         })
         .catch((err) => {
-          console.log("connect bench failed", benchId);
           self.$message({
             message: "This bench is offline",
             // message: "",
@@ -1489,7 +1456,6 @@ export default {
       });
     },
     itemRender(item) {
-      // console.log(item, 'bench---item')
 
       //item.image = require("../../assets/mechine.png");
       //item.image = require("../../assets/bench_img/"+item.benchImg);
@@ -1558,7 +1524,6 @@ export default {
       }
     },
     handleInfoDblClick(benchId) {
-      console.log("handleInfoDblClick", benchId);
       this.currentBench = this.benchList.find((b) => b.id == benchId);
 
       this.isDetailVisible = true;
@@ -1570,7 +1535,6 @@ export default {
           this.handleGetImageData(data.data.data);
           break;
       }
-      console.log(data);
     },
     handleGetImageData(data) {
       this.mainSnapshot = "data:image/jpeg;base64," + data;
@@ -1583,11 +1547,9 @@ export default {
       let self = this;
       wsArrayLength++;
       setTimeout(() => {
-        console.log("connect bench", benchId);
         wsArray[i]
           ?.connectBench({ bench_id: String(benchId) })
           .then((res) => {
-            console.log("connect bench success", benchId);
             self.getBenchImage(benchId, 1, wsArray[i], () => {});
             this.currentBench = this.benchList.find((b) => b.id == benchId) || {};
             this.remoteBenchList.push(benchId)
@@ -1604,7 +1566,6 @@ export default {
             }
           })
           .catch((err) => {
-            console.log("connect bench failed", benchId);
             this.$message({
               message: "This bench is offline",
               // message: "",
@@ -1633,10 +1594,7 @@ export default {
         this.remoteBenchList.push(benchId)
         this.$store.dispatch('benchList/addRemoteBenchList', benchId);
       }
-
-      console.log("benchList", this.benchList);
       let bench = this.benchList.find((b) => b.id == benchId);
-      console.log("selectedBench", bench);
       if (this.previousSelectedBenchList.length) {
         this.selectedBenchList = JSON.parse(
           JSON.stringify(this.previousSelectedBenchList)
@@ -1650,7 +1608,6 @@ export default {
         this.currentBench = bench;
         bench.benchId = "'" + bench.benchId + "'";
         this.selectedBenchList.push(bench);
-        console.log("selected", this.selectedBenchList);
         // this.images = this.selectedBenchList.map((s) => {
         //   return {
         //     url: "",
@@ -1690,7 +1647,6 @@ export default {
         return;
       }
       this.selectedBenchList = [this.selectedBenchList[0]];
-      console.log("selectedBenchList[0]", this.selectedBenchList);
       let key = 0;
       for (let i in this.benchList) {
         this.benchList[i].selected = false;
@@ -1709,12 +1665,10 @@ export default {
       this.connetedBenchId = String(benchId);
       // this.connectedBenchData = this.benchList[key];
       setTimeout(() => {
-        console.log("connect bench", benchId);
         ws.connectBench({ bench_id: String(benchId) })
           .then((res) => {
             self.isConnected = true;
             this.$store.dispatch("common/setConnectedStatus", true);
-            console.log("connect bench success");
             this.currentScreen = "upper";
             self.setSendAudioBus(benchId);
             self.getBenchImage(benchId, 1, ws, () => {
@@ -1734,7 +1688,6 @@ export default {
             }
           })
           .catch((err) => {
-            console.log("connect bench failed");
             this.benchList[key].acitveAnimation = false;
             this.$message({
               message: "This bench is offline",
@@ -1750,7 +1703,6 @@ export default {
       } else {
         this.currentScreen = "upper";
       }
-      console.log("this.currentScreen", this.currentScreen);
     },
     singleFingerTouch(id, x, y, screenType) {
       let self = this;
@@ -1769,7 +1721,6 @@ export default {
     controlCursorMouseDown(e) {
       let self = this;
       if (this.displayTapMode) {
-        // console.log("e", e);
         this.controlCursorPosition.left = e.offsetX;
         this.controlCursorPosition.top = e.offsetY;
         this.controlStartPoint.x = e.offsetX;
@@ -1809,7 +1760,6 @@ export default {
           Math.abs(this.controlStartPoint.x - e.offsetX) > 30 ||
           Math.abs(this.controlStartPoint.y - e.offsetY) > 30
         ) {
-          // console.log("controlStartPoint", controlStartPoint);
           self.singleFingerOperation(
             e,
             "swipe",
@@ -1828,7 +1778,6 @@ export default {
     },
     singleFingerOperation(e, operation, screenType, startPoint = {}) {
       let self = this;
-      console.log("singleFingerOperation", e, operation, screenType);
       if (this.displayTapMode) {
         let width = this.$refs.bmBenchRef.width;
         let height = this.$refs.bmBenchRef.height;
@@ -1848,15 +1797,8 @@ export default {
           x1 = Math.round(screenWidth * (startPoint.x / width));
           y1 = Math.round(screenHeight * (startPoint.y / height));
         }
-
-        // console.log("x", x);
-        // console.log("y", y);
-
-        // console.log("x1", x1);
-        // console.log("y1", y1);
         let operationDesc = "";
         if (operation == "tap") {
-          console.log("selected", this.connetedBenchId, x, y);
           self.singleFingerTouch(this.connetedBenchId, x, y, screenType);
           // tap on lower x: 48 y: 292
           operationDesc =
@@ -1927,7 +1869,6 @@ export default {
           seriesData[0]++;
         }
       }
-      console.log("seriesData", seriesData);
       var option = {
         tooltip: {
           trigger: "axis",
@@ -2006,7 +1947,6 @@ export default {
       let self = this;
       ws.unsubscribeBenchStatus({ bench_id: this.connetedBenchId }).then(
         (res) => {
-          console.log("unsubscribeBenchStatus", res);
         }
       );
       this.connetedBenchId = "";
@@ -2037,7 +1977,6 @@ export default {
 
     selectAllBench() {
       let self = this;
-      console.log('this.benchList===', this.benchList.length)
       if (this.selectedBenchList.length == this.benchList.length) {
         this.selectedBenchList = [];
         this.previousSelectedBenchList = [];
@@ -2070,7 +2009,6 @@ export default {
       srv
         .getBenchDetail(getBenchParam)
         .then((res) => {
-          // console.log("res", res);
           this.benchList[index].status = res.data.data.status;
         })
         .catch((err) => {
@@ -2082,13 +2020,11 @@ export default {
       if (this.ifShowLogBox) {
         ws.unsubscribeBenchStatus({ bench_id: this.connetedBenchId }).then(
           (res) => {
-            console.log("unsubscribeBenchStatus", res);
           }
         );
       } else {
         ws.subscribeBenchStatus({ bench_id: this.connetedBenchId }).then(
           (res) => {
-            console.log("subscribeBenchStatus", res);
           }
         );
       }
@@ -2101,7 +2037,6 @@ export default {
         benchId: String(this.connetedBenchId),
       }).then(
         (res) => {
-          console.log("connect_audio_device_res", res);
           if (type == "playAudio") {
             this.isRecording = !this.isRecording;
             self.recordAudio();
@@ -2114,7 +2049,6 @@ export default {
     },
     recordAudio(data) {
       let self = this;
-      // console.log("selectedBenchList.value[0]", this.selectedBenchList[0]);
       let channel = 1;
 
       this.vadThreshold = 0;
@@ -2223,10 +2157,8 @@ export default {
           benchId: this.connetedBenchId,
         }).then(
           (res) => {
-            // console.log("res", res);
           },
           (rej) => {
-            // console.log("rej", rej);
           }
         );
         // $bus.$emit("stopPlayAudio", {
@@ -2296,7 +2228,6 @@ export default {
         dataU8 = new Uint8Array(dataU8);
         dataF32 = new Float32Array(dataU8.buffer);
         if (!fill) {
-          // console.log("dataF32-", dataF32);
           let newDataF32 = new Float32Array(5120);
           for (let i = 0; i < 5120; i++) {
             if (i < dataF32.length) {
@@ -2306,7 +2237,6 @@ export default {
             }
           }
           dataF32 = newDataF32;
-          // console.log("dataF32+", dataF32);
         }
         self.pcPlayAudio(dataF32, 1, 8000);
 
@@ -2341,9 +2271,6 @@ export default {
         }
       }
 
-      // console.log("audioCtx", audioCtx);
-      // console.log("nowBuffering", nowBuffering);
-
       var source = audioCtx.createBufferSource();
       source.buffer = myArrayBuffer;
       source.connect(audioCtx.destination);
@@ -2370,7 +2297,6 @@ export default {
       this.platform = null;
       this.benchList.forEach((b) => (b.selected = false));
       this.benchList[key].selected = !this.benchList[key].selected;
-      console.log('划入。。。'+key+this.benchList[key].selected);
       if (this.benchList[key].selected) {
         this.currentBench = this.benchList[key];
         this.selectedBenchList.push(this.benchList[key]);
@@ -2405,7 +2331,6 @@ export default {
 		 // this.$set(this.benchList[key], "selected", false);
 
 		this.benchList[key].selected = false;
-		console.log('划出。。。'+key+this.benchList[key].selected);
 		this.$forceUpdate();
 	},
     clickBenchList() {
@@ -2488,7 +2413,6 @@ export default {
       } catch (e) {
 
       }
-      console.log("benchId", benchId);
       let selectedBench = this.benchList.find((i) => i.benchId == benchId);
       bus.emit("benchInfoVisible", selectedBench);
       this.$nextTick(() => {
@@ -2503,7 +2427,6 @@ export default {
         for (var index = 0; index < items.length; index++) {
           items[index].style.background = "#000000";
           if (this.images[index].alt == benchId) {
-            console.log("equal");
             items[index].style.background = "#ffffff";
           }
         }
@@ -2530,7 +2453,6 @@ export default {
         let items = document.getElementsByClassName("item-box");
         for (var index = 0; index < items.length; index++) {
           items[index].style.background = "#00000032";
-          // console.log("textContent", title[0].textContent);
           let itemOther = this.benchList.find(
             (b) => b.id == items[index].dataset.index
           );
@@ -2542,7 +2464,6 @@ export default {
             this.selectedBenchId = benchId
           }
         }
-        // console.log('this.currentBench', this.currentBench);
         // bus.emit("benchInfoVisible", this.currentBench);
       });
     },
@@ -2563,7 +2484,6 @@ export default {
         //});
         this.benchDetail = this.benchList.find((b) => b.id == benchId);
         //this.currentBench.style = "{background: rgba(0, 0, 0, 1)}"
-        console.log("current bench", this.benchDetail);
         this.isRemoteBtnVisible = true;
         this.isDetailVisible = true;
       });
@@ -2572,7 +2492,6 @@ export default {
       let self = this;
       setTimeout(() => {
         wsRemote.getImage(String(benchId), screenType).then((res) => {
-          console.log("getImageRes", res);
           // let screen = screenType == 1 ? "upper" : "lower";
           func();
           if (screenType == 1) {
@@ -2605,7 +2524,6 @@ export default {
       let self = this;
       if (benchId == this.connetedBenchId) {
         wsRemote.getImage(String(benchId), screenType).then((res) => {
-          console.log("getImageRes", res);
           // let screen = screenType == 1 ? "upper" : "lower";
           //func();
           {
@@ -2643,13 +2561,9 @@ export default {
       this.selectBench(benchId);
     },
     handleClickImg(benchId, indexParam) {
-      console.log(benchId)
       this.selectedBenchId = benchId;
       this.$nextTick(() => {
-        console.log(this.currentBenchId)
         if (benchId == this.currentBenchId) {
-          
-          console.log(this.brnchshow)
           if(this.brnchshow){
             benchId = 0;
             let items = document.getElementsByClassName("grid-item-background");
@@ -2668,7 +2582,6 @@ export default {
         for (var index = 0; index < items.length; index++) {
           items[index].style.background = "#000000";
           if (index == indexParam) {
-            console.log("equal");
             items[index].style.background = "#ffffff";
           }
         }
@@ -2691,7 +2604,6 @@ export default {
         for (var index = 0; index < items.length; index++) {
           items[index].style.background = "#00000032";
           let title = items[index].getElementsByClassName("item-title");
-          console.log("textContent", title[0].textContent);
           let itemOther = this.benchList.find(
             (b) => parseInt(b.id) == parseInt(title[0].textContent) || b.id == benchId
           );
@@ -2709,23 +2621,19 @@ export default {
     handleCloseImg(benchId) {
       this.connetedBenchId = benchId;
       this.disconnectBench()
-      console.log("benchId", benchId, this.connetedBenchId);
       var objRBL = this.remoteBenchList;
       if (objRBL) {
         for (var i = 0; i < objRBL.length; i++) {
           if (parseInt(objRBL[i]) == parseInt(benchId)) {
-            console.log("images", this.images);
 
             for (var ii = 0; ii < this.images.length; ii++) {
               if (parseInt(this.images[ii].alt) == parseInt(benchId)) {
                 this.images.splice(ii, 1);
-                console.log("images", this.images);
                 break;
               }
             }
             //delete objRBL[i];
             objRBL.splice(i, 1);
-            console.log("objRBL", objRBL);
             while(this.remoteBenchList.length) {
               this.remoteBenchList.pop();
               this.$store.dispatch('benchList/popRemoteBenchList')
@@ -2747,9 +2655,7 @@ export default {
       var readyCount = 0;
       var occupiedCount = 0;
       var offlineCount = 0;
-      console.log("this.benchList", this.benchList.length);
       this.benchList.forEach((element) => {
-        //console.log('element',element);
         if (element.status == "ready") {
           readyCount++;
         } else if (element.status == "error") {
@@ -2778,9 +2684,7 @@ export default {
       });
     },
     benchList(newValue, oldValue) {
-      console.log("newValue", newValue);
       var objRBL = this.remoteBenchList;
-      console.log("zmg1", objRBL);
       var objRBLReverse = [];
       if(objRBL)
       {