kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-06-13 17:21:59 +08:00
parent 4520a74627 dfb98e0325
commit 2a73975654
10 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/AppBroadcast1/AppBroadcast1.vue
View File

@@ -52,7 +52,7 @@ export default {
{
title: '音频录制',
text: '音频文件的录制',
path: './AppResourcesManage/addPlay?type=1',
path: './AppResourcesManage/addMedia?type=1',
imgUrl: require('./img/bigHorn-icon33@2x.png'),
bgClass: 'bg-E5B565'
},

5
src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue
View File

@@ -9,7 +9,7 @@
<u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px" />
</AiAreaPicker>
</div>
<u-search v-model="keyword" :clearabled="true" placeholder="请输入设备名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
<u-search v-model="keyword" :clearabled="true" placeholder="请输入设备名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="getListInit"></u-search>
</div>
</AiTopFixed>
<div class="record">
@@ -48,6 +48,9 @@ export default {
this.getList()
})
},
onShow() {
document.title = '设备管理'
},
methods: {
areaSelect(e) {
this.areaId = e

2
src/apps/AppBroadcast1/AppEquipment/detail.vue
View File

@@ -158,7 +158,7 @@ export default {
onReachBottom() {
if(this.currIndex == 1) {
this.current ++
this.getList()
this.getPlayList()
}
}
}

5
src/apps/AppBroadcast1/AppPlayList/detail.vue
View File

@@ -56,11 +56,12 @@
<div class="media-item" v-for="(item, index) in info.materials" :key="index">
<img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose(item)">
<div class="info">
<p>{{info.sourceName}}</p>
<!-- <p>{{info.sourceName}}</p> -->
<div>{{item.createUserName}} {{item.createTime}}</div>
</div>
</div>
</div>
<div style="height:120px;"></div>
<div v-if="info.broadcastStatus == 0 || info.broadcastStatus == 1 || info.broadcastStatus == 2">
<div class="btn" v-if="info.taskType == 1" @click="cancel">撤销任务</div>
</div>
@@ -121,7 +122,7 @@ export default {
this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecall?broadcastId=${this.info.id}`).then((res) => {
if (res.code == 0) {
this.$u.toast('撤回成功！')
this.getList()
this.getDetail()
}
})
})

13
src/apps/AppBroadcast1/LiveBroadcast.vue
View File

@@ -17,16 +17,16 @@
<div class="record-item" v-for="(item, index) in recordList" :key="index">
<image :src="user.avatar" />
<div class="right-wrapper">
<div class="right" :style="{width: 'calc(83px + ' + (item.duration / 2) + '%)'}">
<image mode="aspectFit" @click="play(item.src, index)" v-if="!item.isPlay" src="./img/voice-icon.png" />
<image v-else @click="play(item.src, index)" src="./img/voice.gif" />
<div class="right" :style="{width: 'calc(83px + ' + (item.duration / 2) + '%)'}" @click="play(item.src, index)">
<image mode="aspectFit" v-if="!item.isPlay" src="./img/voice-icon.png" />
<image v-else src="./img/voice.gif" />
<span>{{ item.duration }}"</span>
</div>
</div>
</div>
</scroll-view>
</div>
<div class="tips">
<div class="tips" v-if="!isShowRecord">
<image src="./img/body.png" />
<p>请先选择设备再按住下方按钮开始喊话~</p>
</div>
@@ -378,8 +378,8 @@
width: 100%;
height: 234px;
margin-top: 48px;
border-radius: 200px 200px 0 0;
background: linear-gradient(180deg, #9D9E9F 0%, #D4D5D6 100%);
background: url(./img/voice-bg.png);
background-size: 100% 100%;
image {
width: 96px;
@@ -480,6 +480,7 @@
.middle {
height: calc(100% - 378px);
overflow: hidden;
background: #fff;
.tips {

BIN
src/apps/AppBroadcast1/img/voice-bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

3
src/apps/AppBroadcast1/selectMedia.vue
View File

@@ -18,7 +18,7 @@
<div class="right">
<div class="info">
<p>{{ item.name ? item.name.split('.')[0] : '-' }}</p>
<div>李毅 2022-06-09 09:43:45</div>
<div class="time">{{ item.createUserName }} {{ item.createTime }}</div>
</div>
</div>
</div>
@@ -31,6 +31,7 @@
<div class="info">
<p>{{ item.name }}</p>
<div>{{ item.content }}</div>
<div class="time">{{ item.createUserName }} {{ item.createTime }}</div>
</div>
</div>
</div>

13
src/apps/AppMonitoringObject/Add.vue
View File

@@ -100,6 +100,18 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<i>*</i>
<span>共同生活家庭人口数</span>
</div>
<div class="right">
<input placeholder="请输入" type="number" v-model="form.familyCount" :maxlength="20"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-item">
@@ -483,6 +495,7 @@ export default {
foreignWorkers: '',
foreignWorkersAddress: '',
houseIdNumber: '',
familyCount: '',
},
$areaId: '',
girdInfo: {},

4
src/apps/AppMonitoringObject/residentDetail.vue
View File

@@ -65,6 +65,10 @@
<label>残疾证办证年度</label>
<span>{{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}</span>
</div>
<div class="item-info">
<label>家庭人口数</label>
<span>{{ info.familyCount }}</span>
</div>
<!-- 基础保障 -->
<h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">基础保障</h4>
<div class="item-info">

21
src/project/police/AppMessageNotification/SelectUser.vue
View File

@@ -10,6 +10,23 @@
<u-icon name="arrow-down" color="#666" size="24"/>
</AiAreaPicker>
</div>
<div class="area-flex">
<p class="title">部门</p>
<AiAreaPicker v-model="areaList" multiple>
<span class="label" v-if="areaList.length">已选择</span>
<span v-else style="color:#999;">请选择</span>
<u-icon name="arrow-down" color="#666" size="24"/>
</AiAreaPicker>
</div>
<div class="area-flex">
<p class="title">人员</p>
<AiAreaPicker v-model="areaList" multiple>
<span class="label" v-if="areaList.length">已选择</span>
<span v-else style="color:#999;">请选择</span>
<u-icon name="arrow-down" color="#666" size="24"/>
</AiAreaPicker>
</div>
<div class="type-content">
<p class="title">选择标签</p>
<div class="type-list">
@@ -102,12 +119,13 @@ export default {
<style lang="scss" scoped>
.SelectUser {
.select-content{
background-color: #fff;
.area-flex{
display: flex;
justify-content: space-between;
padding: 34px 32px 0;
line-height: 44px;
margin-bottom: 16px;
background-color: #fff;
}
.area-content{
padding: 16px 32px 32px;
@@ -141,6 +159,7 @@ export default {
}
.type-content{
padding: 34px 32px;
background-color: #fff;
}
.type-list{
padding-left: 16px;