Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_yunwei_vue
This commit is contained in:
commit
cffec8699a
|
|
@ -508,9 +508,9 @@
|
|||
margin-top:5px;
|
||||
}
|
||||
.selectDiv:hover{
|
||||
border: 1px solid #a2a3a3;
|
||||
background: #a2a3a3;
|
||||
color:white;
|
||||
border: 1px solid #f4f5fa;
|
||||
background: #f4f5fa;
|
||||
color:#037FEA;
|
||||
border-radius: 10px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
|
||||
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
|
||||
<div v-if="showCamera">
|
||||
<CameraPreviewForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CameraPreviewForm>
|
||||
<CameraPreviewForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
|
||||
</CameraPreviewForm>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -13,13 +14,18 @@
|
|||
<a-col :span="20" style="text-align: center;margin-top: 15px;margin-bottom: 15px;">
|
||||
<!-- 对讲、停止对讲 切换 -->
|
||||
<!-- <img src="../../../../../assets/iot/monitor_1.png" class="buttonImg"/> -->
|
||||
<span class="buttonSpan djImg" @click="startPhone" v-show="!izPhone"><span style="margin-left:30px;">对讲</span></span>
|
||||
<span class="buttonSpan djImg" @click="stopPhone" v-show="izPhone"><span style="margin-left:30px;">结束</span></span>
|
||||
<span class="buttonSpan djImg" @click="startPhone" v-show="!izPhone"><span
|
||||
style="margin-left:30px;">对讲</span></span>
|
||||
<span class="buttonSpan djImg" @click="stopPhone" v-show="izPhone"><span
|
||||
style="margin-left:30px;">结束</span></span>
|
||||
<!-- 流畅、超清 切换 -->
|
||||
<span class="buttonSpan qxdImg" @click="switchResolution"><span style="margin-left:30px;">{{ resolution }}</span></span>
|
||||
<span class="buttonSpan qxdImg" @click="switchResolution"><span style="margin-left:30px;">{{ resolution
|
||||
}}</span></span>
|
||||
<!-- 录制、结束录制 切换 -->
|
||||
<span class="buttonSpan lzImg" @click="recordingStart" v-show="!izRecording"><span style="margin-left:30px;">录制</span></span>
|
||||
<span class="buttonSpan lzImg" @click="recordingEnd" v-show="izRecording"><span style="margin-left:30px;">结束</span></span>
|
||||
<span class="buttonSpan lzImg" @click="recordingStart" v-show="!izRecording"><span
|
||||
style="margin-left:30px;">录制</span></span>
|
||||
<span class="buttonSpan lzImg" @click="recordingEnd" v-show="izRecording"><span
|
||||
style="margin-left:30px;">结束</span></span>
|
||||
|
||||
<span class="buttonSpan jtImg" @click="screenshot"><span style="margin-left:30px;">截图</span></span>
|
||||
<span class="buttonSpan bjImg" @click="manualAlarm"><span style="margin-left:30px;">报警</span></span>
|
||||
|
|
@ -375,63 +381,86 @@
|
|||
<style lang="less" scoped>
|
||||
.selectDiv {
|
||||
text-align: center;
|
||||
border: 1px solid #f6faff;
|
||||
border: 1px solid white;
|
||||
padding: 3px 10px;
|
||||
width: 100px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.selectDiv:hover {
|
||||
border: 1px solid #a2a3a3;
|
||||
background: #a2a3a3;
|
||||
color:white;
|
||||
border: 1px solid #f4f5fa;
|
||||
background: #f4f5fa;
|
||||
color: #037FEA;
|
||||
border-radius: 10px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.buttonSpan {
|
||||
display: inline-flex;
|
||||
align-items: flex-end;
|
||||
margin-left: 20px;
|
||||
padding: 6px 6px;
|
||||
}
|
||||
|
||||
.buttonSpan:hover {
|
||||
//border: 1px solid #1ea0fa;
|
||||
color: #1ea0fa;
|
||||
border-radius: 10px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.djImg {
|
||||
background: url('../../../../../assets/iot/monitor_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.djImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_1_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.qxdImg {
|
||||
background: url('../../../../../assets/iot/monitor_5.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.qxdImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_5_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.lzImg {
|
||||
background: url('../../../../../assets/iot/monitor_4.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.lzImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_4_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.jtImg {
|
||||
background: url('../../../../../assets/iot/monitor_3.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.jtImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_3_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.bjImg {
|
||||
background: url('../../../../../assets/iot/monitor_8.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.bjImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_8_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.fpImg {
|
||||
background: url('../../../../../assets/iot/monitor_6.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.fpImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_6_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.hmxzImg {
|
||||
background: url('../../../../../assets/iot/monitor_7.png') left/contain no-repeat;
|
||||
}
|
||||
|
||||
.hmxzImg:hover {
|
||||
background: url('../../../../../assets/iot/monitor_7_1.png') left/contain no-repeat;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
<template>
|
||||
<BasicDrawer
|
||||
v-bind="$attrs"
|
||||
@register="registerDrawer"
|
||||
:title="getTitle"
|
||||
:width="adaptiveWidth"
|
||||
@ok="handleSubmit"
|
||||
:showFooter="showFooter"
|
||||
destroyOnClose
|
||||
>
|
||||
<BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="getTitle" :width="adaptiveWidth" @ok="handleSubmit"
|
||||
:showFooter="showFooter" destroyOnClose>
|
||||
<div class="card-class">
|
||||
<BasicForm @register="registerForm"></BasicForm>
|
||||
</div>
|
||||
</BasicDrawer>
|
||||
</template>
|
||||
|
||||
|
|
@ -57,7 +52,7 @@ const getTitle = computed(() => {
|
|||
if (!unref(isUpdate)) {
|
||||
return '新增维护设备';
|
||||
} else {
|
||||
return unref(showFooter) ? '指定派往机构' : '维护设备详情';
|
||||
return unref(showFooter) ? '指定派往机构' : '详情';
|
||||
}
|
||||
});
|
||||
const { adaptiveWidth } = useDrawerAdaptiveWidth();
|
||||
|
|
@ -79,4 +74,15 @@ async function handleSubmit() {
|
|||
}
|
||||
</script>
|
||||
|
||||
<style scoped></style>
|
||||
<style lang="less" scoped>
|
||||
.card-class {
|
||||
padding-top: 24px;
|
||||
padding-bottom: 24px;
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
background-color: #fcfdff;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ export const formSchema: FormSchema[] = [
|
|||
showCount: true,
|
||||
maxlength: 1000,
|
||||
autosize:{
|
||||
minRows: 5
|
||||
minRows: 1
|
||||
},
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue