二轮测试问题修复

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

@@ -117,7 +117,11 @@
                 :preview-src-list="firstPhotoList" />
               <el-image v-else :src="imgEmpty" style="width: 157px;height: 90px;" />
               <div class="display-cloumn" style="display: flex;justify-content: space-between;">
-                <el-image :src="iconPhoto" class="icon-40" style="margin-left: 8px;" @click="takePhoto" />
+                <el-image v-show="isPhotoing == true" :src="iconPhotoing" class="icon-40" style="margin-left: 8px;" />
+                <el-image v-show="isPhotoing == false" :src="iconPhoto" class="icon-40" style="margin-left: 8px;"
+                  @click="takePhoto" />
+
+
                 <el-image v-if="firstPhoto!=null" :src="iconDelete" class="icon-40" style="margin-left: 8px;"
                   @click="deletePhoto([0])" />
               </div>
@@ -153,7 +157,9 @@
               </div>
 
               <div class="display-cloumn" style="display: flex;justify-content: space-between;align-items: end;">
-                <el-image :src="iconPhoto" class="icon-40" style="margin-left: 8px;" @click="photoSign" />
+                <el-image v-show="isPhotoing == true" :src="iconPhotoing" class="icon-40" style="margin-left: 8px;" />
+                <el-image v-show="isPhotoing == false" :src="iconPhoto" class="icon-40" style="margin-left: 8px;"
+                  @click="photoSign" />
                 <div v-if="faceSignUrl && faceSignUrl.length>0" class="display-cloumn"
                   style="display: flex;align-items: end;">
                   <div class="display-row"
@@ -226,8 +232,10 @@
         <div></div>
         <div class="display-row display-center" style="margin-left: 80px;">
           <div class="display-cloumn display-center" style="margin-left:24px">
-            <el-image :src="iconPhotoGrey" class="icon-40" @click="takePhoto" />
-            <div class="text-fontsize-14" style="margin-top: 5px;color: #545454;">拍照</div>
+            <el-image v-if="isPhotoing == false" :src="iconPhotoGrey" class="icon-40" @click="takePhoto" />
+            <el-image v-else :src="iconPhotoingGrey" class="icon-40" />
+            <div v-if="isPhotoing == false" class="text-fontsize-14" style="margin-top: 5px;color: #545454;">拍照</div>
+            <div v-else class="text-fontsize-14" style="margin-top: 5px;color: #545454;">拍照中</div>
           </div>
           <div class="display-cloumn display-center" style="margin-left:24px">
             <el-image :src="iconFreshGrey" class="icon-40" @click="refreshPhoto" />
@@ -271,8 +279,12 @@
             <el-image v-else style="width: 100%;height:65%" :src="dialogimgEmpty"></el-image>
             <div class="display-row display-center" style="margin-top: 32px;">
               <div class="display-cloumn display-center">
-                <el-image :src="iconPhotoGrey" class="icon-40" @click="photoSign" />
-                <div class="text-fontsize-14" style="margin-top: 5px;color: #545454;">拍照</div>
+                <el-image v-if="isPhotoing == false" :src="iconPhotoGrey" class="icon-40" @click="photoSign" />
+                <el-image v-else :src="iconPhotoingGrey" class="icon-40" />
+
+                <div v-if="isPhotoing == false" class="text-fontsize-14" style="margin-top: 5px;color: #545454;">拍照
+                </div>
+                <div v-else class="text-fontsize-14" style="margin-top: 5px;color: #545454;">拍照中</div>
               </div>
               <div class="display-cloumn display-center" style="margin-left:24px">
                 <el-image :src="iconFreshGrey" class="icon-40" @click="refreshPhotoSign" />
@@ -579,7 +591,9 @@
   import iconFreshGreyImg from '@/assets/icons/icon_fresh_grey.png'
   import iconYjscImg from '@/assets/icons/icon_yjsc.png'
   import iconPhotoImg from '@/assets/icons/icon_photo.png'
+  import iconPhotoingImg from '@/assets/icons/icon_photoing.png'
   import iconPhotoGreyImg from '@/assets/icons/icon_photo_grey.png'
