修改全厂视角，经编车间视角，增加白胚布靶向预测菜单

css/main.css

@@ -110,7 +110,7 @@
     #imp_item{
         position: absolute;
         width: 160px;
-        height: 350px;
+        height: 450px;
         background: rgba(19, 47, 95, 0.8);
         box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.2);
         border-radius: 2px 2px 2px 2px;
@@ -142,7 +142,7 @@
         width: 1920px;
         height: 95px;
         z-index: 1;
-        background: #ffffff00;        
+        background: #ffffff00;
     }
     .bottom{
         position: fixed;

main.html

@@ -56,6 +56,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="1"><span>最近7天</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
     <!--            <div itemcode="2"><span>自定义日期</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>-->
 </div>
@@ -2600,6 +2601,16 @@
                     preday = preday.setDate(new Date().getDate()-1);
                     $("#datepicker1,#datepicker2").val(new Date(preday).Format("yyyy-MM-dd"));//默认为前一天
                     break;
+                case 14:
+                    e.stopPropagation();
+                    $("#date_select .hourAreaSelect").hide();
+                    $("#date_select .hourPointSelect").hide();
+                    $date_select.show().css({
+                        "top": $(this).offset().top-10  + "px",
+                        "left": $("#imp_item").offset().left- $("#date_select").width()-20 + "px"
+                    })
+                //window.open(SERVER_URL + "/export/production");
+                    break;
             }
         })
         //自定义导出日期确定
@@ -2652,6 +2663,9 @@
                 case 13:
                     window.open(SERVER_URL + "/export/energy-month?date="+s1);
                     break;
+                case 14:
+                    window.open(SERVER_URL + "/export/order?start="+s1+"&end="+s2);
+                    break;
             }
             $("body").trigger('click')
         });
@@ -2802,7 +2816,7 @@
     }
     //获取全厂统计数据
     function GetFacData() {
-        $.getJSON(SERVER_URL + "/api/stock", {}, function (res) {
+        $.getJSON(SERVER_URL + "/stock", {}, function (res) {
             setTimeout(function () {
                 //每1分钟主动查询一次数据
                 GetFacData()
@@ -2863,11 +2877,12 @@
             } catch (e) {
             }
         }
-        player.Native.Camera.moveTo([235.678127000173, 13.38107286701451, 74.13573809425804], [-1248.3191825020908, -262.59031050373517, -409.93944372657353], [-0.30023176822741604, -0.055832565112502126, 0.9522308596238611], 1);
+        // player.Native.Camera.moveTo([235.678127000173, 13.38107286701451, 74.13573809425804], [-1248.3191825020908, -262.59031050373517, -409.93944372657353], [-0.30023176822741604, -0.055832565112502126, 0.9522308596238611], 1);
+        player.Native.Camera.moveTo([286.03479667714066, -369.1462098899696, 250.99077822208548], [-1630.186261661935, 1578.4562059189793, -1508.5247276647053],[-0.3797261858729431, 0.38594484375048804, 0.840746454851163], 1);
         // 使用异步函数
         (async () => {
             setTimeout(function() {
-                player.Native.Camera.setAnchorPos([-24.12020492553711,7.372551441192627,32.57069396972656]);
+                player.Native.Camera.setAnchorPos([-45.87571144104003, -44.632896423339844, 43.90447044372559]);
             }, 3000);
         })();
     }
@@ -2882,7 +2897,14 @@
             } catch (e) {
             }
         }
-        player.Native.Camera.moveTo([-60.91624261330108, -39.68511717426356, 85.99570940739352], [-61.26059834308166, -0.225858934410347, -0.5930273740619612], [-0.007940809332449061, 0.9099266223396253, 0.41469324265623975], 1);
+        // player.Native.Camera.moveTo([-60.91624261330108, -39.68511717426356, 85.99570940739352], [-61.26059834308166, -0.225858934410347, -0.5930273740619612], [-0.007940809332449061, 0.9099266223396253, 0.41469324265623975], 1);
+        player.Native.Camera.moveTo([7.630977787770181, -19.831384507538644, 3.1479712959809714], [-76.14185573007973, -18.383967627451927, -10.437484866007], [-0.1600317165278932, 0.0027650086325702416, 0.9871080003892169], 1);
+        // 使用异步函数
+        (async () => {
+            setTimeout(function() {
+                player.Native.Camera.setAnchorPos([-9.9559907913208, -20.36981773376465, 0]);
+            }, 3000);
+        })();
     }
     //3号楼内部最佳视图
     function backMasterViewBy03() {
@@ -2956,7 +2978,7 @@
         console.info(`用户长时间没有操作三维视图，会话即将退出，可调用player.resetTimer()取消退出`);
         if (!AutoPlayer && currentTargetType=='IN02') $("#autoplayer_btn").trigger('click') //开启自动漫游
     });
