配置修改

.env.devProd

@@ -1,3 +1,5 @@
-# 开发打包
 
-VITE_APP_URL = "https://dev.resource.colexiu.com/cbs-app"
+VITE_APP_URL = "http://192.168.3.122:9527/pptApi"
+
+## 云教练地址
+VITE_YJL_URL = "https://test.kt.colexiu.com/instrument"

.env.production

@@ -1,3 +1,5 @@
-# 生产环境
 
-VITE_APP_URL = "https://mec.colexiu.com/cbs-app"
+VITE_APP_URL = "http://192.168.3.122:9527/pptApi"
+
+## 云教练地址
+VITE_YJL_URL = "https://test.kt.colexiu.com/instrument"

.env.staging

@@ -1,3 +1,5 @@
-# 测试环境
 
-VITE_APP_URL = "https://test.resource.colexiu.com/cbs-app"
+VITE_APP_URL = "http://192.168.3.122:9527/pptApi"
+
+## 云教练地址
+VITE_YJL_URL = "https://test.kt.colexiu.com/instrument"

public/data.json

@@ -1,96 +0,0 @@
-{
-  "width": 1920,
-  "height": 1080,
-  "theme": {
-    "themeColor": "#5b9bd5",
-    "fontColor": "#333",
-    "fontName": "Microsoft Yahei",
-    "backgroundColor": "#fff",
-    "shadow": {
-      "h": 3,
-      "v": 3,
-      "blur": 2,
-      "color": "#808080"
-    },
-    "outline": {
-      "width": 2,
-      "color": "#525252",
-      "style": "solid"
-    }
-  },
-  "slides": [
-    {
-      "elements": [
-        {
-          "type": "video",
-          "subtype": "elf-video",
-          "id": "xvUVnf",
-          "left": 161.70000000000002,
-          "top": 110.9,
-          "width": 639,
-          "height": 360,
-          "name": "media1",
-          "src": "https://oss.dayaedu.com/pptList/media1.mp4",
-          "poster": "https://oss.dayaedu.com/pptList/image1.png",
-          "videoSize": 741673,
-          "posterSize": 0,
-          "md5": "47d9366652b30595f88fc768cda19857"
-        },
-        {
-          "type": "audio",
-          "subtype": "elf-audio",
-          "id": "B_Qxvx",
-          "left": 1231.7,
-          "top": 64.8,
-          "width": 400,
-          "height": 50,
-          "src": "https://oss.dayaedu.com/pptList/media2.mp3",
-          "name": "media2",
-          "focusOrder": 1,
-          "size": 29318632,
-          "md5": "f81693a4e832793da5db98ccf255aa2c"
-        },
-        {
-          "type": "shape",
-          "id": "UmJVMI",
-          "left": 362.1,
-          "top": 61.8,
-          "width": 640.0000000000001,
-          "height": 58,
-          "rotate": 0,
-          "viewBox": [200, 200],
-          "fixedRatio": false,
-          "fill": "transparent",
-          "path": "M 0 0 L 200 0 L 200 200 L 0 200 Z",
-          "text": {
-            "content": "<p style=><span style=\"font-family:Sans-serif\"><span style=\"font-size:36px;color:#000000;\">视频</span></span></p>",
-            "defaultColor": "#000000",
-            "defaultFontName": "Sans-serif",
-            "align": "top"
-          },
-          "outline": { "style": "solid", "width": 1, "color": "transparent" }
-        },
-        {
-          "type": "shape",
-          "id": "jEyG30",
-          "left": 1149,
-          "top": 28.8,
-          "width": 640.0000000000001,
-          "height": 58,
-          "rotate": 0,
-          "viewBox": [200, 200],
-          "fixedRatio": false,
-          "fill": "transparent",
-          "path": "M 0 0 L 200 0 L 200 200 L 0 200 Z",
-          "text": {
-            "content": "<p style=><span style=\"font-family:Sans-serif\"><span style=\"font-size:36px;color:#000000;\">文本</span></span></p>",
-            "defaultColor": "#000000",
-            "defaultFontName": "Sans-serif",
-            "align": "top"
-          },
-          "outline": { "style": "solid", "width": 1, "color": "transparent" }
-        }
-      ]
-    }
-  ]
-}

