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

Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

Browse Source
This commit is contained in:
yanran200730
2023-04-28 16:02:15 +08:00
parent 973ca20fb6 5b5fcd2a88
commit e84f8b4c18
3 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/device/AppMediaManage/components/Play.vue
View File

@@ -16,7 +16,7 @@
:selectList="$dict.getDict('dlbMessageUrgency')"></ai-select>
</el-form-item>
<el-form-item label="设备行政区划">
<ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" size="small" placeholder="请选择行政区划"/>
<ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" size="small" placeholder="请选择行政区划"/>
</el-form-item>
<el-form-item label="播放方式" prop="taskType" class="buildingTypes">
<el-radio-group v-model="formData.taskType">
@@ -46,7 +46,7 @@
</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>
value-format="yyyy-MM-dd" :picker-options="{disabledDate}"/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime" v-if="formData.taskType != 0">
<el-time-picker v-model="formData.startTime" placeholder="开始时间" size="small"
@@ -59,8 +59,9 @@
value-format="HH:mm:ss"></el-time-picker>
</el-form-item>
<el-form-item label="播放设备" v-if="areaId" prop="serialNo" style="width: 100%;">
<ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
@select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
<ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name"
:action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
@select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
</el-form-item>
</el-form>
</template>
@@ -188,8 +189,8 @@ export default {
watch: {
userAreaId: {
handler: function(v) {
this.areaRootId = [v?.substr(0,6),'000000'].join("")
handler: function (v) {
this.areaRootId = [v?.substr(0, 6), '000000'].join("")
},
deep: true
}
@@ -204,7 +205,8 @@ export default {
},
methods: {
// 选择设备
getSelect() {},
getSelect() {
},
getMediaList() {
return this.instance.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => {
if (res?.data) {
@@ -232,7 +234,7 @@ export default {
// 播放
confirm() {
if(!this.areaId) {
if (!this.areaId) {
this.$message.error('请选择所要播放设备的行政区划！')
}
this.$refs['ruleForm'].validate((valid) => {
@@ -286,6 +288,9 @@ export default {
isRefresh: !!isRefresh,
})
},
disabledDate(time) {
return new Date(time).getTime() - new Date().getTime() < -24 * 60 * 60 * 1000
}
},
}
</script>
@@ -294,6 +299,7 @@ export default {
.Play {
.equipment {
position: relative;
.select {
position: absolute;
right: 0;
@@ -315,11 +321,13 @@ export default {
display: flex;
width: 100%;
height: 100%;
.item {
flex: 1;
display: inline-block;
height: auto;
border: 1px solid #DDD;
.title {
display: flex;
justify-content: space-between;
@@ -328,10 +336,12 @@ export default {
height: 50px;
align-items: center;
border-bottom: 1px solid #DDD;
.checkBox {
align-self: center;
}
}
.content {
padding: 10px;
box-sizing: border-box;