优化模型操作

src/pages/components/Fac.vue

@@ -14,7 +14,7 @@
                     <tr style="background-color:transparent">
                         <td style="border:0">
                             <div class="littleFont">成本<span style="color:#27e6ff">（总能耗）</span></div>
-                            <div style="font-size: 32px;font-weight: bold;">{{ deviceStatData.avgMonth.costTotal }}<span style="font-size: 12px;"> 元/日</span></div>
+                            <div style="font-size: 32px;font-weight: bold;">{{ costTotalTrans(deviceStatData.avgMonth.costTotal) }}<span style="font-size: 12px;">{{ deviceStatData.avgMonth.costTotal>10000?'万元/日':'元/日' }}</span></div>
                         </td>
                         <td style="border:0;padding-left: 40px;">
                             <div class="littleFont">经编<span style="color:#27e6ff">（单位能耗）</span></div>
@@ -100,7 +100,7 @@
                 <span :class="buttonCode1=='Weight'?'fac_btn active':'fac_btn'" @click="LoadSCLine('Weight')">重量</span>
             </span>
         </div>
-        <div class="data_row" ref="echarts_sc_qushi" style="width: 100%;height: 42%;border: 1px solid #008899;"></div>
+        <div class="data_row" ref="echarts_sc_qushi" style="width: 100%;height: 42%;border: 1px solid #008899;background: rgb(0 85 102 / 40%);"></div>
         <div class="title_row" style="line-height: 30px;margin-top: 8%;"><div class="title_left_line" style="margin-top: 7px;"></div>
             <span>能耗趋势</span><span style="color:#27e6ff">（30天）</span>
             <span style="margin-left: auto !important;">
@@ -110,7 +110,7 @@
                 <span :class="buttonCode2=='water'?'fac_btn active':'fac_btn'" @click="LoadUsedLine('water')">水</span>
             </span>
         </div>
-        <div class="data_row" ref="echarts_used_qushi" style="width: 100%;height: 42%;border: 1px solid #008899;"></div>
+        <div class="data_row" ref="echarts_used_qushi" style="width: 100%;height: 42%;border: 1px solid #008899;background: rgb(0 85 102 / 40%);"></div>
     </div>
     <div id="iframeWin" v-if="isShowIframeWin" :class="iframeWinData.class">
             <div class="title"><img src="../../assets/image/title_icon.png" style="margin: 7px;float: left;"><span class="text">{{ iframeWinData.title }}</span><img src="../../assets/image/Close.png" style="margin: 7px;float: right;cursor: pointer;" @click="CloseIframeWin"></div>
@@ -278,7 +278,7 @@ export default {
                             //"maxLod": 130,
                             "minLod": 0,
                             "textFontSize":16,
-                            "textColor": parseInt("0xffffffff"),
+                            "textColor": parseInt("0xedededff"),
                             "contentPadding":[10,10,10,10],
                             "userData":"bpb|白坯布（"+StockTypeUnit['bpb']+"）\r\r当前库存：{curr}\r统计时间：7点至次日7点\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
                 };
@@ -301,7 +301,7 @@ export default {
                             //"maxLod": 130,
                             "minLod": 0,
                             "textFontSize":16,
-                            "textColor": parseInt("0xffffffff"),
+                            "textColor": parseInt("0xedededff"),
                             "contentPadding":[10,10,10,10],
                             "userData":"pt|盘头（"+StockTypeUnit['pt']+"）\r\r当前库存：{curr}\r统计时间：7点至次日7点\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
                 };
@@ -322,7 +322,7 @@ export default {
                             //"maxLod": 130,
                             "minLod": 0,
                             "textFontSize":16,
-                            "textColor": parseInt("0xffffffff"),
+                            "textColor": parseInt("0xedededff"),
                             "contentPadding":[10,10,10,10],
                             "userData":"ycl|原材料（"+StockTypeUnit['ycl']+"）\r\r当前库存：{curr}\r统计时间：7点至次日7点\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
                 };
@@ -341,7 +341,7 @@ export default {
                             //"maxLod": 130,
                             "minLod": 0,
                             "textFontSize":16,
-                            "textColor": parseInt("0xffffffff"),
+                            "textColor": parseInt("0xedededff"),
                             "contentPadding":[10,10,10,10],
                             "userData":"cp|成品（"+StockTypeUnit['cp']+"）\r\r当前库存：{curr}\r统计时间：7点至次日7点\r当日入库：{d-in} 出库：{d-out}\r当月入库：{m-in} 出库：{m-out}\r"
                 };
@@ -1075,6 +1075,10 @@ export default {
             isShowIframeWin.value=true;
 
         }
