wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

清单排查记录bug修复 

视频播放优化
dev
wangpeng 2024-07-14 09:47:41 +08:00
parent c443b7dac5
commit 8108ffa15a
12 changed files with 91 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/yk-authpup/yk-authpup.vue
View File

@ -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
},

14
hybrid/html/video.html
View File

@ -43,6 +43,7 @@
let src = ''
let playTime = ''
let poster = ''
let isProgress = false
function setCurrentTime(type) {
currentTimeTimer && clearTimeout(currentTimeTimer);
@ -59,10 +60,7 @@
const video = document.querySelector("#player")
video.setAttribute('data-poster', src)
video.querySelector('source').setAttribute('src', poster)
player = new Plyr(video, {
type: "",
autoplay: true,
controls: [
const controls = [
"play-large",
"play",
"current-time",
@ -71,7 +69,12 @@
"volume",
"captions",
"fullscreen",
],
]
isProgress === '1' && controls.splice(2, 0, 'progress')
player = new Plyr(video, {
type: "",
autoplay: true,
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()
});

2
pages/application/check-record/check_listmanager.vue
View File

@ -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
});
},
//获取数据类型列表

23
pages/application/check-record/record_info.vue
View File

@ -23,7 +23,7 @@
<template v-else>合格</template>
</uni-td>
<uni-td v-else-if='item.ISNORMAL=="1"' align="center">
<view @click="goToDetail(item.RECORDITEM_ID)" style="color: blue;">不合格</view>
<view @click="goToDetail(item.HIDDEN_ID)" style="color: blue;">不合格</view>
</uni-td>
<uni-td v-else-if='item.ISNORMAL=="2"' align="center">
<view style="color: blue;">不涉及</view>
@ -68,7 +68,7 @@
<text>清单名称</text>
</view>
<view>
<text class="text-grey">{{pd.NAME}}</text>
<text class="text-grey">{{pd.LIST_NAME}}</text>
</view>
</view>
<view class="cu-form-group">
@ -84,7 +84,7 @@
<text>检查人</text>
</view>
<view>
<text class="text-grey">{{pd.BAO_BAO_USER_NAME}}</text>
<text class="text-grey">{{pd.USERS}}</text>
</view>
</view>
<view class="cu-form-group">
@ -92,7 +92,7 @@
<text>检查时间</text>
</view>
<view>
<text class="text-grey">{{pd.CREATTIME}}</text>
<text class="text-grey">{{pd.CHECK_TIME}}</text>
</view>
</view>
<view class="cu-form-group">
@ -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,
},

55
pages/application/check-record/record_list.vue
View File

