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 2023-01-06 17:15:59 +08:00
commit 2460d6aa5f
1 changed files with 57 additions and 69 deletions

View File

@ -357,7 +357,7 @@
:showSearch="true" :showSearch="true"
> >
<a-select-option <a-select-option
:value="item.value" :value="item.label"
v-for="item in deptList" v-for="item in deptList"
:key="item.value" :key="item.value"
> >
@ -408,23 +408,12 @@
:wrapper-col="{ span: 14, offset: 4 }" :wrapper-col="{ span: 14, offset: 4 }"
style="text-align: center; margin-top: 0.4rem" style="text-align: center; margin-top: 0.4rem"
> >
<a-button <a-button class="tijiao" @click="onSubmit">提交</a-button>
class="tijiao"
@click="onSubmit"
>
提交
</a-button>
<a-button class="quxiao" @click="appointmentRoom = false"> <a-button class="quxiao" @click="appointmentRoom = false">
取消 取消
</a-button> </a-button>
</a-form-item> </a-form-item>
</a-form> </a-form>
</a-modal> </a-modal>
</div> </div>
<div v-if="room"> <div v-if="room">
@ -882,7 +871,7 @@
deptList.value = [] deptList.value = []
res.data.data.map((val) => { res.data.data.map((val) => {
deptList.value.push({ deptList.value.push({
value: val.name, value: val.id,
label: val.name, label: val.name,
}) })
}) })
@ -1215,7 +1204,8 @@
if (item && item.status != 1) { if (item && item.status != 1) {
return return
// return message.warning('线, ') // return message.warning('线, ')
}handleChose }
handleChose
console.log('打开视频', id) console.log('打开视频', id)
const param = { const param = {
key: id, key: id,
@ -2520,7 +2510,6 @@
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.quxiao { .quxiao {
margin-right: 12px; margin-right: 12px;
cursor: pointer; cursor: pointer;
@ -2912,7 +2901,6 @@
:deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after) { :deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after) {
background-color: #0058e1; background-color: #0058e1;
} }
</style> </style>
<style lang="less"> <style lang="less">
.eia-dropdown-class { .eia-dropdown-class {