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

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

Browse Source 
# Conflicts:
#	packages/2.0.5/AppGridMap/components/list.vue
This commit is contained in:
aixianling
2021-12-22 17:08:32 +08:00
parent 302674273a f9cfba00bc
commit c2dd5e8d29
20 changed files with 372 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/2.0.5/AppBroadcast/components/List.vue vendored
View File

@@ -21,7 +21,7 @@
</ai-search-bar>
<ai-search-bar class="ai-search-ba mar-t10">
<template slot="left">
<el-button icon="iconfont iconAdd" type="primary" size="small" @click="onAdd('')">添加</el-button>
<!-- <el-button icon="iconfont iconAdd" type="primary" size="small" @click="onAdd('')">添加</el-button> -->
<!-- <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button> -->
</template>
</ai-search-bar>

6
packages/2.0.5/AppBuildManage/components/BuildMsg.vue vendored
View File

@@ -83,11 +83,11 @@
</template>
</el-table-column>
<el-table-column slot="options" label="操作" align="center" fixed="right" width="130">
<template slot-scope="{ row }">
<el-table-column slot="options" label="操作" align="center" fixed="right" width="140">
<div class="table-options" slot-scope="{ row }">
<el-button type="text" @click="toEdit(row.id, 'edit')">编辑</el-button>
<el-button type="text" @click="toEdit(row.id, 'detail')">详情</el-button>
</template>
</div>
</el-table-column>
</ai-table>

8
packages/2.0.5/AppBuildManage/components/List.vue vendored
View File

@@ -46,15 +46,15 @@
</template>
</el-table-column>
<el-table-column slot="options" label="操作" align="center" width="300px" fixed="right">
<template slot-scope="{ row }">
<el-table-column slot="options" label="操作" align="center" width="240px" fixed="right">
<div class="table-options" slot-scope="{ row }">
<el-button type="text" @click="onAdd(row.id)">编辑</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button>
<el-button type="text" @click="toBuildMsg(row)">房屋信息</el-button>
<el-button type="text" @click="$router.push({ name: '房屋地图', query: { communityId: row.communityId, buildingId: row.id, unitNum: 1, buildingNumber: row.buildingNumber } })">
<el-button type="text" @click="$router.push({ name: '63', query: { communityId: row.communityId, buildingId: row.id, unitNum: 1, buildingNumber: row.buildingNumber } })">
楼栋模型
</el-button>
</template>
</div>
</el-table-column>
</ai-table>
</div>

2
packages/2.0.5/AppGridMap/components/list.vue vendored
View File

@@ -3,7 +3,7 @@
<ai-map :map.sync="map" :lib.sync="mapLib"/>
<div class="drawer" ref="drawer">
<div v-if="show" class="drawer-content">
<b>网格管理</b>
<b>网格地图</b>
<div class="tree">
<div class="input">
<el-input

8
packages/2.0.5/AppMediaManage/AppMediaManage.vue vendored
View File

