| 
					
				 | 
			
			
				@@ -44,7 +44,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <div for="IN02" id="func_menulist"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div  id="maogao_btn" title="" style="cursor: pointer;">毛高比重</div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <div  id="bpb_fx" title="" style="cursor: pointer;">白柸布预测分析</div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <div  id="bpb_fx" title="" style="cursor: pointer;">白坯布预测分析</div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <div for="IN02" id="imp_item"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div itemcode="1"><span>生产数据</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -60,7 +60,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div itemcode="11"><span>生产绩效月报</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div itemcode="12"><span>车间能耗日报</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div itemcode="13"><span>车间能耗月报</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <div itemcode="14"><span>白柸布靶向预测</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <div itemcode="14"><span>白坯布靶向预测</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div itemcode="15"><span>毯业加工成本</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div itemcode="16"><span>能耗统计报表</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <!--            <div itemcode="1"><span>最近7天</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>--> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1308,7 +1308,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         </thead> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         <tbody> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             <tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                <td colspan="8">正在加载数据中...</td>                                 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                <td colspan="8">正在加载数据中...</td> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             </tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         </tbody> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     </table> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1395,7 +1395,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <div id="iframeWin"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div class="title"><img src="image/title_icon.png" style="margin: 7px;float: left;"><span class="text">--</span><img src="image/Close.png" style="margin: 7px;float: right;cursor: pointer;" onclick="CloseWin()"></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <div class="content"><iframe src="" class=""></iframe></div>     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <div class="content"><iframe src="" class=""></iframe></div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </body> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script type="text/html" id="maogodetail_tpl"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2775,7 +2775,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //白柸布预测分析 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //白坯布预测分析 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $("#bpb_fx").on('click',function(e){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             e.stopPropagation(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var ifm = $("#iframeWin").attr("class","newwin bpbWin").show(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3137,14 +3137,14 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              var obj02 = await player.Native.ModelTree.findItemByName("Box013",0,true,1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              var imgid = await player.Native.GisMarker.loadImage("data://icon/qietu/tip2.png"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              var options = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                         "text": "白柸布("+StockTypeUnit['bpb']+")\r\r当前库存:-\r统计时间:7点至次日7点\r当日入库:- 出库:-\r当月入库:- 出库:-\r", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                         "text": "白坯布("+StockTypeUnit['bpb']+")\r\r当前库存:-\r统计时间:7点至次日7点\r当日入库:- 出库:-\r当月入库:- 出库:-\r", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          "visible": true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          //"maxLod": 130, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          "minLod": 0, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          "textFontSize":16, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          "textColor": parseInt("0xffffffff"), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                          "contentPadding":[5,5,5,5], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                         "userData":"bpb|白柸布("+StockTypeUnit['bpb']+")\r\r当前库存:{curr}\r统计时间:7点至次日7点\r当日入库:{d-in} 出库:{d-out}\r当月入库:{m-in} 出库:{m-out}\r" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                         "userData":"bpb|白坯布("+StockTypeUnit['bpb']+")\r\r当前库存:{curr}\r统计时间:7点至次日7点\r当日入库:{d-in} 出库:{d-out}\r当月入库:{m-in} 出库:{m-out}\r" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(obj02.item); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3217,7 +3217,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             MarkerMapFac["FAC"][markPtr]=options; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //await player.Native.GisMarker.update(markPtr, options); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //标记点击 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            Native.GisMarker.EventGisMarkerLClick.connect((event) => {                             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            Native.GisMarker.EventGisMarkerLClick.connect((event) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 markerLClickObj = MarkerMapFac["FAC"][event.markerId]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if(markerLClickObj==null || FacStockData==null) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 setTimeout(function(dataType){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3225,7 +3225,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     dataType = dataType.split("|"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     //打开库存趋势窗口 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     showStockTrend(dataType[0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                },300,markerLClickObj["userData"]);    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                },300,markerLClickObj["userData"]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             GetFacData(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3308,7 +3308,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType, cf); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             modelLoadState[currentTargetType] = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        showMarker(currentTargetType);         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        showMarker(currentTargetType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         await player.Native.Model.setModelVisible(currentTargetType,true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         player.Native.CameraAnimation.clearKeyFrame(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3452,7 +3452,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Native.Tools.setCurrentTool("system.Browse"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Native.ModelTree.EventBrowseLClick.connect((event) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if(event.object==null) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if(currentTargetType=="FAC"){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //必须延迟处理模型的点击事件,以判断是否是点击的标记,暂时没有找到更好的方法处理标记点击 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 setTimeout(function(event){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4033,7 +4033,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tpls.push('<tr style="font-weight:bold;background:rgb(236 239 243 / 48%)">'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (var i1 = 0; i1 < datalist[i].length; i1++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 tpls.push('<td>'+datalist[i][i1]+'</td>'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tpls.push('</tr>'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         tbody.html(tpls.join('')); 
			 |