Quellcode durchsuchen

Merge remote-tracking branch 'origin/main'

zhanghao vor 3 Wochen
Ursprung
Commit
145f4af146

+ 1 - 1
src/views/screen/engineering/issueSubDia.vue

@@ -119,7 +119,7 @@ export default {
 },
 },
   methods: {
   methods: {
     loadTemplate() {
     loadTemplate() {
-      return fetch("/template.docx")
+      return fetch("/screen/template.docx")
         .then(response => response.arrayBuffer())
         .then(response => response.arrayBuffer())
         .then(buffer => {
         .then(buffer => {
           return buffer;
           return buffer;

+ 6 - 6
src/views/screen/engineering/monitorLive.vue

@@ -182,12 +182,12 @@ export default {
     shot() {
     shot() {
       console.log(this.videoObj,'========================aaa');
       console.log(this.videoObj,'========================aaa');
       console.log("视频播放编号", this.code);
       console.log("视频播放编号", this.code);
-      // if (!this.videoObj)
-      //   return;
-      // this.videoObj.capture({
-      //    winNum: this.winNum,
-      //    code: this.monitorInfo.cameraCode,
-      //  });
+      if (!this.videoObj)
+         return;
+       this.videoObj.capture({
+          winNum: this.winNum,
+          code: this.monitorInfo.cameraCode,
+        });
       this.imgSrc=this.fileName
       this.imgSrc=this.fileName
       this.issue(this.imgSrc)
       this.issue(this.imgSrc)