Ver código fonte

模型名称调整

liling 3 meses atrás
pai
commit
8227d66a16

+ 3 - 0
src/main.js

@@ -35,5 +35,8 @@ LogicFlow.use(Snapshot);
 LogicFlow.use(RectResize)
 // LogicFlow.use(MiniMap);
 // 使用 app 实例来挂载应用
+window.onerror = function(message, source, lineno, colno, error) {
+    console.error("捕获到全局错误:", message, "在", source, "第", lineno, "行");
+  };
 app.mount('#app')
 

+ 1 - 0
src/pages/components/Fac.vue

@@ -39,6 +39,7 @@ export default {
         let DataFull={
             GetFacData:function(){
                 api.GetFacData().then((res)=>{
+                    if(window.CurrentTargetType!='FAC') return;
                     getDataTimer = setTimeout(function () {
                         //每1分钟主动查询一次数据
                         DataFull.GetFacData()

+ 3 - 0
src/pages/components/In02.vue

@@ -1574,6 +1574,7 @@ export default {
             GetData:function(){
                 if(api==null) return;
                 api.GetData().then((res)=> {
+                    if(window.CurrentTargetType!='IN02') return;
                     dataTimer1 = setTimeout(function () {
                             //每60秒主动查询一次数据
                             DataFull.GetData()
@@ -1602,6 +1603,7 @@ export default {
             },
             GetAlarmData:function(){
                     api.GetAlarmData().then(res=>{
+                        if(window.CurrentTargetType!='IN02') return;
                         dataTimer2 = setTimeout(function () {
                             //每10秒主动查询一次数据
                             DataFull.GetAlarmData()
@@ -1618,6 +1620,7 @@ export default {
             //获取已接入平台设备列表.将在设备模型加载完成后进行初始调用
             GetOnlineDev:function(){
                 api.GetOnlineDev().then(res=> {
+                    if(window.CurrentTargetType!='IN02') return;
                     dataTimer3 = setTimeout(function () {
                         //每5分钟主动查询一次数据
                         DataFull.GetOnlineDev();

+ 7 - 6
src/pages/main/index.vue

@@ -119,7 +119,7 @@ export default {
                 userTimeout: 1000 * 60 * 5, // 用户操作超时设置,毫秒
                 exitTimeout: 1000 * 60 * 60 * 999999, // 用户超时后多久断开会话
                 maxTimeout: 1000, // 会话超时时间,允许掉线后引擎保存多久,在该时间内可重新连接到会话,否则会创建新的会话
-                debug: false // 是否启用调试,开启后调用Native接口时会使用console.log进行记录
+                debug: true // 是否启用调试,开启后调用Native接口时会使用console.log进行记录
             });
             //2.[可选]监听连接成功消息
             player.on("Connected", () => {
@@ -133,7 +133,8 @@ export default {
                 console.log("Disconnected from engine", e);
                 isClearEle.value=true;
                 playerConnState = false
-                facModelLoadState.value=false
+                facModelLoadState.value=false;
+                modelLoadState={};
                 //currentTargetType.value='';
                 //4.[推荐]尝试重新连接
                 reconntimer = setTimeout(function () {
@@ -291,7 +292,7 @@ export default {
             player.Native.Settings.set('specularIntensity', 'float', 1.2);//初始化高光强度
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
-                var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType.value, cf);
+                var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
                 modelLoadState[currentTargetType.value] = true;
             }
             showMarker(currentTargetType.value);
@@ -310,7 +311,7 @@ export default {
             player.Native.Settings.set('specularIntensity', 'float', 1.2);//初始化高光强度
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
-                var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType.value, cf);
+                var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
                 modelLoadState[currentTargetType.value] = true;
             }
             showMarker(currentTargetType.value);
@@ -329,8 +330,8 @@ export default {
             player.Native.Settings.set('diffuseIntensity', 'float', 1);//初始化光线强度
             player.Native.Settings.set('specularIntensity', 'float', 1.2);//初始化高光强度
             if(modelLoadState[currentTargetType.value]==null){
-                var cf = "data://models/d2.pr";
-                var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType.value, cf);
+                var cf = "data://models/T_03.pr";
+                var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
                 modelLoadState[currentTargetType.value] = true;
             }
             showMarker(currentTargetType.value);