-    async function showMarker(type){        
+    async function showMarker(type){
         for (var t in MarkerMapFac) {
             if(t==type){
                 for (var markPtr in MarkerMapFac[t]) {
@@ -2982,94 +3004,94 @@
         await player.Native.Model.setModelVisible("IN02",false);
         await player.Native.Model.setModelVisible("IN03",false);
         await player.Native.Model.setModelVisible("IN04",false);
-        await player.Native.Model.setModelVisible("IN05",false);        
-        if(modelLoadState[currentTargetType]==null){            
+        await player.Native.Model.setModelVisible("IN05",false);
+        if(modelLoadState[currentTargetType]==null){
             var cf = "data://models/T_ALL.pr";
             var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType, cf);
             modelLoadState[currentTargetType] = true;
             GetFacData();
             //获取4号楼顶对象
-            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": "白胚布\r\r当日入库：- 出库：-\r当月入库：- 出库：-\r",
-                        "visible": true,
-                        //"maxLod": 130,
-                        "minLod": 0,
-                        "textFontSize":18,
-                        "textColor": parseInt("0xffffffff"),
-                        "contentPadding":[5,5,5,5],
-                        "userData":"bpb|白胚布\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
-            };
-            
-            var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(obj02.item);
-            options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1], obj02Aabb.aabb[0][2]+70];
-            //options.parentNode=tmp.item;
-            options.imgId = imgid
-            options.imgSize = [0, 110];
-            var markPtr = await player.Native.GisMarker.create(options);
-            //await player.Native.GisMarker.update(markPtr, options);
-            MarkerMapFac["FAC"]={};
-            MarkerMapFac["FAC"][markPtr]=options;
-            //获取盘头仓对象
-            var pantou = await player.Native.ModelTree.findItemByName("Object023",0,true,1);
-            //var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
-            var options = {
-                        "text": "盘头\r\r当日入库：- 出库：-\r当月入库：- 出库：-",
-                        "visible": true,
-                        //"maxLod": 130,
-                        "minLod": 0,
-                        "textFontSize":16,
-                        "textColor": parseInt("0xffffffff"),
-                        "contentPadding":[5,5,5,5],
-                        "userData":"pt|盘头\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
-            };
-            var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(pantou.item);
-            options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1]-20, obj02Aabb.aabb[0][2]+10];
-            //options.parentNode=tmp.item;
-            options.imgId = imgid
-            options.imgSize = [0, 110];
-            var markPtr = await player.Native.GisMarker.create(options);
-            MarkerMapFac["FAC"][markPtr]=options;
-            //await player.Native.GisMarker.update(markPtr, options);
-            //获取原材料仓对象
-            var pantou = await player.Native.ModelTree.findItemByName("B412",0,true,1);
-            //var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
-            var options = {
-                        "text": "原材料\r\r当日入库：- 出库：-\r当月入库：- 出库：-",
-                        "visible": true,
-                        //"maxLod": 130,
-                        "minLod": 0,
-                        "textFontSize":16,
-                        "textColor": parseInt("0xffffffff"),
-                        "contentPadding":[5,5,5,5],
-                        "userData":"ycl|原材料\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
-            };
-            var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(pantou.item);
-            options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1], obj02Aabb.aabb[0][2]+20];
-            //options.parentNode=tmp.item;
-            options.imgId = imgid
-            options.imgSize = [0, 110];
-            var markPtr = await player.Native.GisMarker.create(options);
-            MarkerMapFac["FAC"][markPtr]=options;
-            //await player.Native.GisMarker.update(markPtr, options);
-            //var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
-            var options = {
-                        "text": "成品\r\r当日入库：- 出库：-\r当月入库：- 出库：-",
-                        "visible": true,
-                        //"maxLod": 130,
-                        "minLod": 0,
-                        "textFontSize":16,
-                        "textColor": parseInt("0xffffffff"),
-                        "contentPadding":[5,5,5,5],
-                        "userData":"cp|成品\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
-            };
-            options.pos = [obj02Aabb.aabb[0][0]+120, obj02Aabb.aabb[0][1], obj02Aabb.aabb[0][2]+20];
-            //options.parentNode=tmp.item;
-            options.imgId = imgid
-            options.imgSize = [0, 110];
-            var markPtr = await player.Native.GisMarker.create(options);
-            MarkerMapFac["FAC"][markPtr]=options;
+            // 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": "白胚布\r\r当日入库：- 出库：-\r当月入库：- 出库：-\r",
+            //             "visible": true,
+            //             //"maxLod": 130,
+            //             "minLod": 0,
+            //             "textFontSize":18,
+            //             "textColor": parseInt("0xffffffff"),
+            //             "contentPadding":[5,5,5,5],
+            //             "userData":"bpb|白胚布\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
+            // };
+            //
+            // var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(obj02.item);
+            // options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1], obj02Aabb.aabb[0][2]+70];
+            // //options.parentNode=tmp.item;
+            // options.imgId = imgid
+            // options.imgSize = [0, 110];
+            // var markPtr = await player.Native.GisMarker.create(options);
+            // //await player.Native.GisMarker.update(markPtr, options);
+            // MarkerMapFac["FAC"]={};
+            // MarkerMapFac["FAC"][markPtr]=options;
+            // //获取盘头仓对象
+            // var pantou = await player.Native.ModelTree.findItemByName("Object023",0,true,1);
+            // //var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
+            // var options = {
+            //             "text": "盘头\r\r当日入库：- 出库：-\r当月入库：- 出库：-",
+            //             "visible": true,
+            //             //"maxLod": 130,
+            //             "minLod": 0,
+            //             "textFontSize":16,
+            //             "textColor": parseInt("0xffffffff"),
+            //             "contentPadding":[5,5,5,5],
+            //             "userData":"pt|盘头\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
+            // };
+            // var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(pantou.item);
+            // options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1]-20, obj02Aabb.aabb[0][2]+10];
+            // //options.parentNode=tmp.item;
+            // options.imgId = imgid
+            // options.imgSize = [0, 110];
+            // var markPtr = await player.Native.GisMarker.create(options);
+            // MarkerMapFac["FAC"][markPtr]=options;
+            // //await player.Native.GisMarker.update(markPtr, options);
+            // //获取原材料仓对象
+            // var pantou = await player.Native.ModelTree.findItemByName("B412",0,true,1);
+            // //var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
+            // var options = {
+            //             "text": "原材料\r\r当日入库：- 出库：-\r当月入库：- 出库：-",
+            //             "visible": true,
+            //             //"maxLod": 130,
+            //             "minLod": 0,
+            //             "textFontSize":16,
+            //             "textColor": parseInt("0xffffffff"),
+            //             "contentPadding":[5,5,5,5],
+            //             "userData":"ycl|原材料\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
+            // };
+            // var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(pantou.item);
+            // options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1], obj02Aabb.aabb[0][2]+20];
+            // //options.parentNode=tmp.item;
+            // options.imgId = imgid
+            // options.imgSize = [0, 110];
+            // var markPtr = await player.Native.GisMarker.create(options);
+            // MarkerMapFac["FAC"][markPtr]=options;
+            // //await player.Native.GisMarker.update(markPtr, options);
+            // //var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
+            // var options = {
+            //             "text": "成品\r\r当日入库：- 出库：-\r当月入库：- 出库：-",
+            //             "visible": true,
+            //             //"maxLod": 130,
+            //             "minLod": 0,
+            //             "textFontSize":16,
+            //             "textColor": parseInt("0xffffffff"),
+            //             "contentPadding":[5,5,5,5],
+            //             "userData":"cp|成品\r\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
+            // };
+            // options.pos = [obj02Aabb.aabb[0][0]+120, obj02Aabb.aabb[0][1], obj02Aabb.aabb[0][2]+20];
+            // //options.parentNode=tmp.item;
+            // options.imgId = imgid
+            // options.imgSize = [0, 110];
+            // var markPtr = await player.Native.GisMarker.create(options);
+            // MarkerMapFac["FAC"][markPtr]=options;
             //await player.Native.GisMarker.update(markPtr, options);
         }else{
             showMarker(currentTargetType);
@@ -3268,7 +3290,7 @@
                         }
                     }
                 }
-                if(inTxt!=""){                    
+                if(inTxt!=""){
                     switch(inTxt){
                         case "IN02":
                             loadIn02Model(Native);