wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

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
parent 67d7ea2b97 7c55f118b5
commit 2460d6aa5f
1 changed files with 57 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
front/src/views/home/infrastructurePage.vue
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" <a-button class="quxiao" @click="appointmentRoom = false">
@click="onSubmit"
>
提交
</a-button>
<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,34 +2510,33 @@
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.quxiao {
.quxiao{ margin-right: 12px;
margin-right:12px;
cursor: pointer; cursor: pointer;
width: 90px; width: 90px;
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
color:#0058e1; color: #0058e1;
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
} }
.quxiao:hover{ .quxiao:hover {
background: #fff; background: #fff;
color: #0558e1; color: #0558e1;
opacity: 0.8; opacity: 0.8;
} }
.tijiao{ .tijiao {
margin-right:12px; margin-right: 12px;
cursor: pointer; cursor: pointer;
width: 90px; width: 90px;
height: 32px; height: 32px;
background: #0058e1; background: #0058e1;
color:#ffffff; color: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
margin-left:20px; margin-left: 20px;
} }
.tijiao:hover{ .tijiao:hover {
background: #0558e1; background: #0558e1;
color: #fff; color: #fff;
opacity: 0.8; opacity: 0.8;
@ -2870,7 +2859,7 @@
.rightContent { .rightContent {
height: 1.75rem; height: 1.75rem;
width: 5.8rem; width: 5.8rem;
margin-right:72px; margin-right: 72px;
.topContent { .topContent {
font-size: 0.2rem; font-size: 0.2rem;
color: #000; color: #000;
@ -2903,16 +2892,15 @@
font-size: 16px !important; font-size: 16px !important;
font-weight: 600 !important; font-weight: 600 !important;
} }
:deep(.ant-table-tbody > tr.ant-table-row-selected > td){ :deep(.ant-table-tbody > tr.ant-table-row-selected > td) {
background: #e6eefb; background: #e6eefb;
} }
:deep(.ant-checkbox-checked .ant-checkbox-inner){ :deep(.ant-checkbox-checked .ant-checkbox-inner) {
background-color: #0058e1; background-color: #0058e1;
} }
: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 {
@ -2950,7 +2938,7 @@
.ant-modal-title { .ant-modal-title {
font-weight: 600; font-weight: 600;
color:#fff; color: #fff;
} }
.ant-modal-content { .ant-modal-content {