智慧考场

common/request.js

@@ -5,12 +5,12 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'https://test.xyyxt.net'   //预发布
+// export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
-// export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
+export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
  //图片上传api
 // export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release

pages2/appointment/order.vue

@@ -62,8 +62,8 @@
         </view>
       </view>
       <!-- 考试疫情承诺书 -->
-      <view class="appointmentItem">
-        <view class="title"><text class="star_red">*</text> 考试疫情承诺书</view>
+      <view v-if="reportStatus == 1" class="appointmentItem">
+        <view class="title"><text class="star_red">*</text>考试疫情防控承诺书</view>
         <view class="commitment">
           本人参加“住房和城乡建设领域施工现场专业人员岗位”考试，愿意遵守疫情防控各项管理的相关要求，秉承对自己、对他人负责的原则，承担疫情防控社会责任，郑重作出以下承诺：<br/>
           一、充分理解并遵守考试期间考点各项防疫安全的要求。<br/>
@@ -76,7 +76,7 @@
           八、本人承诺遵守《应考人员安全承诺书》中所有承诺内容，若因有瞒报、谎报造成新冠肺炎疫情传播的，一经查实，由本人承担相应的法律和经济责任。
         </view>
       </view>
-      <view class="appointmentItem">
+      <view v-if="reportStatus == 1" class="appointmentItem">
         <view class="title"><text class="star_red">*</text>签名板</view>
         <view class="dis_stys">
           <text style="color: #999999">请在下方签名区进行签名</text>
@@ -166,7 +166,7 @@ export default {
       openVerify: false, // 控制是否手动验证
       commitment_electr_signature: '',
       isUploading: false,
-      siteId: '', // 考试id
+      siteId: '', // 考场id
       reportStatus: 0, // 是否线上签署疫情防控承诺书， 1是，0否
       baseAddress: '', // 签名转成base64
     };
@@ -331,7 +331,7 @@ export default {
                   url: this.commitment_electr_signature, //临时路径
                   responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
                   success: res => {
-                    const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
+                    const base64 = "data:image/jpeg;base64," + uni.arrayBufferToBase64(res.data)
                     console.log('sfs签名转成base64', base64)
                     this.baseAddress = base64
                     this.submits()
@@ -453,25 +453,25 @@ export default {
       });
     },
      //提交表单
-    async submitApi() {
-      if (this.commitment_electr_signature) {
-        // this.commitment_electr_signature = await this.$method.uploadFile(
-        //   this.commitment_electr_signature,
-        //   0
-        // );
-         var res = await uni.request({
-          url: this.commitment_electr_signature, //临时路径
-          responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
-          success: res => {
-            const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
-            console.log('sfs签名转成base64', base64)
-            this.baseAddress = base64
-          }
-        })
-        console.log('----commitment_electr_signature',res, this.commitment_electr_signature)
-      }
+    // async submitApi() {
+    //   if (this.commitment_electr_signature) {
+    //     // this.commitment_electr_signature = await this.$method.uploadFile(
+    //     //   this.commitment_electr_signature,
+    //     //   0
+    //     // );
+    //      var res = await uni.request({
+    //       url: this.commitment_electr_signature, //临时路径
+    //       responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
+    //       success: res => {
+    //         const base64 = "data:image/jpeg;base64," + uni.arrayBufferToBase64(res.data)
+    //         console.log('sfs签名转成base64', base64)
+    //         this.baseAddress = base64
+    //       }
+    //     })
+    //     console.log('----commitment_electr_signature',res, this.commitment_electr_signature)
+    //   }
 
-    },
+    // },
   },
 };
 </script>

pages2/exam/exam_appointment.vue

@@ -52,10 +52,9 @@
 								{{ item.seatNumber || '' }}
 							</view>
 						</view>
-						<!-- applyReportStatus是否需要签署承诺书 1是，0否 -->
+						<!-- applyReportStatus是否显示签署承诺书 1是，0否 v-if="item.applyReportStatus == 0"-->
 						<view v-if="item.applyReportStatus == 1" class="item" @click="toSign(item)">
 							<view class="left">疫情防控承诺书</view>
