Browse Source

修改title提示,顺便改为open

wukai 2 months ago
parent
commit
f460d944fd
3 changed files with 36 additions and 36 deletions
  1. 5 5
      src/pages/components/Fac.vue
  2. 2 2
      src/pages/components/In02.vue
  3. 29 29
      src/pages/components/In03.vue

+ 5 - 5
src/pages/components/Fac.vue

@@ -1,7 +1,7 @@
 <template>
     <!--这是全厂模块的模块展示内容-->
     <div for="FAC"  id="top" class="top topfac" style="padding: 32px 0 0px 0;" @click="switchIndex">
-            <div title="返回数据消费"
+            <div title="进入数据消费平台"
                 style="cursor: pointer;height: 38px;width: 38px;text-align: center;float: right;margin: 0px 49px 0px 10px;"
                 @click.stop="toAdmin"><img src="../../assets/image/toAdmin.png">
             </div>
@@ -190,7 +190,7 @@ export default {
                     }
                     MarkerMapFac["FAC"] = {};
                     loadmarkers();
-                    
+
                 }catch(e){
                     window.location.reload();
                 }
@@ -263,8 +263,8 @@ export default {
             // player.Native.Camera.moveTo([235.678127000173, 13.38107286701451, 74.13573809425804], [-1248.3191825020908, -262.59031050373517, -409.93944372657353], [-0.30023176822741604, -0.055832565112502126, 0.9522308596238611], 1);
             await player.Native.Camera.moveTo([132.11876502209185, -440.46670198759625, 492.25734718993556],
             [-640.8528070063287, 2116.1462138868947, -2471.4015229045867],
-            [-0.2149817792494004, 0.7110548607426664, 0.6694653236762824], 1);            
-            // 使用异步函数,应该是需要等待模型相机变化完成后才能定位          
+            [-0.2149817792494004, 0.7110548607426664, 0.6694653236762824], 1);
+            // 使用异步函数,应该是需要等待模型相机变化完成后才能定位
             setTimeout(async()=> {
                 if(window.CurrentTargetType=='FAC') await player.Native.Camera.setAnchorPos([-45.87571144104003, -44.632896423339844, 43.90447044372559]);
             }, 2000);
