修复一轮测试问题

inspur-ui/src/api/partywork/remoteControl.js

@@ -1,10 +1,11 @@
 import request from "@/utils/request";
 
-export function filePlay(id,index,deviceId) {
+export function filePlay(id,index,deviceId,isStart) {
   let param = {
     id : id,
     index: index,
-    deviceId: deviceId
+    deviceId: deviceId,
+    isStart:isStart
   };
   return request({
     url: '/remote/control/file/play',

inspur-ui/src/views/party_work/meeting/info.vue

@@ -31,13 +31,14 @@
       style="width: 85%; display: flex;align-items: center;justify-content: space-between; margin-top: 15px;">
       <div class="display-row" style="display: flex;align-items: center;">
         <div class="text-fontsize-14">请选择会议设备</div>
-        <el-select v-model="deviceId" placeholder="请选择会议设备" style="margin-left: 8px;" :popper-append-to-body="false" class="elselect">
+        <el-select v-model="deviceId" placeholder="请选择会议设备" style="margin-left: 8px;" :popper-append-to-body="false"
+          class="elselect">
           <el-option v-for="device in deviceList" :label="device.deviceName" :value="device.id" />
         </el-select>
       </div>
       <!-- 开始播放后显示 -->
       <div v-if="selectedFileIndex>=0" class="display-row" style="display: flex;align-items: center;">
-        <div class="text-fontsize-14">党组织建设工作汇报.pptx</div>
+        <div class="text-fontsize-14">{{meetTitle}}</div>
         <div class="text-fontsize-14" style="margin-left: 15px;">缩放比例</div>
         <el-select v-model="scaleId" placeholder="请选择" style="margin-left: 8px;width: 90px;"
           :popper-append-to-body="false" @change="scaleChange">
@@ -178,7 +179,7 @@
               <div class="text-fontsize-18">会议纪要</div>
               <el-image :src="iconFresh" class="icon" style="margin-left: 8px;" />
             </div>
-            <el-button class="more" @click="dialogMeetVisible = true">更多</el-button>
+            <el-button class="more" @click="clickMeetMore()">更多</el-button>
           </div>
           <div class="display-row" style="margin-top: 10px;">
             <div style="width: 70%;overflow-y: auto;height: 120px;" class="no-scrollbar">
@@ -724,6 +725,7 @@
         imageOffset: 0,
         imageHeightPx: 0,
         imageHeightPxChange: 0,
+        meetTitle:''
       }
     },
     watch: {
@@ -789,9 +791,9 @@
           console.log('reqParam:', response.data);
           this.faceSign = response.data;
           if (response.data.rspCode === "200") {
-            this.faceSignUrl = reqParam.url + ".1.png";
-          } else {
             this.faceSignUrl = reqParam.url;
+          } else {
+            this.faceSignUrl = reqParam.url + ".1.png";
           }
           this.faceSignList = [];
           this.faceSignList.push(this.faceSignUrl);
@@ -886,8 +888,20 @@
         }
       },
       savePhoto() {
-        this.form.picsPath = this.photoList.join(",");
+        if (this.photoList && this.photoList.length > 0) {
+          this.form.picsPath = {};
+          for (let i = 0; i < this.photoList.length; i++) {
+            if(i==0){
+              this.form.picsPath = this.photoList[i].picPath;
+            }else{
+              this.form.picsPath = this.form.picsPath+","+this.photoList[i].picPath
+            }
+          }
+        }
+
+        // this.form.picsPath = this.photoList.join(",");
         console.log('保存后的photoList:', this.photoList);
+        console.log('保存后的picsPath:', this.form.picsPath);
         // this.form.imageList = this.photoList;
         // console.log('保存后的imageList:', this.form.imageList);
         updateMeeting(this.form).then(response => {
@@ -941,9 +955,17 @@
       deletePhoto(index) {
         this.$modal.confirm('是否确认删除图片？').then(() => {
           // 用户点击确认后执行的代码
+          console.log('删除前photoList:', this.photoList);
+          let selectPhotoList = [];
           for (let i = 0; i < index.length; i++) {
-            this.photoList.splice(index[i], 1);
+            selectPhotoList.push(this.photoList[index[i]]);
+            // this.photoList.splice(index[i], 1);
+            // console.log('删除photoList:', this.photoList);
           }
+          let newData = this.photoList.filter(
+            (a) => !selectPhotoList.some((b) => a.id === b.id)
+          )
+          this.photoList = newData;
           console.log('新photoList:', this.photoList);
           this.savePhoto();
           // this.$modal.msgSuccess("删除成功");
@@ -961,6 +983,11 @@
             message: '发送拍照指令成功',
             type: 'success'
           });
+          //刷新图片抓拍
+          setTimeout(() => {
+            this.refreshPhoto();
+          }, 2000);
+
         });
       },
       showAudioTxt(row) {
@@ -1044,6 +1071,13 @@
         // if (!this.validDeviceId()) {
         //   return;
         // }
+
+        this.imageOffset = 0;
+        this.imageHeight = 100;
+        this.imageHeightPxChange = this.imageHeightPx;
+        this.scaleId = null;
+        this.moveId = null;
+
         this.currentPage = 0;
         this.material = url;
         let param = {
@@ -1145,7 +1179,14 @@
           this.totalPage = this.imageList.length;
           this.getPageSrc();
         });
-        this.controlFilePlay();
+
+        this.imageOffset = 0;
+        this.imageHeight = 100;
+        this.imageHeightPxChange = this.imageHeightPx;
+        this.scaleId = null;
+        this.moveId = null;
+
+        this.controlFilePlay(0);
       },
       getPageSrc() {
         this.imageList.forEach((item, index) => {
@@ -1216,7 +1257,7 @@
           distance: this.moveId,
           deviceId: this.deviceId,
           imageIndex: this.currentPage,
-          fileType:this.fileType
+          fileType: this.fileType
         }
         imageMove(param).then(response => {
           console.log('上移：', response);
@@ -1255,7 +1296,7 @@
           distance: this.moveId,
           deviceId: this.deviceId,
           imageIndex: this.currentPage,
-          fileType:this.fileType
+          fileType: this.fileType
         }
         imageMove(param).then(response => {
           console.log('下移：', response);
@@ -1279,12 +1320,12 @@
         } else {
           this.currentPage--;
           this.getPageSrc();
-          this.controlFilePlay();
+          this.controlFilePlay(1);
         }
       },
-      controlFilePlay() {
+      controlFilePlay(isStart) {
         const id = this.fileList[this.selectedFileIndex].id;
-        filePlay(id, this.currentPage, this.deviceId).then(response => {
+        filePlay(id, this.currentPage, this.deviceId,isStart).then(response => {
           this.$message({
             message: response.msg,
             type: 'success'
@@ -1320,7 +1361,7 @@
         } else {
           this.currentPage++;
           this.getPageSrc();
-          this.controlFilePlay();
+          this.controlFilePlay(1);
         }
       },
       // 结束播放
@@ -1384,6 +1425,7 @@
       //点击会议资料
       selectFileItem(index) {
         this.selectedFileIndex = index;
+        this.meetTitle = this.fileList[index].fileName;
       },
       //开始播放
       beginPlay() {
@@ -1397,6 +1439,7 @@
           });
           return;
         }
+
         if (this.fileList[this.selectedFileIndex].fileType == 1) {
           this.fileType = 1;
           this.showFile();
@@ -1424,7 +1467,7 @@
       },
       deleteDialogPhoto() {
         console.log('selectedItems:', this.selectedItems);
-
+        console.log('删除前photoList:', this.photoList);
         if (this.selectedItems != null && this.selectedItems.length > 0) {
           this.deletePhoto(this.selectedItems);
         } else {
@@ -1439,9 +1482,12 @@
         this.imageHeightPx = event.target.offsetHeight;
         this.imageHeightPxChange = this.imageHeightPx;
         console.log('Image height:', this.imageHeightPx);
+      },
+      clickMeetMore(){
+        this.dialogMeetVisible = true;
+        this.refreshAudio();
       }
 
-
     }
   }
 </script>
@@ -1713,7 +1759,7 @@
     border-color: transparent !important;
   }
 
-  .el-select .el-input__inner::placeholder{
+  .el-select .el-input__inner::placeholder {
     color: #FFFFFF;
   }
 </style>