+  import iconPhotoingGreyImg from '@/assets/icons/icon_photoing_grey.png'
   import iconDeleteImg from '@/assets/icons/icon_delete.png'
   import iconStartRecordImg from '@/assets/icons/icon_startrecord.png'
   import iconStartRecordRedImg from '@/assets/icons/icon_startrecord_red.png'
@@ -605,7 +619,9 @@
         iconFreshGrey: iconFreshGreyImg,
         iconYjsc: iconYjscImg,
         iconPhoto: iconPhotoImg,
+        iconPhotoing: iconPhotoingImg,
         iconPhotoGrey: iconPhotoGreyImg,
+        iconPhotoingGrey: iconPhotoingGreyImg,
         iconDelete: iconDeleteImg,
         iconStartRecord: iconStartRecordImg,
         iconStopRecord: iconStopRecordImg,
@@ -725,7 +741,8 @@
         imageOffset: 0,
         imageHeightPx: 0,
         imageHeightPxChange: 0,
-        meetTitle:''
+        meetTitle: '',
+        isPhotoing: false
       }
     },
     watch: {
@@ -790,11 +807,12 @@
           let reqParam = JSON.parse(response.data.reqParam);
           console.log('reqParam:', response.data);
           this.faceSign = response.data;
-          if (response.data.rspCode === "200") {
-            this.faceSignUrl = reqParam.url;
-          } else {
-            this.faceSignUrl = reqParam.url + ".1.png";
-          }
+          this.faceSignUrl = reqParam.url;
+          // if (response.data.rspCode === "200") {
+          //   this.faceSignUrl = reqParam.url;
+          // } else {
+          //   this.faceSignUrl = reqParam.url + ".1.png";
+          // }
           this.faceSignList = [];
           this.faceSignList.push(this.faceSignUrl);
           this.getAttendanceList();
@@ -811,6 +829,16 @@
         }
         takePhotoSign(param).then(response => {
           this.$modal.msgSuccess("下发拍照成功，请刷新！");
+          this.isPhotoing = true;
+          setTimeout(() => {
+            this.isPhotoing = false;
+          }, 5000);
+
+          //刷新人脸签到
+          setTimeout(() => {
+            this.refreshPhotoSign();
+          }, 5000);
+
         });
       },
       getAttendanceList() {
@@ -889,14 +917,16 @@
       },
       savePhoto() {
         if (this.photoList && this.photoList.length > 0) {
-          this.form.picsPath = {};
+          this.form.picsPath = '';
           for (let i = 0; i < this.photoList.length; i++) {
-            if(i==0){
+            if (i == 0) {
               this.form.picsPath = this.photoList[i].picPath;
-            }else{
-              this.form.picsPath = this.form.picsPath+","+this.photoList[i].picPath
+            } else {
+              this.form.picsPath = this.form.picsPath + "," + this.photoList[i].picPath
             }
           }
+        } else {
+          this.form.picsPath = '';
         }
 
         // this.form.picsPath = this.photoList.join(",");
@@ -977,16 +1007,22 @@
         if (!this.validDeviceId()) {
           return;
         }
+
         let id = this.meetingId;
         takePhoto(id, this.deviceId).then(response => {
           this.$message({
             message: '发送拍照指令成功',
             type: 'success'
           });
+          this.isPhotoing = true;
+          setTimeout(() => {
+            this.isPhotoing = false;
+          }, 5000);
+
           //刷新图片抓拍
           setTimeout(() => {
             this.refreshPhoto();
-          }, 2000);
+          }, 5000);
 
         });
       },
@@ -1325,7 +1361,7 @@
       },
       controlFilePlay(isStart) {
         const id = this.fileList[this.selectedFileIndex].id;
-        filePlay(id, this.currentPage, this.deviceId,isStart).then(response => {
+        filePlay(id, this.currentPage, this.deviceId, isStart).then(response => {
           this.$message({
             message: response.msg,
             type: 'success'
@@ -1483,7 +1519,7 @@
         this.imageHeightPxChange = this.imageHeightPx;
         console.log('Image height:', this.imageHeightPx);
       },
-      clickMeetMore(){
+      clickMeetMore() {
         this.dialogMeetVisible = true;
         this.refreshAudio();
       }