-							<!-- :class="{unSign: item.reportStatus == 0}" -->
 							<view class="right unSign" >
 								{{ item.reportStatus == 1 ? '已签署' : item.reportStatus == 0 ? '未签署' : '' }}
 							</view>

pages2/exam/signCommit.vue

@@ -2,7 +2,7 @@
     <view class="sign_commit">
         <nav-bar title="签署承诺书"></nav-bar>
         <!-- 考试疫情承诺书 -->
-      <view class="appointmentItem">
+      <view v-if="reportStatus == 0" class="appointmentItem">
         <view class="title"><text class="star_red">*</text> 考试疫情承诺书</view>
         <view class="commitment">
           本人参加“住房和城乡建设领域施工现场专业人员岗位”考试，愿意遵守疫情防控各项管理的相关要求，秉承对自己、对他人负责的原则，承担疫情防控社会责任，郑重作出以下承诺：<br/>
@@ -16,15 +16,14 @@
           八、本人承诺遵守《应考人员安全承诺书》中所有承诺内容，若因有瞒报、谎报造成新冠肺炎疫情传播的，一经查实，由本人承担相应的法律和经济责任。
         </view>
       </view>
-      <view class="appointmentItem">
+      <view v-if="reportStatus == 0" class="appointmentItem">
         <view class="title"><text class="star_red">*</text>签名板</view>
         <view class="dis_stys">
-          <text v-if="reportStatus != 1" style="color: #999999">请在下方签名区进行签名</text>
-          <text v-if="reportStatus != 1" @click="retDraw()" mode="">清空</text>
+          <text style="color: #999999">请在下方签名区进行签名</text>
+          <text @click="retDraw()" mode="">清空</text>
         </view>
         <view class="handCenter">
           <canvas
-            v-if="reportStatus != 1"
             class="handWriting"
             disable-scroll="true"
             :catchtouchmove="true"
@@ -33,21 +32,22 @@
             @touchend="uploadScaleEnd"
             canvas-id="handWriting"
           ></canvas>
-          <view
-            v-else
-            style="width: 100%; height: 100%; position: relative"
-          >
-            <image
-              style="width: 100%; height: 100%"
-              :src="$method.splitImgHost(reportFile)"
-              mode=""
-            ></image>
-          </view>
+          
         </view>
       </view>
-      <view v-if="reportStatus != 1" class="finish_btn" @click="submits()">
+      <view v-if="reportStatus == 0" class="finish_btn" @click="submits()">
         完成签署
       </view>
+      <view
+        v-if="reportStatus == 1"
+        style="width: 100%; height: 100vh;"
+        >
+        <image
+            style="width: 100%; height: 100%; display: block;"
+            :src="$method.splitImgHost(reportFile)"
+            mode=""
+        ></image>
+        </view>
     </view>
 </template>
 
@@ -141,7 +141,7 @@ export default {
                     url: this.commitment_electr_signature, //临时路径
                     responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
                     success: res => {
-                        const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
+                        const base64 = "data:image/jpeg;base64," + uni.arrayBufferToBase64(res.data)
                         console.log('sfs签名转成base64', base64)
                         this.baseAddress = base64
                         // return
@@ -155,8 +155,13 @@ export default {
                         }).then((res) => {
                             console.log('res', res)
                             if (res.data.data == 200) {
-                                
+                                this.$u.toast('签署成功')
+                                uni.navigateBack()
+                            } else {
+                                this.$u.toast(res.data.msg)
                             }
+                        }).catch((err) => {
+                            this.$u.toast('签署失败，请重新签署')
                         })
                     },
                     fail: err => {
@@ -218,7 +223,7 @@ export default {
       margin-bottom: 16rpx;
     }
     .handCenter {
-        width: 100%;
+        // width: 100%;
         height: 400rpx;
         .handWriting {
             width: 100%;