Просмотр исходного кода

收尾,取消产线编号显示,将订单号和花色显示在印花机上

wukai 2 месяцев назад
Родитель
Сommit
27bf0c0c7d
1 измененных файлов с 20 добавлено и 20 удалено
  1. 20 20
      src/pages/components/In03.vue

+ 20 - 20
src/pages/components/In03.vue

@@ -329,14 +329,14 @@ export default {
         ];
         //订单花色提示框位置,元素顺序为默认位置,左位置和右位置
         const orderMarkerPos=[
-                    [0, 89, 13],
-                    [0, 77, 13],
-                    [0, 66, 13],
-                    [0, 55, 13],
-                    [0, 44, 13],
-                    [0, 33, 13],
-                    [0, 22, 13],
-                    [0, 11, 13],
+                    [-120, 89, 13],
+                    [-120, 77, 13],
+                    [-120, 66, 13],
+                    [-120, 55, 13],
+                    [-120, 44, 13],
+                    [-120, 33, 13],
+                    [-120, 22, 13],
+                    [-120, 11, 13],
         ];
         const btnFrontBg = require('@/assets/image/nav_btn_front.png');
         watch(() => props.clickEvent, newVal=> {
@@ -517,14 +517,14 @@ export default {
                             "nodeOffset": [0, -24],
                             "userData": "line|"+line
                         };
-
-                        options.pos = markerPos[i][0];
-                        //options.parentNode=tmp.item;
-                        options.imgId = imgId
-                        options.imgSize = [16, 24];
-                        player.Native.GisMarker.create(options).then(markPtr=>{
-                            window.IN03Markers[markPtr] = options;
-                        });
+                        //2025-12-06,取消产线标记
+                        // options.pos = markerPos[i][0];
+                        // //options.parentNode=tmp.item;
+                        // options.imgId = imgId
+                        // options.imgSize = [16, 24];
+                        // player.Native.GisMarker.create(options).then(markPtr=>{
+                        //     window.IN03Markers[markPtr] = options;
+                        // });
                         let paraImg = await player.Native.GisMarker.loadImage("data://icon/rz-new/pp1.png");
                         //产线温度、速度标记
                         let optTmp = JSON.parse(JSON.stringify(options));
@@ -540,19 +540,19 @@ export default {
                         });
 
                         //产线订单花色标记.1\2号产线没有
-                        if(line>2){
+                        // if(line>2){
                             let optOrder = JSON.parse(JSON.stringify(options));
                             optOrder.imgId = paraImg;
                             optOrder.pos = orderMarkerPos[i];
                             optOrder.userData = "order|"+line;
                             optOrder.textFontSize = "14";
-                            optOrder.imgSize = [300, 18];
+                            optOrder.imgSize = [360, 18];
                             optOrder.textColor = parseInt("0xFFFFFFFF");
                             optOrder.nodeOffset = [-115, -24];
                             player.Native.GisMarker.create(optOrder).then(markPtr=>{
                                 window.IN03Markers[markPtr] = optOrder;
                             });
-                        }
+                        // }
                     }
                     //标记点击
                     player.Native.GisMarker.EventGisMarkerLClick.connect((event) => {
@@ -592,7 +592,7 @@ export default {
             let getCnt = 0;
             for(let markerPtr in window.IN03Markers){
                 let markerOpt = window.IN03Markers[markerPtr];
-                if(markerOpt["userData"]==null) continue;
+                if(markerOpt["userData"]==null) contin订单ue;
                 let datatype = markerOpt["userData"].split("|")[0];
                 if(datatype=='line'){
                     continue;