Compare commits

..

No commits in common. "344bb3b0da9cb722f9616a75bdf54f0fa1b33f31" and "032b7b514a6e8bffe621b636a59f55d89b03fcce" have entirely different histories.

11 changed files with 447 additions and 687 deletions

View File

@ -21,7 +21,7 @@
<el-form-item label="赋能领域:" prop="unit"> <el-form-item label="赋能领域:" prop="unit">
<el-select v-model="dataForm.applicationArea" placeholder="请选择"> <el-select v-model="dataForm.applicationArea" placeholder="请选择">
<el-option v-for="item in sceneAreas" :key="item.data" :label="item.dict_label" <el-option v-for="item in sceneAreas" :key="item.data" :label="item.dict_label"
:value="item.dict_label"></el-option> :value="item.dict_value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="场景名称:" prop="name"> <el-form-item label="场景名称:" prop="name">

View File

@ -36,7 +36,7 @@
<el-form-item label="赋能领域:" prop="unit"> <el-form-item label="赋能领域:" prop="unit">
<el-select v-model="dataForm.applicationArea" placeholder="请选择"> <el-select v-model="dataForm.applicationArea" placeholder="请选择">
<el-option v-for="item in sceneAreas" :key="item.data" :label="item.dict_label" <el-option v-for="item in sceneAreas" :key="item.data" :label="item.dict_label"
:value="item.dict_label"></el-option> :value="item.dict_value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="场景名称:" prop="name"> <el-form-item label="场景名称:" prop="name">

View File

@ -588,11 +588,3 @@ export function sysnoticemanagement(params) {
params, params,
}) })
} }
//
export function getRegion(params) {
return request({
url: '/sys/region/list/',
method: 'get',
params,
})
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -667,23 +667,12 @@
</script> </script>
<style> <style>
.ant-modal-footer { .ant-modal-footer {
display: block; display: block;
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
:deep(.ant-table-tbody > tr.ant-table-row-selected > td){
background: #e6eefb;
}
:deep(.ant-checkbox-checked .ant-checkbox-inner){
background-color: #0058e1;
}
:deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after){
background-color: #0058e1;
}
.bg { .bg {
background: #fff; background: #fff;
height: 100vh; height: 100vh;
@ -895,7 +884,6 @@
.modal-box { .modal-box {
height: 650px; height: 650px;
width: 800px; width: 800px;
} }
.add-img { .add-img {

View File

@ -82,14 +82,14 @@ watch(
justify-items: center; justify-items: center;
.caseBox { .caseBox {
width: 3.5rem; width: 3.5rem;
height: 3rem; height: 3rem;
border: 1px solid #ebecef; box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
box-shadow: 1px 1px 5px 5px rgb(222 222 222 / 15%); background: #ffffff;
background: #ffffff; border-radius: 0.05rem;
padding: 0.2rem; padding: 0.2rem;
margin-bottom: 0.2rem; margin-bottom: 0.2rem;
cursor: pointer; cursor: pointer;
img { img {
width: 3rem; width: 3rem;

View File

@ -189,9 +189,6 @@
}else if(newValue=='/demandDetails'){ }else if(newValue=='/demandDetails'){
select.value='demandCenter' select.value='demandCenter'
} }
else if(newValue=='/integrationServicesDetails'){
select.value='integrationServices'
}
}, },
{ immediate: true } { immediate: true }

View File

@ -969,7 +969,6 @@
// margin: 11px 0 20px; // margin: 11px 0 20px;
// background: #e5f2ff; // background: #e5f2ff;
// padding-left: 20px; // padding-left: 20px;
padding-top:10px;
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;

View File

@ -408,23 +408,18 @@
: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 @click="appointmentRoom = false" type="primary" danger>
class="tijiao" 取消
</a-button>
<a-button
style="margin-left: 10px"
type="primary"
@click="onSubmit" @click="onSubmit"
> >
提交 提交
</a-button> </a-button>
<a-button class="quxiao" @click="appointmentRoom = false" >
取消
</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">
@ -1215,7 +1210,7 @@
if (item && item.status != 1) { if (item && item.status != 1) {
return return
// return message.warning('线, ') // return message.warning('线, ')
}handleChose }
console.log('打开视频', id) console.log('打开视频', id)
const param = { const param = {
key: id, key: id,
@ -2520,38 +2515,6 @@
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.quxiao{
margin-right:12px;
cursor: pointer;
width: 90px;
height: 32px;
background: #ffffff;
color:#0058e1;
border-radius: 2px;
border: 1px #0058e1 solid;
}
.quxiao:hover{
background: #fff;
color: #0558e1;
opacity: 0.8;
}
.tijiao{
margin-right:12px;
cursor: pointer;
width: 90px;
height: 32px;
background: #0058e1;
color:#ffffff;
border-radius: 2px;
border: 1px #0058e1 solid;
margin-left:20px;
}
.tijiao:hover{
background: #0558e1;
color: #fff;
opacity: 0.8;
}
.queding { .queding {
margin-left: 16px; margin-left: 16px;
cursor: pointer; cursor: pointer;
@ -2899,20 +2862,10 @@
// } // }
} }
:deep(.ant-table-thead > tr > th) { :deep(.ant-table-thead > tr > th) {
color: #0058e1 !important; color: #5580f7 !important;
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){
background: #e6eefb;
}
:deep(.ant-checkbox-checked .ant-checkbox-inner){
background-color: #0058e1;
}
:deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after){
background-color: #0058e1;
}
</style> </style>
<style lang="less"> <style lang="less">
.eia-dropdown-class { .eia-dropdown-class {
@ -2944,19 +2897,16 @@
.appModal { .appModal {
.ant-modal-body { .ant-modal-body {
height: 3.8rem !important; height: 4.8rem !important;
overflow-y: scroll !important; overflow-y: scroll !important;
} }
.ant-modal-title { .ant-modal-title {
font-weight: 600; font-weight: 600;
color:#fff;
} }
.ant-modal-content { .ant-modal-content {
.ant-modal-header { .ant-modal-header {
background: #0058e1;
margin-bottom: 16px;
border-bottom: 0 !important; border-bottom: 0 !important;
} }
} }

File diff suppressed because it is too large Load Diff