liushengqiang преди 1 година
родител
ревизия
a626962fa9

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/index-abfb0165.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/index-bde7caf3.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/index-c9ca9f71.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/index-legacy-702e0029.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/index-legacy-9f1d5f6c.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/plyr-ad8ef5ae.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/plyr.min-424cfb91.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/plyr.min-legacy-2681f134.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/polyfills-legacy-3b9e9688.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/report-share-0f4c3151.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/report-share-2309fee4.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/report-share-25fea16f.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/report-share-c00bfd89.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/report-share-legacy-8e9e541f.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/report-share-legacy-fd0f2194.js


+ 1 - 1
dist/colexiu.html

@@ -54,7 +54,7 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-555b8239.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-3b9e9688.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-44e113b8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

+ 6 - 4
dist/index.html

@@ -73,12 +73,14 @@
       }
     })
   </script>
-  <script type="module" crossorigin src="./assets/index-abfb0165.js"></script>
+  <script type="module" crossorigin src="./assets/index-bde7caf3.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-8d04e473.js">
   <link rel="modulepreload" crossorigin href="./assets/index-bb4911fd.js">
+  <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-27e2d8d2.css">
   <link rel="stylesheet" href="./assets/index-fc8404d2.css">
-  <link rel="stylesheet" href="./assets/index-21a88d2d.css">
+  <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
+  <link rel="stylesheet" href="./assets/index-c9ca9f71.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -92,8 +94,8 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-555b8239.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-9f1d5f6c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-3b9e9688.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-702e0029.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 1 - 1
dist/orchestra.html

@@ -66,7 +66,7 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-555b8239.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-3b9e9688.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-d9239aa6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

+ 6 - 4
dist/report-share.html

@@ -23,10 +23,12 @@
       transition: opacity .3s;
     }
   </style>
-  <script type="module" crossorigin src="./assets/report-share-25fea16f.js"></script>
+  <script type="module" crossorigin src="./assets/report-share-2309fee4.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-8d04e473.js">
+  <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-27e2d8d2.css">
-  <link rel="stylesheet" href="./assets/report-share-c00bfd89.css">
+  <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
+  <link rel="stylesheet" href="./assets/report-share-0f4c3151.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -47,8 +49,8 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-555b8239.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-fd0f2194.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-3b9e9688.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-8e9e541f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 1 - 1
src/page-gym/evaluat-model/index.tsx

@@ -194,7 +194,7 @@ export default defineComponent({
 				},
 				body: {
 					filePath: res?.content?.filePath,
-					recordId: res?.recordId,
+					recordId: evaluatingData.resultData?.recordId,
 				},
 			});
 			Snackbar.success("上传成功");

BIN
src/report-share/gym-share/share-top/image/videobg.png


+ 45 - 5
src/report-share/gym-share/share-top/index.tsx

@@ -6,8 +6,11 @@ import { api_back } from "/src/helpers/communication";
 import state from "/src/state";
 import iconBack from "./image/icon-back.svg";
 import { Icon, Popup } from "vant";
-import TheVideo from "/src/components/the-video";
-import TheAudio from "/src/components/the-audio";
+
+import videobg from "./image/videobg.png";
+import "plyr/dist/plyr.css";
+import Plyr from "plyr";
+import { nextTick } from "vue";
 
 type IItemType = "intonation" | "cadence" | "integrity";
 
@@ -21,6 +24,11 @@ export default defineComponent({
 	},
 	setup(props) {
 		const { scoreData } = toRefs(props);
+		const shareData = reactive({
+			show: false,
+			isInitPlyr: false,
+			_plrl: null as any,
+		});
 		const level: any = {
 			BEGINNER: "入门级",
 			ADVANCED: "进阶级",
@@ -47,6 +55,20 @@ export default defineComponent({
 			return "video";
 		});
 
+		const openAudioAndVideo = () => {
+			shareData.show = true;
+			if (shareData.isInitPlyr) return;
+			nextTick(() => {
+				const id = mediaType.value === "audio" ? "#audioSrc" : "#videoSrc";
+				shareData._plrl = new Plyr(id, {
+					controls: ["play-large", "play", "progress", 'current-time'],
+					fullscreen: { enabled: false },
+				});
+				shareData.isInitPlyr = true;
+			});
+		};
+
+
 		return () => (
 			<div class={styles.headerTop}>
 				<div class={styles.left}>
@@ -81,12 +103,30 @@ export default defineComponent({
 						</>
 					)}
 				</div>
-				<div style={{ display: scoreData.value.videoFilePath ? "" : "none" }} class={styles.replaybtn} onClick={() => (showVideo.value = true)}>
+				<div style={{ display: scoreData.value.videoFilePath ? "" : "none" }} class={styles.replaybtn} onClick={openAudioAndVideo}>
 					<Icon class={styles.iconBtn} name="replay" />
 					<span>查看回放</span>
 				</div>
-				<Popup class={["popup-custom", "van-scale", styles.popup]} transition="van-scale" v-model:show={showVideo.value} closeable>
-					{mediaType.value === 'video' ? <TheVideo src={showVideo.value ? scoreData.value.videoFilePath : ""} /> : <TheAudio src={showVideo.value ? scoreData.value.videoFilePath : ""} />}
+				<Popup
+					teleport="body"
+					class={["popup-custom", "van-scale", styles.popup]}
+					transition="van-scale"
+					v-model:show={shareData.show}
+					closeable
+					onClose={() => {
+						shareData._plrl?.pause();
+					}}
+				>
+					{mediaType.value === "audio" && (
+						<div class={styles.audiobox}>
+							<audio id="audioSrc" src={scoreData.value.videoFilePath} controls="false" preload="metadata" playsinline />
+						</div>
+					)}
+					{mediaType.value === "video" && (
+						<div class={styles.videobox}>
+							<video id="videoSrc" class={styles.videoBox} src={scoreData.value.videoFilePath} data-poster={videobg} preload="metadata" playsinline />
+						</div>
+					)}
 				</Popup>
 			</div>
 		);

Някои файлове не бяха показани, защото твърде много файлове са промени