Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/components/customForm/index.vue

@@ -123,7 +123,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <span v-show="item.help_text" class="helpText">说明：{{item.help_text}}</span>
+          <span v-show="item.help_text&&item.field_type !== 'draw'" class="helpText">说明：{{item.help_text}}</span>
           <span v-if="item.need_judge&&item.is_testok===true" class="adoptTip">合格</span>
           <span v-if="item.need_judge&&item.is_testok===false" class="failTip">不合格</span>
         </el-col>
@@ -144,7 +144,7 @@
                 <div class="canvasBtn" @click="error1">标记</div>
                 <div class="canvasBtn" @click="word1()">文字</div>
                 <div class="canvasBtn" @click="back()">回退</div>
-                <div class="canvasBtn" @click="saveTu()">保存</div>
+                <!--<div class="canvasBtn" @click="saveTu()">保存</div>-->
               </div>
               <div id="res"></div>
             </div>
@@ -196,11 +196,13 @@
       isDisabled:{
         type:Boolean,
         default:false
+      },
+      isMidTesting:{
+        type:Boolean,
+        default:false
       }
     },
     mounted() {
-      debugger;
-      debugger;
       let that = this;
       that.checkForm = {};
       this.form = this.formID;
@@ -725,7 +727,7 @@
         that.testrecord.record_data = that.field;//检查项列表
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;//记录id
-        if(submit){//提交
+        if(submit&&that.isMidTesting!==true){//提交
           this.$emit('recordSubmit',that.testrecord);
         }else {//保存
           this.$emit('recordSave',that.testrecord);

hb_client/src/components/customForm/review.vue

@@ -282,6 +282,10 @@
       hasPicture:{
         type:Boolean,
         default:false
+      },
+      isMidTesting:{
+        type:Boolean,
+        default:false
       }
     },
     mounted() {
@@ -299,7 +303,7 @@
       });
       that.formData=[...that.formData];
       // debugger;
-      console.log(that.formData);
+      // console.log(that.formData);
       //当前表的数据存储
       for(let i=0;i<this.results.length;i++){
         let key = this.results[i].field_key;
@@ -316,7 +320,7 @@
         obj = item;
         that.judgeList.push(obj)
       });
-      debugger;
+      // debugger;
       //图片地址
       let  imag= this.formData.filter(item => {
         return item.field_type === 'draw';
@@ -814,7 +818,7 @@
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;
         // debugger;
-        if(submit){//提交
+        if(submit&&that.isMidTesting!==true){//提交
           this.$emit('recordSubmit',that.testrecord);
         }else {//保存
           this.$emit('recordSave',that.testrecord);

hb_client/src/components/faceLogin/tracking.vue

@@ -2,10 +2,10 @@
   <div style="width: 100%;height: 100%;">
     <div>
       <div class="video-box">
-        <video id="video" width="960" height="640" preload autoplay loop muted></video>
+        <video id="video" width="749" height="640" preload autoplay loop muted></video>
-        <canvas id="canvas" width="960" height="640"></canvas>
+        <canvas id="canvas" width="749" height="640"></canvas>
       </div>
-      <canvas id="screenshotCanvas" width="960" height="640"></canvas>
+      <canvas id="screenshotCanvas" width="749" height="640"></canvas>
     </div>
   </div>
 </template>
@@ -147,8 +147,8 @@
   .video-box {
     margin: auto;
     position: relative;
-    width: 960px;
+    /*width: 90%;
-    height: 640px;
+    height: 90%;*/
   }
 
   video, canvas {

hb_client/src/views/login/index.vue

@@ -307,4 +307,8 @@
   .login-code-img {
     height: 38px;
   }
+  .testTracking{
+    width:100%;
+    height: 700px;
+  }
 </style>

hb_client/src/views/wpm/need.vue

@@ -406,6 +406,7 @@
         :hasPicture="hasPicture"
         :wproduct="wproduct"
         :recordId="recordId"
+        :isMidTesting="is_midtesting"
         @recordSave="recordSave"
         @recordSubmit="recordSubmit"
         @recordCancel="recordCancel"
@@ -427,6 +428,7 @@
         :wproduct="wproduct"
         :recordId="recordId"
         :isDisabled="isDisabled"
+        :isMidTesting="is_midtesting"
         @recordSubmit="recordSubmit"
         @recordSave="recordSave"
         @recordCancel="recordCancel"
@@ -788,6 +790,7 @@
         mutipID: [],
         wproduct: null,
         isPost: false,
+        is_midtesting: false,
         isDisabled: false,
         origin_test: null,
         hasPicture: false,
@@ -1008,7 +1011,7 @@
         this.innerIndex = index;
         // this.outerVisible = true;
         this.wproduct = scope.row.id;//半成品ID
-        this.listQueryrecordform.material = scope.row.material_.id;//
+        this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material_.id;//
         this.listQueryrecordform.type = 2;
          this.listQueryrecordform.enabled = true;
         this.recordform = null;
@@ -1073,6 +1076,7 @@
               getTestRecordItem(scope.row.id).then((res) => {
                 let arr = [];
                 let fieldList = res.data.record_data;
+                that.is_midtesting = res.data.is_midtesting;
                 for (let i = 0; i < that.fieldList.length; i++) {
                   let obj = that.fieldList[i];
                   obj.is_testok = null;