Merge branch 'master' of http://10.0.41.100:3000/xielei/xytSk-App
commit
f676c1567c
|
|
@ -139,6 +139,7 @@
|
|||
uni.$http.post('/gunshiApp/xyt/stPptnRReal/list').then(res => {
|
||||
if (res.data.code == 200) {
|
||||
this.Ylzlist = res.data.data
|
||||
console.log(this.ylzList,res,'ghjghj');
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -18,9 +18,14 @@
|
|||
|
||||
</u-form-item>
|
||||
<u-form-item label="现场视频" prop="videos" borderBottom labelPosition='top' labelWidth="100px">
|
||||
<u-upload :fileList="model1.videos" name="videos" multiple disabled
|
||||
multiple accept='video' :maxCount="10"></u-upload>
|
||||
|
||||
<!-- <u-upload :fileList="model1.videos" name="videos" multiple disabled
|
||||
multiple accept='video' :maxCount="10"></u-upload> -->
|
||||
<view v-if="model1.videos.length" class="itemEve">
|
||||
<text>现场视频:</text>
|
||||
<view class="" v-for="item in model1.videos">
|
||||
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" x5-video-player-type="h5" playsinline webkit-playsinline></video>
|
||||
</view>
|
||||
</view>
|
||||
</u-form-item>
|
||||
</u--form>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<template>
|
||||
<view class="contentItem">
|
||||
<uni-collapse>
|
||||
<uni-collapse @change="open">
|
||||
|
||||
<uni-collapse-item title-border="none" v-for="(item,index) in listData" :key="index" :border="false"
|
||||
<uni-collapse-item title-border="none" v-for="(item,index) in listData" :key="index" :border="false"
|
||||
:show-animation="true">
|
||||
<template v-slot:title>
|
||||
<view style="display: flex;align-items: center;">
|
||||
|
|
@ -25,10 +25,12 @@
|
|||
<image :src="item.url" style="width: 80px;height: 80px;margin: 5px;" @click="previewImage(item)"></image>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="o.inspectVideos.length" class="itemEve">
|
||||
|
||||
<view class="itemEve" v-if="IndexList.find(i=>i==index)">
|
||||
|
||||
<text>现场视频:</text>
|
||||
<view class="" v-for="item in o.inspectVideos">
|
||||
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" show-fullscreen-btn :show-progress='false'></video>
|
||||
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" id='videoww' :controls='false' :show-fullscreen-btn="true" :show-progress='false' :webkit-playsinline="true" @click="fullScreen('videoww')"></video>
|
||||
</view>
|
||||
</view>
|
||||
<view style="display: flex;" class="itemEve">
|
||||
|
|
@ -43,11 +45,11 @@
|
|||
<image :src="item.url" style="width: 80px;height: 80px;margin: 5px;" @click="previewImage(item)"></image>
|
||||
</view>
|
||||
</view>
|
||||
<view style="" v-if="o.handleVideos.length" class="itemEve">
|
||||
<view style="" v-if="IndexList.find(i=>i==index)" class="itemEve" >
|
||||
<text>处理视频:</text>
|
||||
<view class="" v-for="item in o.handleVideos">
|
||||
|
||||
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" show-fullscreen-btn></video>
|
||||
<video :src="item.url" style="width: 80px;height: 80px;margin: 5px;" show-fullscreen-btn webkit-playsinline="true"></video>
|
||||
</view>
|
||||
</view>
|
||||
<view style="display: flex;" class="itemEve">
|
||||
|
|
@ -141,6 +143,7 @@
|
|||
listStatus: ["已处理", "未处理"],
|
||||
current: 0,
|
||||
listData: [],
|
||||
IndexList:[],
|
||||
showSex: false,
|
||||
actions: [{
|
||||
name: '男',
|
||||
|
|
@ -198,6 +201,15 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
fullScreen(k){
|
||||
console.log(k,'‘’‘’');
|
||||
let videoContext = uni.createVideoContext(k, this)
|
||||
videoContext.requestFullScreen()
|
||||
},
|
||||
open(e) {
|
||||
console.log('open', e,456789)
|
||||
this.IndexList=e
|
||||
},
|
||||
previewImage(item){
|
||||
uni.previewImage({
|
||||
urls: [item.url],
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
</u-form-item>
|
||||
<u-form-item label="现场视频" prop="videos" borderBottom labelPosition='top' labelWidth="100px">
|
||||
<u-upload :fileList="model1.videos" @afterRead="(e)=>afterRead(e,'videos')" @delete="deletePic" name="videos" multiple
|
||||
<u-upload :fileList="model1.videos" @afterRead="(e)=>afterRead(e,'videos')" @delete="deletePic" name="videos" multiple webkit-playsinline="true"
|
||||
multiple accept='video' :maxCount="10"></u-upload>
|
||||
|
||||
</u-form-item>
|
||||
|
|
@ -44,27 +44,27 @@
|
|||
videos: []
|
||||
},
|
||||
actions: [{
|
||||
value: 0,
|
||||
value: 1,
|
||||
name: "溢洪道清障"
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
value: 2,
|
||||
name: "除草除杂"
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
value: 3,
|
||||
name: "设备养护"
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
value: 4,
|
||||
name: "环境清洁"
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
value: 5,
|
||||
name: "危险提示"
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
value: 6,
|
||||
name: "其他"
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
{{k}}
|
||||
</view>
|
||||
<view class="bottom">
|
||||
{{item[k]}}
|
||||
{{item[k] !==null?item[k]:'--'}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
Loading…
Reference in New Issue