BUG 25869

This commit is contained in:
aixianling
2021-12-24 15:23:43 +08:00
parent 8b56199ce7
commit 2cd746f1d1

View File

@@ -11,10 +11,12 @@
<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>
<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>
<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">
@@ -23,9 +25,11 @@
</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>
<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-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>
@@ -37,16 +41,22 @@
</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-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-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-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-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>
@@ -60,7 +70,7 @@
</template>
<script>
import { mapState } from 'vuex'
import {mapState} from 'vuex'
export default {
name: 'Add',
@@ -74,8 +84,8 @@ export default {
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) {
var time = myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
if (this.timeToSec(value) - this.timeToSec(time) > 0) {
callback()
} else {
callback(new Error('开始时间要大于当前时间'));
@@ -86,7 +96,7 @@ export default {
};
let endTimePass = (rule, value, callback) => {
if (value) {
if (this.timeToSec(value) - this.timeToSec(this.formData.startTime)> 0) {
if (this.timeToSec(value) - this.timeToSec(this.formData.startTime) > 0) {
callback()
} else {
callback(new Error('结束时间要大于开始时间'));
@@ -111,34 +121,34 @@ export default {
},
formRules: {
mediaId: [
{ required: true, message: '请选择播发内容', trigger: 'change' }
{required: true, message: '请选择播发内容', trigger: 'change'}
],
serialNo: [
{ required: true, message: '请选择播放设备', trigger: 'change' }
{required: true, message: '请选择播放设备', trigger: 'change'}
],
messageLevel: [
{ required: true, message: '请选择播发级别', trigger: 'change' }
{required: true, message: '请选择播发级别', trigger: 'change'}
],
cyclingType: [
{ required: true, message: '请选择定时策略', trigger: 'change' }
{required: true, message: '请选择定时策略', trigger: 'change'}
],
taskType: [
{ required: true, message: '请选择播放方式', trigger: 'change' }
{required: true, message: '请选择播放方式', trigger: 'change'}
],
broadcastDay: [
{ required: true, message: '请输入播放天数', trigger: 'change' }
{required: true, message: '请输入播放天数', trigger: 'change'}
],
startDate: [
{ required: true, message: '请选择开始日期', trigger: 'change' }
{required: true, message: '请选择开始日期', trigger: 'change'}
],
startTime: [
{ required: true, validator: startTimePass, trigger: 'change' }
{required: true, validator: startTimePass, trigger: 'change'}
],
endTime: [
{ required: true, validator: endTimePass, trigger: 'change' }
{required: true, validator: endTimePass, trigger: 'change'}
],
checkList: [
{ required: true, message: '播放天数', trigger: 'change' }
{required: true, message: '播放天数', trigger: 'change'}
],
},
mediaList: [],
@@ -153,57 +163,40 @@ export default {
},
newDate() {
var myDate = new Date();
var time = myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
return time
return myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
}
},
created() {
this.formData.mediaId = this.params.id
this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType').then(() => {
this.getEquipmentList()
this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType')
Promise.all([this.getEquipmentList(), this.getMediaList()]).then(() => {
this.formData.mediaId = this.params.id
})
},
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()
// }
return this.instance.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => {
if (res?.data) {
this.mediaList = res.data.records?.map((item) => ({
dictName: item.name,
dictValue: item.id
})) || []
}
})
},
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()
return this.instance.post(`/app/appdlbquipment/getDlbDeviceList?current=1&size=10000&devStatus=5`).then((res) => {
if (res?.data) {
this.equipmentList = res.data.records?.map((item) => ({
dictName: item.deviceName,
dictValue: item.serialNo
})) || []
}
})
},
confirm() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
if(this.formData.checkList.length) {
if (this.formData.checkList.length) {
this.formData.cyclingDate = this.formData.checkList.join(',')
}
this.formData.coverageType = '4'
@@ -224,27 +217,27 @@ export default {
},
getDetail() {
this.instance.post(`/app/appzyvideobroadcast/queryDetailById?id=${this.params.id}`).then((res) => {
if (res.code == 0) {
if (res?.data) {
this.formData = {
...res.data,
checkList: []
}
this.formData.mediaId = String(this.formData.mediaId)
this.formData.cyclingType = String(this.formData.cyclingType)
if(this.formData.cyclingDate) {
if (this.formData.cyclingDate) {
this.formData.checkList = this.formData.cyclingDate.split(',')
}
}
})
},
timeToSec(time) {
var s = "";
var s = "";
var hour = time.split(":")[0];
var min = time.split(":")[1];
var second = time.split(":")[2];
var second = time.split(":")[2];
s = Number(hour * 3600) + Number(min * 60) + Number(second)
return s;
},
},
// 返回按钮
cancel(isRefresh) {
this.$emit('change', {