人生啊人生 10 月之前
父节点
当前提交
bee274a9b8
共有 55 个文件被更改,包括 45 次插入8 次删除
  1. 二进制
      src/assets/login/backgroud.jpg
  2. 二进制
      src/assets/student/bg.jpg
  3. 二进制
      src/assets/student/bg_card.png
  4. 二进制
      src/assets/student/bg_describe.png
  5. 二进制
      src/assets/student/border.png
  6. 二进制
      src/assets/student/btn_back.png
  7. 二进制
      src/assets/student/btn_help.png
  8. 二进制
      src/assets/student/clickRotation.png
  9. 二进制
      src/assets/student/header.png
  10. 二进制
      src/assets/student/indicateContent.png
  11. 二进制
      src/assets/student/indicateContent2.png
  12. 二进制
      src/assets/student/screen.png
  13. 二进制
      src/assets/student/screenExit.png
  14. 二进制
      src/assets/student/showOperationHelp/bg.webp
  15. 二进制
      src/assets/student/showOperationHelp/exit.webp
  16. 二进制
      src/assets/student/showOperationHelp/help.webp
  17. 二进制
      src/assets/student/showOperationHelp/txt.webp
  18. 二进制
      src/assets/student/step/report.png
  19. 二进制
      src/assets/student/step/report_share.png
  20. 二进制
      src/assets/student/step/training.png
  21. 二进制
      src/assets/student/tips_bg.png
  22. 二进制
      src/assets/student/tips_cancel.png
  23. 二进制
      src/assets/student/tispTost.png
  24. 二进制
      src/assets/student/toast/btn.webp
  25. 二进制
      src/assets/student/toast/exit.webp
  26. 二进制
      src/assets/student/toast/window.webp
  27. 二进制
      src/assets/student/training.png
  28. 二进制
      src/assets/student/training/menu-item-button-selected.png
  29. 二进制
      src/assets/student/training/menu-item-button.png
  30. 二进制
      src/assets/student/training/menu_icon.png
  31. 二进制
      src/assets/student/training/step_finish.png
  32. 二进制
      src/assets/student/training/step_process.png
  33. 二进制
      src/assets/student/training/task-doc-huge.png
  34. 二进制
      src/assets/student/training/task-download.png
  35. 二进制
      src/assets/student/training/window_bg.png
  36. 二进制
      src/assets/student/trainingMain/bg.webp
  37. 二进制
      src/assets/student/trainingMain/btnBg.webp
  38. 二进制
      src/assets/student/trainingMain/directionRight.webp
  39. 二进制
      src/assets/student/trainingMain/helpBack.webp
  40. 二进制
      src/assets/student/trainingMain/matter.webp
  41. 二进制
      src/assets/student/trainingMain/selectRight.webp
  42. 二进制
      src/assets/student/trainingMain/threeWord.webp
  43. 二进制
      src/assets/student/trainingMain/titleBg.webp
  44. 二进制
      src/assets/student/trainingMain/tool.png
  45. 二进制
      src/assets/techer/scope-comp.png
  46. 二进制
      src/assets/techer/scope-inproc.png
  47. 二进制
      src/assets/techer/scope-scoped.png
  48. 二进制
      src/assets/techer/scope-share.png
  49. 二进制
      src/assets/techer/scope-total.png
  50. 6 3
      src/components/student/CourseChapter3d.vue
  51. 14 1
      src/components/student/ThreeWorldEvent/event/TypeEvent.ts
  52. 8 1
      src/components/student/ThreeWorldEvent/js/ThreeWorldEvent.ts
  53. 8 1
      src/components/student/ThreeWorldEvent/js/ThreeWorldEventMain.ts
  54. 3 1
      src/view/LogIn.vue
  55. 6 1
      src/view/student/components/stepTips.vue

二进制
src/assets/login/backgroud.jpg


二进制
src/assets/student/bg.jpg


二进制
src/assets/student/bg_card.png


二进制
src/assets/student/bg_describe.png


二进制
src/assets/student/border.png


二进制
src/assets/student/btn_back.png


二进制
src/assets/student/btn_help.png


二进制
src/assets/student/clickRotation.png


二进制
src/assets/student/header.png


二进制
src/assets/student/indicateContent.png


二进制
src/assets/student/indicateContent2.png


二进制
src/assets/student/screen.png