@@ -9,6 +9,7 @@
<script>
import List from './components/List'
import Add from './components/Add'
import Play from './components/Play'
export default {
label: '媒资管理',
@@ -28,7 +29,8 @@ export default {
components: {
Add,
List
List,
Play
},
methods: {
onChange(data) {
@@ -36,6 +38,10 @@ export default {
this.component = 'Add'
this.params = data.params
}
if (data.type === 'Play') {
this.component = 'Play'
this.params = data.params
}
if (data.type == 'list') {
this.component = 'List'

14
packages/2.0.5/AppMediaManage/components/List.vue vendored
View File

@@ -31,9 +31,10 @@
</template>
</el-table-column>
<el-table-column slot="options" label="操作" align="center" width="180" fixed="right">
<template slot-scope="{ row }">
<div class="table-options" slot-scope="{ row }">
<el-button type="text" @click="play(row.id)">播发</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button>
</template>
</div>
</el-table-column>
</ai-table>
</template>
@@ -136,6 +137,15 @@ export default {
})
},
play (id) {
this.$emit('change', {
type: 'Play',
params: {
id: id || ''
},
})
},
// 添加
onAdd(id) {
this.$emit('change', {

261
packages/2.0.5/AppMediaManage/components/Play.vue vendored Normal file
View File

@@ -0,0 +1,261 @@
<template>
<ai-detail>
<template #title>
<ai-title title="添加广播" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template>
<template #content>
<ai-card title="基础信息">
<template #content>
<el-form class="ai-form" :model="formData" :rules="formRules" ref="ruleForm" label-width="120px">
<el-form-item label="播发内容" prop="mediaId">
<ai-select v-model="formData.mediaId" placeholder="播发内容" clearable :selectList="mediaList"></ai-select>
</el-form-item>
<el-form-item label="播放设备" prop="serialNo">
<ai-select v-model="formData.serialNo" placeholder="播放设备" clearable :selectList="equipmentList"></ai-select>
</el-form-item>
<el-form-item label="播发级别" prop="messageLevel">
<ai-select v-model="formData.messageLevel" placeholder="播发级别" clearable :selectList="$dict.getDict('dlbMessageUrgency')"></ai-select>
</el-form-item>
<el-form-item label="播放方式" prop="taskType" class="buildingTypes">
<el-radio-group v-model="formData.taskType">
<el-radio label="0">立即播放</el-radio>
<el-radio label="1">定时播放</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="定时策略" prop="cyclingType" v-if="formData.taskType != 0">
<ai-select v-model="formData.cyclingType" placeholder="定时策略" clearable :selectList="$dict.getDict('dlbDyclingType')"></ai-select>
</el-form-item>
<el-form-item label="播放天数" prop="checkList" class="buildingTypes" v-if="formData.taskType != 0 && formData.cyclingType == 2">
<el-checkbox-group v-model="formData.checkList">
<el-checkbox label="1">每周一</el-checkbox>
<el-checkbox label="2">每周二</el-checkbox>
<el-checkbox label="3">每周三</el-checkbox>
<el-checkbox label="4">每周四</el-checkbox>
<el-checkbox label="5">每周五</el-checkbox>
<el-checkbox label="6">每周六</el-checkbox>
<el-checkbox label="7">每周日</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="播放天数" prop="broadcastDay" v-if="formData.taskType != 0 && formData.cyclingType == 3">
<el-input v-model="formData.broadcastDay" placeholder="播放天数" clearable size="small" maxlength="4"></el-input>
</el-form-item>
<el-form-item label="开始日期" prop="startDate" v-if="formData.taskType != 0">
<el-date-picker v-model="formData.startDate" type="date" placeholder="选择日期" size="small" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="开始时间" prop="startTime" v-if="formData.taskType != 0">
<el-time-picker v-model="formData.startTime" placeholder="开始时间" size="small" :picker-options="{ start: newDate, minTime: newDate}" value-format="HH:mm:ss"></el-time-picker>
</el-form-item>
<el-form-item label="结束时间" prop="endTime" v-if="formData.taskType != 0">
<el-time-picker v-model="formData.endTime" placeholder="结束时间" size="small" :picker-options="{ start: formData.startTime, minTime: formData.startTime}" value-format="HH:mm:ss"></el-time-picker>
</el-form-item>
</el-form>
</template>
</ai-card>
</template>
<template #footer>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="confirm()">提交</el-button>
</template>
</ai-detail>
</template>
<script>
import { mapState } from 'vuex'
export default {
name: 'Add',
components: {},
props: {
dict: Object,
params: Object,
instance: Function,
},
data() {
let startTimePass = (rule, value, callback) => {
if (value) {
var myDate = new Date();
var time = myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
if (this.timeToSec(value) - this.timeToSec(time)> 0) {
callback()
} else {
callback(new Error('开始时间要大于当前时间'));
}
} else {
callback(new Error('请选择开始时间'));
}
};
let endTimePass = (rule, value, callback) => {
if (value) {
if (this.timeToSec(value) - this.timeToSec(this.formData.startTime)> 0) {
callback()
} else {
callback(new Error('结束时间要大于开始时间'));
}
} else {
callback(new Error('请选择结束时间'));
}
}
return {
formData: {
mediaId: '',
serialNo: '',
messageLevel: '',
cyclingType: '',
taskType: '0',
cyclingDate: '',
broadcastDay: '',
startDate: '',
startTime: '',
endTime: '',
checkList: []
},
formRules: {
mediaId: [
{ required: true, message: '请选择播发内容', trigger: 'change' }
],
serialNo: [
{ required: true, message: '请选择播放设备', trigger: 'change' }
],
messageLevel: [
{ required: true, message: '请选择播发级别', trigger: 'change' }
],
cyclingType: [
{ required: true, message: '请选择定时策略', trigger: 'change' }
],
taskType: [
{ required: true, message: '请选择播放方式', trigger: 'change' }
],
broadcastDay: [
{ required: true, message: '请输入播放天数', trigger: 'change' }
],
startDate: [
{ required: true, message: '请选择开始日期', trigger: 'change' }
],
startTime: [
{ required: true, validator: startTimePass, trigger: 'change' }
],
endTime: [
{ required: true, validator: endTimePass, trigger: 'change' }
],
checkList: [
{ required: true, message: '播放天数', trigger: 'change' }
],
},
mediaList: [],
equipmentList: []
}
},
computed: {
...mapState(['user']),
isEdit() {
return !!this.params.id
},
newDate() {
var myDate = new Date();
var time = myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
return time
}
},
created() {
this.formData.mediaId = this.params.id
this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType').then(() => {
this.getEquipmentList()
})
},
methods: {
getMediaList() {
this.instance.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => {
if (res.code == 0) {
this.mediaList = []
if(res.data && res.data.records.length) {
res.data.records.map((item) => {
let info = {
dictName: item.name,
dictValue: item.id
}
this.mediaList.push(info)
})
}
// if(this.params.id) {
// this.getDetail()
// }
}
})
},
getEquipmentList() {
this.instance.post(`/app/appdlbquipment/getDlbDeviceList?current=1&size=10000&devStatus=5&keyword=`).then((res) => {
if (res.code == 0) {
this.equipmentList = []
if(res.data && res.data.records.length) {
res.data.records.map((item) => {
let info = {
dictName: item.deviceName,
dictValue: item.serialNo
}
this.equipmentList.push(info)
})
}
this.getMediaList()
}
})
},
confirm() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
if(this.formData.checkList.length) {
this.formData.cyclingDate = this.formData.checkList.join(',')
}
this.formData.coverageType = '4'
this.formData.id = ''
this.instance.post(`/app/appzyvideobroadcast/play`, {
...this.formData,
})
.then((res) => {
if (res.code == 0) {
this.$message.success('提交成功')
setTimeout(() => {
this.cancel(true)
}, 1000)
}
})
}
})
},
getDetail() {
this.instance.post(`/app/appzyvideobroadcast/queryDetailById?id=${this.params.id}`).then((res) => {
if (res.code == 0) {
this.formData = {
...res.data,
checkList: []
}
this.formData.mediaId = String(this.formData.mediaId)
this.formData.cyclingType = String(this.formData.cyclingType)
if(this.formData.cyclingDate) {
this.formData.checkList = this.formData.cyclingDate.split(',')
}
}
})
},
timeToSec(time) {
var s = "";
var hour = time.split(":")[0];
var min = time.split(":")[1];
var second = time.split(":")[2];
s = Number(hour * 3600) + Number(min * 60) + Number(second)
return s;
},
// 返回按钮
cancel(isRefresh) {
this.$emit('change', {
type: 'list',
isRefresh: !!isRefresh,
})
},
},
}
</script>
<style lang="scss" scoped>
</style>