+        function costTotalTrans(v){
+            if(v>10000) return (v/10000).toFixed(2);
+            return v;
+        }
         function CloseIframeWin(){
             isShowIframeWin.value=false;
             iframeWinData.value={};
@@ -1095,10 +1099,16 @@ export default {
             clearTimeout(getDataTimer2);
             clearTimeout(getDataTimer3);
             clearTimeout(getDataTimer4);
-            if(MarkerMapFac["FAC"]==null) return;
-            for(let key in MarkerMapFac["FAC"]){
-                if(player!=null && player.Native!=null)player.Native.GisMarker.destroy(key)
-            }
+            if(player==null || player.Native==null) return;
+            (async ()=>{
+                let marklst = await player.Native.GisMarker.getMarkerList();
+                console.log('fac unmouned:',marklst)
+                if(marklst==null) return;
+                for(var i=0;i<marklst.length;i++){
+                    if(player!=null && player.Native!=null)player.Native.GisMarker.destroy(marklst[i].id)
+                }               
+            })();
+
         });
         return{
             backMasterViewByFac,
@@ -1110,6 +1120,7 @@ export default {
             iframeWinData,
             markerLClickObj,
             CloseIframeWin,
+            costTotalTrans,
             getDataTimer,
             getDataTimer1,
             getDataTimer2,
@@ -1128,7 +1139,7 @@ export default {
     }
 }
 </script>
-<style>
+<style scope="FAC">
 .bg1{
     z-index: 1; pointer-events: none;position: absolute;
     top: calc(90px * var(--hRate));
@@ -1138,6 +1149,8 @@ export default {
     margin-left: 19px;
     border: 2px solid #17666e;
     border-top: 0px;
+    background:url('../../assets/image/bg.png');
+    -webkit-mask-image:radial-gradient(circle, transparent 40%, #ffffff 83%);
     /*
     background:url('../../assets/image//bg.png');
     -webkit-mask-image:radial-gradient(circle, transparent 26%, #95afc5 54%);

src/pages/components/In03.vue

@@ -1,6 +1,7 @@
 <template>
     <!--这是印花模块的模块展示内容-->
     <div for="IN03"  id="top" class="top top03"></div>
+    <div class="bg2"></div>
 </template>
 <script>
 import { ref ,watch,onUnmounted} from 'vue';
@@ -152,4 +153,34 @@ export default {
         })
     }
 }
-</script>
+</script>
+<style scope="IN03">
+.bg2{
+    z-index: 1; pointer-events: none;position: absolute;
+    top: 0;/*calc(90px * var(--hRate));*/
+    left: 0;
+    width: 100%;
+    height: 89%;
+    margin-left: 19px;
+    border: 2px solid #17666e;
+    border-top: 0px;
+    /*background:url('../../assets/image/000.png');
+    
+    background:url('../../assets/image/000.png');
+    -webkit-mask-image:radial-gradient(circle, transparent 26%, #95afc5 54%);
+    
+    background: 
+    repeating-linear-gradient(
+      45deg,
+      #ccc 0, #ccc 10px,
+      transparent 10px, transparent 20px
+    ),
+    repeating-linear-gradient(
+      -45deg,
+      #ccc 0, #ccc 10px,
+      transparent 10px, transparent 20px
+    );
+    background-size: 20px 20px;
+   */
+}
+</style>

src/pages/components/In04.vue

@@ -1,4 +1,5 @@
 <template>
+    <div class="bg3"></div>
     <!--这是前整模块的模块展示内容-->
     <div for="IN04"  id="top" class="top top03"></div>
 </template>
@@ -156,4 +157,17 @@ export default {
         })
     }
 }
-</script>
+</script>
+<style scope="IN04">
+.bg3{
+    z-index: 1; pointer-events: none;position: absolute;
+    top: 0;/*calc(90px * var(--hRate));*/
+    left: 0;
+    width: 100%;
+    height: 100%;
+    margin-left: 19px;
+    border: 2px solid #17666e;
+    border-top: 0px;
+    /*background:url('../../assets/image/000.png');*/
+}
+</style>

src/pages/components/In05.vue

@@ -1,4 +1,5 @@
 <template>
+    <div class="bg5"></div>
     <!--这是后整模块的模块展示内容-->
     <div for="IN05"  id="top" class="top top03"></div>
 </template>
@@ -156,4 +157,17 @@ export default {
         })
     }
 }
-</script>
+</script>
+<style scope="IN05">
+.bg5{
+    z-index: 1; pointer-events: none;position: absolute;
+    top: 0;/*calc(90px * var(--hRate));*/
+    left: 0;
+    width: 100%;
+    height: 100%;
+    margin-left: 19px;
+    border: 2px solid #17666e;
+    border-top: 0px;
+    /*background:url('../../assets/image/000.png');*/
+}
+</style>