@ -28,21 +28,21 @@
<scroll-view class="dy-scroll-nobg" scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
<view v-if="list.length>0" >
<view class="dy-card" v-for="item in list" :key="item.CHECKRECORD_ID" @click="$noMultipleClicks(goToList,item.CUSTOM_ID)">
<view class="dy-card" v-for="item in list" :key="item.CHECKRECORD_ID" @click="$noMultipleClicks(goToList,item.CHECKRECORD_ID)">
<view class="dy-card-title">
<text><text v-if="item.USER_ID == loginUserId" style="margin-right: 10upx;color: #07BB07;">★</text>清单名称：{{item.NAME}}</text>
<text>清单名称：{{item.LIST_NAME}}</text>
<text class="cuIcon-right f30 text-gray"></text>
</view>
<view class="dy-card-content">
<view class="dy-sub-stitle">
<text class="text-grey">人员：{{item.USER_NAME?item.USER_NAME:ls.USER_NAME}}</text>
<text class="text-grey">人员：{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}}</text>
</view>
<view class="dy-sub-stitle">
<text class="text-grey">检查周期：{{item.PERIODNAME}}</text>
<text class="text-grey">检查周期：{{item.DATESTART}}-{{item.DATEEND}}</text>
</view>
<view class="dy-sub-stitle">
<text class="text-grey">检查人：{{item.BAO_BAO_USER_NAME}}</text>
<text class="text-grey">检查时间：{{item.START_DATE}}</text>
<text class="text-grey">检查人：{{item.CHECK_USERS}}</text>
<text class="text-grey">检查时间：{{item.CHECK_TIME}}</text>
</view>
<!-- <view class="cu-progress radius striped active">-->
<!-- <view class="bg-olive" :style="[{ width:loading?((item.checkedItem>0 && item.count>0)?(item.checkedItem/item.count*100):0)+'%':''}]">{{(item.checkedItem>0 && item.count>0)?(item.checkedItem/item.count*100):0}}%</view>-->
@ -67,19 +67,18 @@
<view v-if="list1.length>0" >
<view class="dy-card" v-for="item in list1" :key="item.CHECKRECORD_ID" >
<view class="dy-card-title">
<text><text v-if="item.USER_ID == loginUserId" style="margin-right: 10upx;color: #07BB07;">★</text>清单名称：{{item.NAME}}</text>
<text class="cuIcon-right f30 text-gray"></text>
<text>清单名称：{{item.LIST_NAME?item.LIST_NAME:ls.NAME}}</text>
</view>
<view class="dy-card-content">
<view class="dy-sub-stitle">
<text class="text-grey">人员：{{item.USER_NAME?item.USER_NAME:ls.USER_NAME}}</text>
<text class="text-grey">人员：{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}}</text>
</view>
<view class="dy-sub-stitle">
<text class="text-grey">检查周期：{{item.PERIODNAME}}</text>
<text class="text-grey">检查周期：{{item.DATESTART}}-{{item.DATEEND}}</text>
</view>
<view class="dy-sub-stitle">
<text class="text-grey">清单类型：{{ls.BAO_BAO_USER_NAME}}</text>
<text class="text-grey">清单周期：{{ls.START_DATE}}</text>
<text class="text-grey">清单类型：{{ls.TYPENAME}}</text>
<text class="text-grey">清单周期：{{ls.PERIODNAME}}</text>
</view>
<!-- <view class="cu-progress radius striped active">-->
<!-- <view class="bg-olive" :style="[{ width:loading?((item.checkedItem>0 && item.count>0)?(item.checkedItem/item.count*100):0)+'%':''}]">{{(item.checkedItem>0 && item.count>0)?(item.checkedItem/item.count*100):0}}%</view>-->
@ -190,24 +189,25 @@
'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<content.length;i++){
content[i].DATESTART = content[i].DATESTART.substring(0,content[i].DATESTART.length-3)
content[i].DATEEND = content[i].DATEEND.substring(0,content[i].DATEEND.length-3)
if(content[i].TYPE=='1'){
this.list.push(content[i]);
this.totalList.push(content[i]);
}else{
this.list1.push(content[i]);
this.totalList.push(content[i]);
}
}
}else{
@ -220,6 +220,7 @@
}
})
},
getQuery() { //搜索按钮事件
var _this = this;
_this.showCount = -1;
@ -240,7 +241,7 @@
//跳转事件
goToList(e) {
uni.navigateTo({
url: '/pages/application/check-record/record_info?CUSTOM_ID='+e
url: '/pages/application/check-record/record_info?CHECKRECORD_ID='+e
});
// uni.navigateTo({
// url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName

1
pages/application/driving-inspections/driving-item-list.vue
View File

@ -57,7 +57,6 @@
onLoad(e) {
this.WAYBILLREGISTRATION_ID = e.listId;
this.status = e.status;
this.getData();
},
onShow(e) {
var _this = this;

2
pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
View File

@ -234,7 +234,7 @@
},
data: {
CUSTOM_ID:_this.listId,
LIST_NAME:_this.listName,
CUSTOM_NAME:_this.listName,
CREATOR:loginUser.NAME,
LATITUDE:latitude,
LONGITUDE:longitude,

2
pages/application/hidden-danger-check-standard/record/record-list.vue
View File

@ -241,7 +241,7 @@
//跳转事件
goToList(e) {
uni.navigateTo({
url: '/pages/application/hidden-danger-check-standard/record/record_info?CHECKRECORD_ID='+e
url: '/pages/application/hidden-danger-check-standard/record/record-info?CHECKRECORD_ID='+e
});
// uni.navigateTo({
// url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName

2
pages/application/home.vue
View File

@ -61,7 +61,7 @@
</view>
<view class="text-semi">隐患排查</view>
</navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/check-record/record_list">
<navigator class="apps-item" hover-class="none" url="/pages/application/hidden-danger-check-standard/record/custom-list">
<view class="imgs action">
<image src="../../static/icon-apps/icon-zl-2.png" mode=""></image>
</view>

1
pages/application/onlinexxks/strengthen_video_study.vue
View File

@ -19,6 +19,7 @@
ref="video"
:src="videoSrc"
:poster="videoPoster"
is-progress
/>
</view>
</view>

7
pages/application/onlinexxks/web_view_video.vue
View File

@ -17,6 +17,10 @@ export default {
type: Number,
default: 0
},
isProgress: {
type: Boolean,
default: false
},
},
data() {
return {
@ -39,7 +43,8 @@ export default {
}, {
src: this.src,
poster: this.poster,
playTime: this.playTime
playTime: this.playTime,
isProgress: this.isProgress ? '1' : '0',
});
this.webview.show()
this.webview.addEventListener('titleUpdate', this.handlePostMessage)

23
pages/basics/basic-info/home.vue
View File

@ -91,29 +91,6 @@ import {
}
}
});
this.getUserStatus();
},
getUserStatus() {
var _this = this;
uni.request({
url: basePath + '/app/user/getUserStatus',
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
USER_ID: loginUser.USER_ID,
CORPINFO_ID: corpinfoId,
ISDELETE: '0',
},
success: (res) => {
if (res.data.pd) {
_this.pd = res.data.pd;
this.pd.APPLY_TYPE = _this.pd.APPLY_TYPE
}
}
});
},
openAuth(permissionID){
this.permissionID = permissionID;