From 01693ef150b6bccb188e6be2ed0d6f6dbe5e9820 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Thu, 11 Jul 2024 18:33:16 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/list-item-check-next.vue           |  1 +
 pages/application/home.vue                    |  2 +-
 .../onlinexxks/strengthen_video_study.vue     | 21 ++++++++++++-------
 .../safetymeeting/safetymeeting-detail.vue    |  2 --
 .../basic-info/components/certificate.vue     |  2 +-
 pages/basics/basic-info/confirm.vue           | 11 ++++++++++
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
index 47d46df..b373b64 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
@@ -442,6 +442,7 @@
 						'Content-type':'application/x-www-form-urlencoded'
 					},
 					data: {
+            LISTMANAGER_ID: _this.listId,
 						CUSTOM_ID: _this.listId,
             CORPINFO_ID:loginUser.CORPINFO_ID,
             USER_ID:loginUser.USER_ID,
diff --git a/pages/application/home.vue b/pages/application/home.vue
index 24a87b3..d58a742 100644
--- a/pages/application/home.vue
+++ b/pages/application/home.vue
@@ -61,7 +61,7 @@
           </view>
           <view class="text-semi">隐患排查</view>
         </navigator>
-        <navigator class="apps-item" hover-class="none" url="/pages/application/check-record/check_listmanager">
+        <navigator class="apps-item" hover-class="none" url="/pages/application/check-record/record_list">
           <view class="imgs action">
             <image src="../../static/icon-apps/icon-zl-2.png" mode=""></image>
           </view>
diff --git a/pages/application/onlinexxks/strengthen_video_study.vue b/pages/application/onlinexxks/strengthen_video_study.vue
index 2ffe107..13f0c61 100644
--- a/pages/application/onlinexxks/strengthen_video_study.vue
+++ b/pages/application/onlinexxks/strengthen_video_study.vue
@@ -7,13 +7,18 @@
     <view class="container">
       <view class="fixed">
         <view v-if="videoSrc">
-          <video
-              id="video"
-              :src="baseImgPath + videoSrc"
+<!--          <video-->
+<!--              id="video"-->
+<!--              :src="baseImgPath + videoSrc"-->
+<!--              :poster="videoPoster"-->
+<!--              autoplay-->
+<!--              controls-->
+<!--              style="width: 100vw"-->
+<!--          />-->
+          <web-view-video
+              ref="video"
+              :src="videoSrc"
               :poster="videoPoster"
-              autoplay
-              controls
-              style="width: 100vw"
           />
         </view>
       </view>
@@ -48,8 +53,10 @@
 import {
   basePath, baseImgPath
 } from "@/common/tool";
+import WebViewVideo from "@/pages/application/onlinexxks/web_view_video.vue";
 
 export default {
+  components: {WebViewVideo},
   data() {
     return {
       baseImgPath: baseImgPath,
@@ -128,8 +135,8 @@ export default {
           var resData = res.data;
           if ("success" == resData.result) {
             if (resData.PLAYURL) {
+              console.log(resData)
               this.videoSrc = resData.PLAYURL;
-              console.log("111",this.videoSrc)
               this.videoPoster = resData.COVERURL;
             } else {
               uni.showToast({
diff --git a/pages/application/safetymeeting/safetymeeting-detail.vue b/pages/application/safetymeeting/safetymeeting-detail.vue
index 2d22d0c..5411996 100644
--- a/pages/application/safetymeeting/safetymeeting-detail.vue
+++ b/pages/application/safetymeeting/safetymeeting-detail.vue
@@ -195,8 +195,6 @@
 						if (res.data != null) {
 							uni.hideLoading();
               _this.pd = res.data.pd;
-
-              console.log(_this.pd)
 						} else {
 							uni.showToast({
 								title: res.data.message,
diff --git a/pages/basics/basic-info/components/certificate.vue b/pages/basics/basic-info/components/certificate.vue
index c8aaab3..4730b62 100644
--- a/pages/basics/basic-info/components/certificate.vue
+++ b/pages/basics/basic-info/components/certificate.vue
@@ -803,7 +803,7 @@ export default {
       }
 
       // 驾驶证
-      if (this.formData.PERSONNEL_TYPE_NAME.find((item) => item === '驾驶员')) {
+      if (this.formData.PERSONNEL_TYPE.find((item) => item === '5ae743c76dbf496eb1b5101075b073d5')) {
         if (this.fileData.driverLicense.length < 1) {
           uni.showToast({
             icon: 'none',
diff --git a/pages/basics/basic-info/confirm.vue b/pages/basics/basic-info/confirm.vue
index 2776b74..700c6bd 100644
--- a/pages/basics/basic-info/confirm.vue
+++ b/pages/basics/basic-info/confirm.vue
@@ -150,6 +150,17 @@ import {
                       uni.reLaunch({
                         url: '/pages/login/home'
                       });
+                    } else if (this.form.REVIEW_RESULT=='-1') {
+                      setloginUserId(null);
+                      setCorpinfoId(null);
+                      setDeptId(null);
+                      setloginUser(null);
+                      setIsRest(null);
+                      setPremission(null)
+                      uni.removeStorage({key: 'USER'});
+                      uni.reLaunch({
+                        url: '/pages/login/home'
+                      });
                     }
                   }else{
                     uni.hideLoading();