二进制
src/assets/student/screenExit.png


二进制
src/assets/student/showOperationHelp/bg.webp


二进制
src/assets/student/showOperationHelp/exit.webp


二进制
src/assets/student/showOperationHelp/help.webp


二进制
src/assets/student/showOperationHelp/txt.webp


二进制
src/assets/student/step/report.png


二进制
src/assets/student/step/report_share.png


二进制
src/assets/student/step/training.png


二进制
src/assets/student/tips_bg.png


二进制
src/assets/student/tips_cancel.png


二进制
src/assets/student/tispTost.png


二进制
src/assets/student/toast/btn.webp


二进制
src/assets/student/toast/exit.webp


二进制
src/assets/student/toast/window.webp


二进制
src/assets/student/training.png


二进制
src/assets/student/training/menu-item-button-selected.png


二进制
src/assets/student/training/menu-item-button.png


二进制
src/assets/student/training/menu_icon.png


二进制
src/assets/student/training/step_finish.png


二进制
src/assets/student/training/step_process.png


二进制
src/assets/student/training/task-doc-huge.png


二进制
src/assets/student/training/task-download.png


二进制
src/assets/student/training/window_bg.png


二进制
src/assets/student/trainingMain/bg.webp


二进制
src/assets/student/trainingMain/btnBg.webp


二进制
src/assets/student/trainingMain/directionRight.webp


二进制
src/assets/student/trainingMain/helpBack.webp


二进制
src/assets/student/trainingMain/matter.webp


二进制
src/assets/student/trainingMain/selectRight.webp


二进制
src/assets/student/trainingMain/threeWord.webp


二进制
src/assets/student/trainingMain/titleBg.webp


二进制
src/assets/student/trainingMain/tool.png


二进制
src/assets/techer/scope-comp.png


二进制
src/assets/techer/scope-inproc.png


二进制
src/assets/techer/scope-scoped.png


二进制
src/assets/techer/scope-share.png


二进制
src/assets/techer/scope-total.png


+ 6 - 3
src/components/student/CourseChapter3d.vue

@@ -156,7 +156,8 @@ const initScene = () => {
         objNewIframe,
         objNewIframe.objIframe,
         objNewIframe.objIframe.ChengGuangYuanJing.CommonVal.find().objScene,
-        objNewIframe.objIframe.BABYLON
+        objNewIframe.objIframe.BABYLON,
+        storesObj
     );
 
     ThreeWorldEventMain.find().groundNoRemove();
@@ -165,14 +166,16 @@ const initScene = () => {
         objNewIframe,
         objNewIframe.objIframe,
         objNewIframe.objIframe.ChengGuangYuanJing.CommonVal.find().objScene,
-        objNewIframe.objIframe.BABYLON
+        objNewIframe.objIframe.BABYLON,
+        storesObj
     );
 
     TypeEvent.find().initObj(
         objNewIframe,
         objNewIframe.objIframe,
         objNewIframe.objIframe.ChengGuangYuanJing.CommonVal.find().objScene,
-        objNewIframe.objIframe.BABYLON
+        objNewIframe.objIframe.BABYLON,
+        storesObj
     );
 
     TypeEvent.find().typeEvent(props.config?.threeDimensionalConfig);

+ 14 - 1
src/components/student/ThreeWorldEvent/event/TypeEvent.ts

