人生啊人生 il y a 2 mois
Parent
commit
47e76ced3e

+ 38 - 113
src/components/ThreeWorldEventQingXiCheAndQv/QingXiCheAndQvMain.vue

@@ -24,6 +24,29 @@ import { WindowEvent } from "../WindowQingXiCheAndQv/js/WindowEvent.js";
 
 
 
+
+
+// 接收参数
+const props = defineProps({
+    // 发视变化,则初始化三维场景到第一个步骤
+    initTime: {
+        type: String
+    },
+});
+
+// 监听某个参数发生变化
+watch(
+    () => props.initTime,
+    (newVal, oldVal) => {
+
+        // 发视变化,则初始化三维场景到第一个步骤
+        QingXiCheEventInit();
+        
+
+    }
+)
+
+
 // 定义发射给父组件的方法
 const emits = defineEmits([
     // 回调进度
@@ -79,120 +102,19 @@ const ComReturnCallbackExit = () => {
 }
 
 
-/**
- * 切换菜单,触发不同逻辑
- * name         切换的菜单
- */
-const menuEvent = (name) => {
-
-    for (let key in QingXiCheAndQvMyThreeWorldStore().obj.menu) {
-        QingXiCheAndQvMyThreeWorldStore().obj.menu[key] = false;
-    }
-
-    QingXiCheAndQvMyThreeWorldStore().obj.menu[name] = true;
-
-    let thisTime = new Date().getTime();
-
-    // console.log(
-    //     "QingXiCheAndQvMyThreeWorldStore().obj.menu", QingXiCheAndQvMyThreeWorldStore().obj.menu
-    // );
-
-    QingXiCheAndQvProcessEventStore().obj.listIndex = -1;
-
-    // 城市供水管道巡查调度虚拟仿真
-    if (QingXiCheAndQvMyThreeWorldStore().obj.menu.mapGps == true) {
-
-        return;
-    }
-
-    // 城市供水管道维护清洗虚拟仿真
-    if (QingXiCheAndQvMyThreeWorldStore().obj.menu.waterPipe == true) {
-        // QingXiCheAndQvCarEvent.find().evnetInit_1();
-
-        // // 自动触发到第1个步骤
-        // QingXiCheAndQvProcessEventStore().obj.listIndex = 0;
-        
-        // 循环找到指定名字的流程,来开始
-        for (let processEventStoreListI = 0; processEventStoreListI < QingXiCheAndQvProcessEventStore().obj.list.length; processEventStoreListI++) {
-            let thisList = QingXiCheAndQvProcessEventStore().obj.list[processEventStoreListI];
-            if (thisList.name == "仿真模拟") {
-            // if (thisList.name == "下车确定安全灯显示是否正常") {
-                QingXiCheAndQvProcessEventStore().obj.listIndex = processEventStoreListI;
-            }
-        }
-        
-        // 进入触发当前步骤的逻辑
-        QingXiCheAndQvCarEvent.find().typeEvent(
-            QingXiCheAndQvProcessEventStore().obj.list[QingXiCheAndQvProcessEventStore().obj.listIndex].name
-        );
-
-        // 上一步按钮是否展示
-        QingXiCheAndQvCarEvent.find().tipsBtnsUpOpenEventCallback = function(openBool) {
-            QingXiCheAndQvProcessEventStore().obj.btnUp = openBool;
-        };
-
-        // 下一步按钮是否展示
-        QingXiCheAndQvCarEvent.find().tipsBtnsDownOpenEventCallback = function(openBool) {
-            QingXiCheAndQvProcessEventStore().obj.btnDown = openBool;
-        };
-
-        setTimeout(function() {
-            QingXiCheAndQvThreeWorldEventMain.find().commonBirthplaceUpdate();
-        }, 1600);
-        
-        return;
-    }
-
-    // 城市供水管道检测虚拟仿真
-    if (QingXiCheAndQvMyThreeWorldStore().obj.menu.look == true) {
-        timeResetInitGroundDownCar.value = "" + thisTime;
-        return;
-    }
-
-    // 城市供水管道数智修复虚拟仿真
-    if (QingXiCheAndQvMyThreeWorldStore().obj.menu.repair == true) {
-        
-        // 循环找到指定名字的流程,来开始
-        for (let processEventStoreListI = 0; processEventStoreListI < QingXiCheAndQvProcessEventStore().obj.list.length; processEventStoreListI++) {
-            let thisList = QingXiCheAndQvProcessEventStore().obj.list[processEventStoreListI];
-            // if (thisList.name == "数字修复虚拟仿真-将橡胶垫片放置到正确的位置") {
-            if (thisList.name == "数字修复虚拟仿真-将阀门关闭停止水流") {
-                QingXiCheAndQvProcessEventStore().obj.listIndex = processEventStoreListI;
-            }
-        }
-        
-        // 进入触发当前步骤的逻辑
-        QingXiCheAndQvCarEvent.find().typeEvent(
-            QingXiCheAndQvProcessEventStore().obj.list[QingXiCheAndQvProcessEventStore().obj.listIndex].name
-        );
-
-        // 上一步按钮是否展示
-        QingXiCheAndQvCarEvent.find().tipsBtnsUpOpenEventCallback = function(openBool) {
-            QingXiCheAndQvProcessEventStore().obj.btnUp = openBool;
-        };
-
-        // 下一步按钮是否展示
-        QingXiCheAndQvCarEvent.find().tipsBtnsDownOpenEventCallback = function(openBool) {
-            QingXiCheAndQvProcessEventStore().obj.btnDown = openBool;
-        };
-
-        QingXiCheAndQvProcessEventStore().obj.btnUp = false;
-        QingXiCheAndQvProcessEventStore().obj.btnDown = false;
-
-        setTimeout(function() {
-            QingXiCheAndQvThreeWorldEventMain.find().commonBirthplaceUpdate();
-        }, 1600);
-
-        return;
-    }
-
-    // 回到人物视角
-    if (QingXiCheAndQvMyThreeWorldStore().obj.menu.roleLook == true) {
-        QingXiCheAndQvThreeWorldEventMain.find().toRoleEvent();
-        return;
-    }
+// /**
+//  * 切换菜单,触发不同逻辑
+//  * name         切换的菜单
+//  */
+// const menuEvent = (name) => {
+    
+//     // 回到人物视角
+//     if (QingXiCheAndQvMyThreeWorldStore().obj.menu.roleLook == true) {
+//         QingXiCheAndQvThreeWorldEventMain.find().toRoleEvent();
+//         return;
+//     }
 
-}
+// }
 
 watch(
 
@@ -347,8 +269,11 @@ const QvStepUpdate = (name) => {
         <div
         v-if="CommonVal().loadSuccess == true"
         >
+
+            <!-- 控制上一步,下一步 进度的UI -->
             <QingXiCheAndQvProcessEvent @callbackProcess="callbackProcessEvent"
             v-show="QingXiCheAndQvProcessEventStore().obj.listIndex > -1" ></QingXiCheAndQvProcessEvent>
+            
         </div>
         
     </div>

+ 9 - 2
src/view/student/trainChapter/trainChapter.vue

@@ -89,7 +89,8 @@
                     @carShutDown="carShutDownEvent"
                 ></CourseChapter3dView> -->
                 
-                <QingXiCheAndQvMain @callbackProgress="callbackProgressQingXiCheAndQv" ></QingXiCheAndQvMain>
+                <QingXiCheAndQvMain :initTime="initTimeQingXiCarAndQv"
+                @callbackProgress="callbackProgressQingXiCheAndQv" ></QingXiCheAndQvMain>
 
             </div>
         </div>
@@ -151,6 +152,9 @@ let courseChapter3dViewBool = ref(false);
  */
 let stepTipsLook = ref(true);
 
+// 控制清洗车回到第一个流程逻辑
+let initTimeQingXiCarAndQv = ref("0");
+
 const buildChapterQueue = (data: anyObj[], optionChapters: anyObj[], root = true): anyObj[] => {
     let chapters: anyObj[] = [];
     data?.forEach((item, idx) => {
@@ -276,7 +280,10 @@ const initTips = () => {
      * 所以这里进行特殊处理
      */
     if (typeof threeDimensionalConfig == "string" && threeDimensionalConfig == "仿真模拟_清洗车") {
-        
+        var thisTime = new Date().getTime();
+
+        initTimeQingXiCarAndQv.value = "" + thisTime;
+
         // 此时进入三维场景,就默认进入到最后一个步骤
         state.tipsBtns = [
             {