|
@@ -63,20 +63,25 @@
|
|
|
<!-- 3d组件放在这里,让它可以隐藏起来,提前加载好场景。要不然后续切换3d场景每次要重新加载,比较麻烦 -->
|
|
|
<!-- <div v-show="state.hasRead && state.showCnt && state.currentChapter.type == 30" class="chapter-3d"> -->
|
|
|
<div v-if="courseChapter3dViewBool == true" class="chapter-3d">
|
|
|
- <!-- CCTV实训检测三维场景逻辑 -->
|
|
|
+
|
|
|
<div v-show="state.hasRead && state.showCnt && state.currentChapter.type == 30">
|
|
|
- <CourseChapter3d
|
|
|
- :config="state?.currentChapter ?? ''"
|
|
|
- :studentTaskIdList="studentTaskIdList"
|
|
|
- @tipsBtnsUpOpen="tipsBtnsUpOpenEvent"
|
|
|
- @tipsBtnsDownOpen="tipsBtnsDownOpenEvent"
|
|
|
- ></CourseChapter3d>
|
|
|
-
|
|
|
- <CourseChapter3dView
|
|
|
- @showOperationHelpExitEvent="showOperationHelpExitEvent"
|
|
|
- @carCameraScreenshot="carCameraScreenshotEvent"
|
|
|
- @carShutDown="carShutDownEvent"
|
|
|
- ></CourseChapter3dView>
|
|
|
+
|
|
|
+ <!-- CCTV实训检测三维场景逻辑 -->
|
|
|
+ <div v-if="state.chapterTree == 'cctv'">
|
|
|
+ <CourseChapter3d
|
|
|
+ :config="state?.currentChapter ?? ''"
|
|
|
+ :studentTaskIdList="studentTaskIdList"
|
|
|
+ @tipsBtnsUpOpen="tipsBtnsUpOpenEvent"
|
|
|
+ @tipsBtnsDownOpen="tipsBtnsDownOpenEvent"
|
|
|
+ ></CourseChapter3d>
|
|
|
+
|
|
|
+ <CourseChapter3dView
|
|
|
+ @showOperationHelpExitEvent="showOperationHelpExitEvent"
|
|
|
+ @carCameraScreenshot="carCameraScreenshotEvent"
|
|
|
+ @carShutDown="carShutDownEvent"
|
|
|
+ ></CourseChapter3dView>
|
|
|
+ </div>
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -598,7 +603,7 @@ const threeWorldLoadTypeEvent = () => {
|
|
|
// console.log("newArray ===>", newArray);
|
|
|
|
|
|
for (let i = 0; i < newArray.length; i++) {
|
|
|
-
|
|
|
+
|
|
|
let objNewArray = newArray[i];
|
|
|
let threeDimensionalConfig = objNewArray["threeDimensionalConfig"];
|
|
|
// console.log("objNewArray", objNewArray);
|