@@ -11,6 +11,11 @@ export class TypeEvent {
     public objScene : any = null;
     // babylon 对象,懂babylon,就可以使用babylon的api去操作
     public BABYLON : any = null;
+
+    /**
+     * stores 合集对象
+     */
+    public storesObj : any = null;
     
     static instance: any;
 
@@ -33,8 +38,9 @@ export class TypeEvent {
      * objIframe        iframe对象
      * objScene         场景对象
      * BABYLON          babylon.js对象,用于后续调用babylon的代码去创建更新等操作
+     * storesObj        stores 合集对象
      */
-    initObj = (objIframeEdit : any, objIframe : any, objScene : any, BABYLON : any) => {
+    initObj = (objIframeEdit : any, objIframe : any, objScene : any, BABYLON : any, storesObj : any) => {
         
         if (this.objIframe != null && this.objIframe != undefined) {
             return this;
@@ -44,6 +50,7 @@ export class TypeEvent {
         this.objIframe = objIframe;
         this.objScene = objScene;
         this.BABYLON = BABYLON;
+        this.storesObj = storesObj;
         
         return this;
 
@@ -85,6 +92,12 @@ export class TypeEvent {
     }
     
 
+    
+
+
+
+    
+
 }
 
 

+ 8 - 1
src/components/student/ThreeWorldEvent/js/ThreeWorldEvent.ts

@@ -17,6 +17,11 @@ export class ThreeWorldEvent {
     // 记录鼠标最后一次点击的时间戳
     public clickTime : any = 0;
 
+    /**
+     * stores 合集对象
+     */
+    public storesObj : any = null;
+
     static instance: any;
     
     // 每次 new 出对象则会调用这个构造函数
@@ -38,8 +43,9 @@ export class ThreeWorldEvent {
      * objIframe        iframe对象
      * objScene         场景对象
      * BABYLON          babylon.js对象,用于后续调用babylon的代码去创建更新等操作
+     * storesObj        stores 合集对象
      */
-    initObj = (objIframeEdit:any, objIframe:any, objScene:any, BABYLON:any) => {
+    initObj = (objIframeEdit:any, objIframe:any, objScene:any, BABYLON:any, storesObj : any) => {
         
         if (this.objIframe != null && this.objIframe != undefined) {
             return this;
@@ -49,6 +55,7 @@ export class ThreeWorldEvent {
         this.objIframe = objIframe;
         this.objScene = objScene;
         this.BABYLON = BABYLON;
+        this.storesObj = storesObj;
         
         this.pointerEvent();
         this.renderEvent();

+ 8 - 1
src/components/student/ThreeWorldEvent/js/ThreeWorldEventMain.ts

@@ -11,6 +11,11 @@ export class ThreeWorldEventMain {
     public objScene : any = null;
     // babylon 对象,懂babylon,就可以使用babylon的api去操作
     public BABYLON : any = null;
+
+    /**
+     * stores 合集对象
+     */
+    public storesObj : any = null;
     
     static instance: any;
 
@@ -33,8 +38,9 @@ export class ThreeWorldEventMain {
      * objIframe        iframe对象
      * objScene         场景对象
      * BABYLON          babylon.js对象,用于后续调用babylon的代码去创建更新等操作
+     * storesObj        stores 合集对象
      */
-    initObj = (objIframeEdit : any, objIframe : any, objScene : any, BABYLON : any) => {
+    initObj = (objIframeEdit : any, objIframe : any, objScene : any, BABYLON : any, storesObj : any) => {
         
         if (this.objIframe != null && this.objIframe != undefined) {
             return this;
@@ -44,6 +50,7 @@ export class ThreeWorldEventMain {
         this.objIframe = objIframe;
         this.objScene = objScene;
         this.BABYLON = BABYLON;
+        this.storesObj = storesObj;
         
         return this;
 

+ 3 - 1
src/view/LogIn.vue

@@ -254,7 +254,9 @@ onMounted(() => {
     --el-input-border-color: #4b92b9;
 }
 :deep(.el-input__wrapper) {
-    background-color: #1a2854;
+    // background-color: #1a2854;
+    border: 2px solid #4BA3B9;
+    background: #1A4854;
 }
 :deep(.el-input__inner) {
     --el-input-inner-height: 4.2rem;

+ 6 - 1
src/view/student/components/stepTips.vue

@@ -66,7 +66,12 @@ watch(
         display: flex;
         width: 100%;
         height: 4.2rem;
-        background: linear-gradient(86deg, rgba(58, 100, 150, 0.26) 0%, #3a6496 17%, #3a6496 59%, rgba(58, 100, 150, 0) 90%);
+        // background: linear-gradient(86deg, rgba(58, 100, 150, 0.26) 0%, #3a6496 17%, #3a6496 59%, rgba(58, 100, 150, 0) 90%);
+
+        border-top: 2px solid rgba(60, 246, 218, 0.16);
+        border-bottom: 2px solid rgba(60, 246, 218, 0.16);
+        background: linear-gradient(90deg, rgba(58, 150, 136, 0.26) 0.01%, #3A9688 19.06%, #3A9688 65.77%, rgba(58, 150, 136, 0.00) 100%);
+        
     }
     .tips-msg {
         margin: 0 10rem 0 16rem;