public/json.json

@@ -1,236 +0,0 @@
-{
-  "width": 1000,
-  "height": 562.5,
-  "slides": [
-    {
-      "id": "test-slide-1",
-      "elements": [
-        {
-          "type": "shape",
-          "id": "4cbRxp",
-          "left": 0,
-          "top": 200,
-          "width": 546,
-          "height": 362.5,
-          "viewBox": [200, 200],
-          "path": "M 0 0 L 0 200 L 200 200 Z",
-          "fill": "#5b9bd5",
-          "fixedRatio": false,
-          "opacity": 0.7,
-          "rotate": 0
-        },
-        {
-          "type": "shape",
-          "id": "ookHrf",
-          "left": 0,
-          "top": 0,
-          "width": 300,
-          "height": 320,
-          "viewBox": [200, 200],
-          "path": "M 0 0 L 0 200 L 200 200 Z",
-          "fill": "#5b9bd5",
-          "fixedRatio": false,
-          "flipV": true,
-          "rotate": 0
-        },
-        {
-          "type": "text",
-          "id": "idn7Mx",
-          "left": 330.77256944444446,
-          "top": 56.403573956121726,
-          "width": 450,
-          "height": 154.390625,
-          "lineHeight": 1.2,
-          "content": "<p><strong><span style=\"font-size: 112px;\">ppt</span></strong></p>",
-          "rotate": 0,
-          "defaultFontName": "Microsoft Yahei",
-          "defaultColor": "#333"
-        },
-        {
-          "type": "text",
-          "id": "7stmVP",
-          "left": 355,
-          "top": 253.25,
-          "width": 585,
-          "height": 56,
-          "content": "<p><span style=\"font-size: 24px;\">在线演示文稿应用</span></p>",
-          "rotate": 0,
-          "defaultFontName": "Microsoft Yahei",
-          "defaultColor": "#333"
-        },
-        {
-          "type": "line",
-          "id": "FnpZs4",
-          "left": 361,
-          "top": 238,
-          "start": [0, 0],
-          "end": [549, 0],
-          "points": ["", ""],
-          "color": "#5b9bd5",
-          "style": "solid",
-          "width": 2
-        },
-        {
-          "type": "video",
-          "id": "p9JLe2NTxh",
-          "width": 500,
-          "height": 300,
-          "rotate": 0,
-          "left": 55.77256944444443,
-          "top": 50,
-          "src": "https://oss.dayaedu.com/pptList/123.mp4",
-          "autoplay": false
-        },
-        {
-          "type": "cloudCoach",
-          "id": "bZnpOCbu1b",
-          "width": 584.4184027777778,
-          "height": 395.39930555555554,
-          "rotate": 0,
-          "left": 379.7743055555555,
-          "top": 152.30034722222223,
-          "url": "https://test.kt.colexiu.com/instrument?v=1732169770713&modelType=practise&id=1760123974848413697&Authorization=bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsib2F1dGgyLXJlc291cmNlIl0sImNsaWVudFR5cGUiOiJURUFDSEVSIiwidXNlcl9uYW1lIjoiMTgzODM2MTk4ODUiLCJzY29wZSI6WyJhbGwiXSwidXNlcklkIjoiMTA0MTY3Iiwibm9uY2UiOiIiLCJhdXRob3JpdGllcyI6WyIxODM4MzYxOTg4NSJdLCJqdGkiOiJhOGJiNzZkMC1jODJhLTQwOTktOWI2OS1lMDllZWRjMjVjYjAiLCJjbGllbnRfaWQiOiJjb29sZXNob3ctdGVhY2hlciJ9.KU6WVr17DDqtKNZGmDvwVvAyFitFL6N4X9nfqRlp5jNl1mIwmPknBZiHXVj_1Qij5IvvHtZZaQxiKPHnjF6dqpFtcS-poy_G68tiSsdH05Hl2rIWwBzuUT8iZMRBtYbIcPSB3_TdG4dHsYH-4A7PbcM-EDmYyEAc9rFznkrd4IsCxF0GpymXZe6_GlIX7RfubAmERwFZoG9qzUR25PYB-sO4kdTqh-JIWnEGb5axSvanXmSvGGUglG3dOq61WnMAuXvF1kx23iPwt6u91OovffDpQviVeHhbHFa7nZOxkWivCufy89hcFjkyoEpsAoZSincp63qc2D9XHha5j4xO5A&platform=pc&zoom=0.8&instrumentId=",
-          "isMove": false
-        },
-        {
-          "type": "audio",
-          "id": "ssAvfUTuHc",
-          "width": 50,
-          "height": 50,
-          "rotate": 0,
-          "left": 761.624203821656,
-          "top": 31.403573956121726,
-          "loop": false,
-          "autoplay": false,
-          "fixedRatio": true,
-          "color": "#5b9bd5",
-          "src": "https://oss.dayaedu.com/pptList/TAJjZIc.mp3"
-        }
-      ],
-      "background": { "type": "solid", "color": "#ffffff" },
-      "animations": [{ "id": "-zUURDmngj", "elId": "p9JLe2NTxh", "type": "in", "effect": "bounceInRight", "duration": 1000, "trigger": "click" }]
-    },
-    {
-      "id": "test-slide-2",
-      "elements": [
-        {
-          "type": "text",
-          "id": "ptNnUJ",
-          "left": 145,
-          "top": 148,
-          "width": 711,
-          "height": 77.59375,
-          "lineHeight": 1.2,
-          "content": "<p style=\"text-align: center;\"><strong><span style=\"font-size: 48px;\">在此处添加标题</span></strong></p>",
-          "rotate": 0,
-          "defaultFontName": "Microsoft Yahei",
-          "defaultColor": "#333"
-        },
-        {
-          "type": "text",
-          "id": "mRHvQN",
-          "left": 207.50000000000003,
-          "top": 249.84259259259264,
-          "width": 585,
-          "height": 56,
-          "content": "<p style=\"text-align: center;\"><span style=\"font-size: 24px;\">在此处添加副标题</span></p>",
-          "rotate": 0,
-          "defaultFontName": "Microsoft Yahei",
-          "defaultColor": "#333"
-        },
-        {
-          "type": "line",
-          "id": "7CQDwc",
-          "left": 323.09259259259267,
-          "top": 238.33333333333334,
-          "start": [0, 0],
-          "end": [354.8148148148148, 0],
-          "points": ["", ""],
-          "color": "#5b9bd5",
-          "style": "solid",
-          "width": 4
-        },
-        {
-          "type": "shape",
-          "id": "09wqWw",
-          "left": -27.648148148148138,
-          "top": 432.73148148148147,
-          "width": 1056.2962962962963,
-          "height": 162.96296296296296,
-          "viewBox": [200, 200],
-          "path": "M 0 20 C 40 -40 60 60 100 20 C 140 -40 160 60 200 20 L 200 180 C 140 240 160 140 100 180 C 40 240 60 140 0 180 L 0 20 Z",
-          "fill": "#5b9bd5",
-          "fixedRatio": false,
-          "rotate": 0
-        },
-        {
-          "type": "cloudCoach",
-          "id": "Z4sf4hqHuC",
-          "width": 704.9,
-          "height": 503.9,
-          "rotate": 0,
-          "left": 0.5,
-          "top": 68.4,
-          "url": "https://test.kt.colexiu.com/instrument?v=1732169722357&modelType=practise&id=1760123974848413697&Authorization=bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsib2F1dGgyLXJlc291cmNlIl0sImNsaWVudFR5cGUiOiJURUFDSEVSIiwidXNlcl9uYW1lIjoiMTgzODM2MTk4ODUiLCJzY29wZSI6WyJhbGwiXSwidXNlcklkIjoiMTA0MTY3Iiwibm9uY2UiOiIiLCJhdXRob3JpdGllcyI6WyIxODM4MzYxOTg4NSJdLCJqdGkiOiJhOGJiNzZkMC1jODJhLTQwOTktOWI2OS1lMDllZWRjMjVjYjAiLCJjbGllbnRfaWQiOiJjb29sZXNob3ctdGVhY2hlciJ9.KU6WVr17DDqtKNZGmDvwVvAyFitFL6N4X9nfqRlp5jNl1mIwmPknBZiHXVj_1Qij5IvvHtZZaQxiKPHnjF6dqpFtcS-poy_G68tiSsdH05Hl2rIWwBzuUT8iZMRBtYbIcPSB3_TdG4dHsYH-4A7PbcM-EDmYyEAc9rFznkrd4IsCxF0GpymXZe6_GlIX7RfubAmERwFZoG9qzUR25PYB-sO4kdTqh-JIWnEGb5axSvanXmSvGGUglG3dOq61WnMAuXvF1kx23iPwt6u91OovffDpQviVeHhbHFa7nZOxkWivCufy89hcFjkyoEpsAoZSincp63qc2D9XHha5j4xO5A&platform=pc&zoom=0.8&instrumentId=",
-          "isMove": false
-        }
-      ],
-      "background": { "type": "solid", "color": "#fff" },
-      "animations": [{ "id": "_ZhSTeu5gA", "elId": "Z4sf4hqHuC", "type": "in", "effect": "rotateIn", "duration": 1000, "trigger": "click" }]
-    },
-    {
-      "id": "test-slide-3",
-      "elements": [
-        {
-          "type": "shape",
-          "id": "vSheCJ",
-          "left": 183.5185185185185,
-          "top": 175.5092592592593,
-          "width": 605.1851851851851,
-          "height": 185.18518518518516,
-          "viewBox": [200, 200],
-          "path": "M 0 0 L 200 0 L 200 200 L 0 200 Z",
-          "fill": "#5b9bd5",
-          "fixedRatio": false,
-          "rotate": 0
-        },
-        {
-          "type": "shape",
-          "id": "Mpwv7x",
-          "left": 211.29629629629628,
-          "top": 201.80555555555557,
-          "width": 605.1851851851851,
-          "height": 185.18518518518516,
-          "viewBox": [200, 200],
-          "path": "M 0 0 L 200 0 L 200 200 L 0 200 Z",
-          "fill": "#5b9bd5",
-          "fixedRatio": false,
-          "rotate": 0,
-          "opacity": 0.7
-        },
-        {
-          "type": "text",
-          "id": "WQOTAp",
-          "left": 304.9074074074074,
-          "top": 198.10185185185182,
-          "width": 417.9629629629629,
-          "height": 140,
-          "content": "<p style=\"text-align: center;\"><strong><span style=\"font-size: 80px;\"><span style=\"color: rgb(255, 255, 255);\">感谢观看</span></span></strong></p>",
-          "rotate": 0,
-          "defaultFontName": "Microsoft Yahei",
-          "defaultColor": "#333",
-          "wordSpace": 5
-        }
-      ],
-      "background": { "type": "solid", "color": "#fff" }
-    }
-  ],
-  "theme": {
-    "themeColor": "#5b9bd5",
-    "fontColor": "#333",
-    "fontName": "Microsoft Yahei",
-    "backgroundColor": "#fff",
-    "shadow": { "h": 3, "v": 3, "blur": 2, "color": "#808080" },
-    "outline": { "width": 2, "color": "#525252", "style": "solid" }
-  }
-}

public/pptworker/pptJson.js

@@ -65599,8 +65599,10 @@
             Si = {
                uuid: cn(),
                slides: [],
+               // hqy
                width: 1920,
                height: 1080,
+               // hqy
                theme: {
                   themeColor: "#5b9bd5",
                   fontColor: "#333",

src/hooks/useImport.ts

@@ -14,7 +14,7 @@ export default () => {
   })
   // 导入PPTX文件
   const importPPTXFile = (files: FileList) => {
-    getHttpJson("./mjkJson/8.json").then(res => {
+    getHttpJson("./mjkJson/9.json").then(res => {
       if (res.code === 200) {
         jsonToPpt(res.data)
       } else {