Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-12-15 17:27:50 +08:00
commit 338040370b
1 changed files with 30 additions and 1 deletions

View File

@ -345,7 +345,22 @@
label="预约部门"
v-bind="validateInfos.dept"
>
<a-input v-model:value="formState.dept" style="width: 72%" />
<!-- <a-input v-model:value="formState.dept" style="width: 72%" /> -->
<a-select
ref="select"
v-model:value="formState.dept"
style="width: 200px"
dropdown-class-name="eia-dropdown-class"
:showSearch="true"
>
<a-select-option
:value="item.value"
v-for="item in deptList"
:key="item.value"
>
{{ item.label }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
@ -796,6 +811,7 @@
selectByChannelCode,
} from '@/api/videoSurveillance'
import { getCameraByCondition } from '@/api/file'
import { getDeptAll } from '@/api/user'
import {
getUser,
getEnkeUsers,
@ -853,6 +869,16 @@
'fullScreen',
], //,
})
const deptList = ref([])
getDeptAll().then((res) => {
deptList.value = []
res.data.data.map((val) => {
deptList.value.push({
value: val.name,
label: val.name,
})
})
})
const meetingList = ref([])
const meetingPagination = ref({
total: 0,
@ -2839,6 +2865,9 @@
}
</style>
<style lang="less">
.eia-dropdown-class {
z-index: 10010 !important;
}
.wrj {
.ant-modal-body {
height: 700px !important;