From 8108ffa15a4ded2ff34c75eb3211e41e60ea1d5a Mon Sep 17 00:00:00 2001 From: wangpeng Date: Sun, 14 Jul 2024 09:47:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=92=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95bug=E4=BF=AE=E5=A4=8D=20=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/yk-authpup/yk-authpup.vue | 38 +++++----- hybrid/html/video.html | 26 ++++--- .../check-record/check_listmanager.vue | 2 +- .../application/check-record/record_info.vue | 23 +++---- .../application/check-record/record_list.vue | 69 ++++++++++--------- .../driving-inspections/driving-item-list.vue | 1 - .../custom/list-item-check-list.vue | 2 +- .../record/record-list.vue | 2 +- pages/application/home.vue | 2 +- .../onlinexxks/strengthen_video_study.vue | 1 + .../application/onlinexxks/web_view_video.vue | 7 +- pages/basics/basic-info/home.vue | 23 ------- 12 files changed, 91 insertions(+), 105 deletions(-) diff --git a/components/yk-authpup/yk-authpup.vue b/components/yk-authpup/yk-authpup.vue index c4efd82..9dfd621 100644 --- a/components/yk-authpup/yk-authpup.vue +++ b/components/yk-authpup/yk-authpup.vue @@ -196,26 +196,26 @@ } plus.ios.deleteObject(aVAudioSession); } - if (result) { + // if (result) { //当前查询权限已授权，此时可以通知页面执行接下来的操作 - that.$emit('changeAuth') - } else { - //当前查询的权限已禁用,引导用户跳转手机系统设置去开启 - uni.showModal({ - title: '温馨提示', - content: '还没有该权限，立即去设置开启？', - cancelText: "取消", - confirmText: "去设置", - showCancel: true, - confirmColor: '#000', - cancelColor: '#666', - success: (res) => { - if (res.confirm) { - _this.goSetting(); - } - } - }) - } + _this.$emit('changeAuth') + // } else { + // //当前查询的权限已禁用,引导用户跳转手机系统设置去开启 + // uni.showModal({ + // title: '温馨提示', + // content: '还没有该权限，立即去设置开启？', + // cancelText: "取消", + // confirmText: "去设置", + // showCancel: true, + // confirmColor: '#000', + // cancelColor: '#666', + // success: (res) => { + // if (res.confirm) { + // _this.goSetting(); + // } + // } + // }) + // } } // #endif }, diff --git a/hybrid/html/video.html b/hybrid/html/video.html index a5c2743..2f9a1be 100644 --- a/hybrid/html/video.html +++ b/hybrid/html/video.html @@ -43,6 +43,7 @@ let src = '' let playTime = '' let poster = '' + let isProgress = false function setCurrentTime(type) { currentTimeTimer && clearTimeout(currentTimeTimer); @@ -59,19 +60,21 @@ const video = document.querySelector("#player") video.setAttribute('data-poster', src) video.querySelector('source').setAttribute('src', poster) - player = new Plyr(video, { + const controls = [ + "play-large", + "play", + "current-time", + "duration", + "mute", + "volume", + "captions", + "fullscreen", + ] + isProgress === '1' && controls.splice(2, 0, 'progress') + player = new Plyr(video, { type: "", autoplay: true, - controls: [ - "play-large", - "play", - "current-time", - "duration", - "mute", - "volume", - "captions", - "fullscreen", - ], + controls, seekTime: 0, ratio: "16:9", speed: {selected: 1, options: [1]}, @@ -135,6 +138,7 @@ src = data.src poster = data.poster playTime = +data.playTime + isProgress = data.isProgress initVideo() }); diff --git a/pages/application/check-record/check_listmanager.vue b/pages/application/check-record/check_listmanager.vue index acec0b1..0eff450 100644 --- a/pages/application/check-record/check_listmanager.vue +++ b/pages/application/check-record/check_listmanager.vue @@ -304,7 +304,7 @@ }, goToList(id){ uni.navigateTo({ - url: '/pages/application/check-record/check_info?LISTMANAGER_ID='+id + url: '/pages/application/check-record/record_list?LISTMANAGER_ID='+id }); }, //获取数据类型列表 diff --git a/pages/application/check-record/record_info.vue b/pages/application/check-record/record_info.vue index 991b8e8..1a7571f 100644 --- a/pages/application/check-record/record_info.vue +++ b/pages/application/check-record/record_info.vue @@ -23,7 +23,7 @@ - 不合格 + 不合格 不涉及 @@ -68,7 +68,7 @@ 清单名称 - {{pd.NAME}} + {{pd.LIST_NAME}} @@ -84,7 +84,7 @@ 检查人 - {{pd.BAO_BAO_USER_NAME}} + {{pd.USERS}} @@ -92,7 +92,7 @@ 检查时间 - {{pd.CREATTIME}} + {{pd.CHECK_TIME}} @@ -172,7 +172,7 @@ return { recordItemList: [], baseImgPath: baseImgPath, - CUSTOM_ID: '', + CHECKRECORD_ID: '', hiddenList: [], varList: [], pd: [], @@ -193,7 +193,7 @@ }, onLoad(e) { loginSession(); - this.CUSTOM_ID = e.CUSTOM_ID; + this.CHECKRECORD_ID = e.CHECKRECORD_ID; this.getData(); this.getOtherHidden(); this.getMap(); @@ -228,7 +228,7 @@ 'Content-type': 'application/x-www-form-urlencoded' }, data: { - CUSTOM_ID: _this.CUSTOM_ID, + CHECKRECORD_ID: _this.CHECKRECORD_ID, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, }, @@ -261,15 +261,14 @@ 'Content-type': 'application/x-www-form-urlencoded' }, data: { - CUSTOM_ID: _this.CUSTOM_ID, - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID, + CHECKRECORD_ID: _this.CHECKRECORD_ID, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, }, success: (res) => { if (res.data != null) { uni.hideLoading(); - _this.pd = res.data.pd; _this.otherHiddenList = res.data.hiddenList; } else { uni.showToast({ @@ -293,7 +292,7 @@ 'Content-type': 'application/x-www-form-urlencoded' }, data: { - CUSTOM_ID: _this.CUSTOM_ID, + CHECKRECORD_ID: _this.CHECKRECORD_ID, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, }, diff --git a/pages/application/check-record/record_list.vue b/pages/application/check-record/record_list.vue index f978202..f3ae740 100644 --- a/pages/application/check-record/record_list.vue +++ b/pages/application/check-record/record_list.vue @@ -28,21 +28,21 @@ - - - ★清单名称：{{item.NAME}} - - + + + 清单名称：{{item.LIST_NAME}} + + - 人员：{{item.USER_NAME?item.USER_NAME:ls.USER_NAME}} + 人员：{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}} - 检查周期：{{item.PERIODNAME}} + 检查周期：{{item.DATESTART}}-{{item.DATEEND}} - 检查人：{{item.BAO_BAO_USER_NAME}} - 检查时间：{{item.START_DATE}} + 检查人：{{item.CHECK_USERS}} + 检查时间：{{item.CHECK_TIME}} @@ -66,20 +66,19 @@ - - ★清单名称：{{item.NAME}} - - + + 清单名称：{{item.LIST_NAME?item.LIST_NAME:ls.NAME}} + - 人员：{{item.USER_NAME?item.USER_NAME:ls.USER_NAME}} + 人员：{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}} - 检查周期：{{item.PERIODNAME}} + 检查周期：{{item.DATESTART}}-{{item.DATEEND}} - 清单类型：{{ls.BAO_BAO_USER_NAME}} - 清单周期：{{ls.START_DATE}} + 清单类型：{{ls.TYPENAME}} + 清单周期：{{ls.PERIODNAME}} @@ -190,26 +189,27 @@ 'Content-type':'application/x-www-form-urlencoded' }, data: { - USER_NAME: loginUser.NAME, - CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID, - SUB_DEPARTMENT_IDS: this.DEPT, //选择的部门 - IS_MAIN:loginUser.ISMAIN, + LISTMANAGER_ID:_this.LISTMANAGER_ID, + KEYWORDS:_this.KEYWORDS, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, - ISSUPERVISE:loginUser.ISSUPERVISE, }, success: (res) => { - uni.hideLoading(); //结束加载中动画 - if (res.data != null) { - if (_this.list.length == 0) { - _this.list = res.data.varList; - console.log(_this.list) - } else { - if (res.data.varList != null) { - _this.list2 = res.data.varList; - _this.list = _this.list.concat(_this.list2); - } - } + if("success" == res.data.result){ + uni.hideLoading(); + var content = res.data.varList; + _this.ls = res.data.ls; + for(var i=0;i { - if (res.data.pd) { - _this.pd = res.data.pd; - this.pd.APPLY_TYPE = _this.pd.APPLY_TYPE - } - } - }); }, openAuth(permissionID){ this.permissionID = permissionID;