@@ -1087,7 +1087,7 @@ export default {
         }
         //切换到数据消费后台
         function toAdmin(){
-            window.location.href= process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager");
+          window.open(process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager"));
         }
         function switchIndex(){
             if(showIndexData.value=='index'){

+ 2 - 2
src/pages/components/In02.vue

@@ -13,7 +13,7 @@
             </template>
         </div>
         <div for="IN02"  id="top" class="top top02" style="padding: 32px 0 0px 0;" @click="switchIndex">
-            <div title="返回数据消费"
+            <div title="进入数据消费平台"
                 style="cursor: pointer;height: 38px;width: 38px;text-align: center;float: right;margin: 0px 49px 0px 10px;"
                 @click.stop="toAdmin"><img src="../../assets/image/toAdmin.png"></div>
             <div title="返回主视图"
@@ -1809,7 +1809,7 @@ export default {
         }
         //切换到数据消费后台
         function toAdmin(){
-            window.location.href= process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager");
+          window.open(process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager"));
         }
         function switchIndex(){
             if(showIndexData.value=='index'){

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

@@ -1,7 +1,7 @@
 <template>
     <!--这是印花模块的模块展示内容-->
     <div for="IN03"  id="top" class="top top03" style="padding: 32px 0 0px 0;" @click="switchIndex">
-            <div title="返回数据消费"
+            <div title="进入数据消费平台"
                 style="cursor: pointer;height: 38px;width: 38px;text-align: center;float: right;margin: 0px 49px 0px 10px;"
                 @click.stop="toAdmin"><img src="../../assets/image/toAdmin.png">
             </div>
@@ -17,7 +17,7 @@
             <div class="cx">
                 <span @click="switchCX(item.index)" :class="item.active?'btn active':'btn'" v-for="item in cxList" :style="{backgroundImage: item.active?`url(${btnFrontBg})`:''}">{{ item.name }}</span>
                 <div  @click="switchCX(0)" :class="currentCXNo==0?'btn active':'btn'" :style="{width:'94%', backgroundImage: currentCXNo==0 ?`url(${btnFrontBg})`:''}">全部</div>
-            </div>            
+            </div>
         </div>
         <div class="abs title_row" style="left: 3%;top:6%;font-weight: normal;">
             <div class="title_left_line"></div><span>产线状态</span><span style="color:#27e6ff">(今日)</span>
@@ -124,13 +124,13 @@
                                 <div style="color: #fff;"><span>米数</span></div>
                                 <div style="font-size: 22px;color:#27e6ff">
                                     <span>{{ ReplaceNull(effInfo.length,'-') }}<span class="littleFont">米</span></span>
-                                </div>                            
+                                </div>
                             </div>
                             <div style="width: 50%;">
                                 <div style="color: #fff;"><span>重量</span></div>
                                 <div style="font-size: 22px;color:#27e6ff">
                                     <span>{{ ReplaceNull(effInfo.weight,'-') }}<span class="littleFont">吨</span></span>
-                                </div>                            
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -229,8 +229,8 @@ export default {
             if(newVal){
                 console.log('印花模型加载状态:',newVal)
                 clearTimeout(getDataTimer);
-                setTimeout(() => {  
-                    DataFull.GetData();                  
+                setTimeout(() => {
+                    DataFull.GetData();
                     init();
                 }, 500);
             }
@@ -238,9 +238,9 @@ export default {
         watch(() => props.userTimeout, newVal=> {
             console.log('userTimeout value:',newVal)
             if(newVal){
-                //if (!AutoPlayer.value && window.CurrentTargetType=='IN02') switchAutoPlayer(); //开启自动漫游               
+                //if (!AutoPlayer.value && window.CurrentTargetType=='IN02') switchAutoPlayer(); //开启自动漫游
             }
-        },{deep:true,immediate:true}) 
+        },{deep:true,immediate:true})
 
         watch(() => props.userRole, newVal=> {
             showIndexData.value = newVal;
@@ -308,9 +308,9 @@ export default {
                 if(rootObj==null){
                     console.log('未找到该模型的根节点')
                     return;
-                }      
+                }
                 return;
-                let t1 = new Date().getTime();          
+                let t1 = new Date().getTime();
                 var items = await player.Native.ModelTree.getSubItems(rootObj.item)
                 if(items.length==1 && items[0].name=='RootNode') rootObj = items[0];
                 //获取产线列表
@@ -321,11 +321,11 @@ export default {
                     let curLineDef = markersDef[items[i].name];
                     if(curLineDef==null ||curLineDef.length==0) continue;
                     var findName = curLineDef[curLineDef.length-1];
-                    let object = await player.Native.ModelTree.findItemByName(findName, items[i].item,true,3);                        
+                    let object = await player.Native.ModelTree.findItemByName(findName, items[i].item,true,3);
                     if( object!=null ){
                             var xyz = await player.Native.ModelTree.getItemShapeInfo(object.item);
                             var xyz2 = [(xyz.aabb[0][0]) , (xyz.aabb[0][1] ) , (xyz.aabb[0][2]) ];
-                            // 创建设备编号标记                        
+                            // 创建设备编号标记
                             var options = {
                                 "text": items[i].name,
                                 "visible": true,
@@ -339,7 +339,7 @@ export default {
                             var markPtr = await player.Native.GisMarker.create(options);
                             player.Native.GisMarker.update(markPtr, options);
                             window.IN03Markers.push(markPtr);
-                    }                        
+                    }
                 }
                 console.log('--------创建标记总耗时:',new Date().getTime()-t1)
             }
@@ -374,7 +374,7 @@ export default {
             for (let index = 0; index < tmp.length; index++) {
                 const element = tmp[index];
                 if(element.index==ind) tmp[index].active = true;
-                else tmp[index].active = false;                
+                else tmp[index].active = false;
             }
             cxList.value = tmp;
             if(ind==0){
@@ -389,11 +389,11 @@ export default {
             let data = deviceStatData.value.prodTrade;
             //生产趋势
             //获取数据中weight、aweight、bweight
-            var t = echarts_sc_qushi.value;            
+            var t = echarts_sc_qushi.value;
             var dataLine = [];
             var times = [];
             var v_series = [];
-            for (var i = 0; i < data.length; i++) {                
+            for (var i = 0; i < data.length; i++) {
                 var tv = data[i]['date'];
                 times.push([tv,data[i].tips]);
                 let line = data[i].line[currentCXNo.value];
@@ -408,7 +408,7 @@ export default {
             }
             v_series.push({
                 name: currentCXNo.value==0?"全部产线":currentCXNo.value+'号产线', type: 'line',  //symbol: 'none',
-                data: dataLine, 
+                data: dataLine,
                 itemStyle: {
                     normal: {
                         color: '#fbc16b', // 这里设置折线的颜色
@@ -416,7 +416,7 @@ export default {
                             color: '#fbc16b' // 这里同时设置线头的颜色
                         }
                     }
-                }                
+                }
             });
             var opt = {
                 title: {
@@ -523,7 +523,7 @@ export default {
             if (week_aefficiency.length> 0) {
                 v_series.push({
                     name: currentCXNo.value==0?"全部产线":currentCXNo.value+'号产线', type: 'line', //symbol: 'none',
-                    data: week_aefficiency, 
+                    data: week_aefficiency,
                     symbol: 'circle', // 使用圆作为折点标记
                     symbolSize: 6,
                     itemStyle: {
@@ -621,7 +621,7 @@ export default {
             if(echartsEleIns_0!=null){
                 echartsEleIns_0.dispose();
             }
-            echartsEleIns_0 = echarts.init(t);            
+            echartsEleIns_0 = echarts.init(t);
             echartsEleIns_0.setOption(opt);
         }
         function backMasterViewByFac(){
@@ -629,13 +629,13 @@ export default {
             if(window.CurrentTargetType!='IN03') return
             if(BODY_H_RATE>0.9){
                 //全屏模式下的视角
-                player.Native.Camera.moveTo([-91.64839019242504, -186.23753805841608, 166.78946395819892], 
-            [-90.82528929434541, 136.7362546068112, -54.52457853422797], 
+                player.Native.Camera.moveTo([-91.64839019242504, -186.23753805841608, 166.78946395819892],
+            [-90.82528929434541, 136.7362546068112, -54.52457853422797],
             [0.0014405644117746175, 0.5652582237894268, 0.8249127621831281], 1);
             }else{
                 //非全屏模式下的视角
-                player.Native.Camera.moveTo([-90.4534875451608, -201.60779996809177, 156.1529830648182], 
-            [-89.63620356422999, 119.08351214395233, -52.22443982968761], 
+                player.Native.Camera.moveTo([-90.4534875451608, -201.60779996809177, 156.1529830648182],
+            [-89.63620356422999, 119.08351214395233, -52.22443982968761],
             [0.001388561848385436, 0.544853112866498, 0.838530355619688], 1);
             }
             // 使用异步函数
@@ -647,7 +647,7 @@ export default {
         }
         //切换到数据消费后台
         function toAdmin(){
-            window.location.href= process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager");
+            window.open(process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager"));
         }
         onMounted(()=>{
             if(BODY_H_RATE>0.9) isFullScreen.value=true;
@@ -700,11 +700,11 @@ export default {
     -webkit-mask-image: linear-gradient(to top, #0b313de5 10%, transparent 20%,transparent 50%, #0b313de5 100%);
     mask-image: linear-gradient(to top, #0b313de5 10%,transparent 20%,transparent 50%, #0b313de5 100%);
     /*
-    
+
     background:url('../../assets/image/000.png');
     -webkit-mask-image:radial-gradient(circle, transparent 26%, #95afc5 54%);
-    
-    background: 
+
+    background:
     repeating-linear-gradient(
       45deg,
       #ccc 0, #ccc 10px,
@@ -776,4 +776,4 @@ export default {
     border: 1px solid #008899;
     background: rgb(0 85 102 / 40%);
 }
-</style>
+</style>