修改bug
This commit is contained in:
parent
83d417e1c6
commit
f53ce49302
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
.ant-drawer-body {
|
.ant-drawer-body {
|
||||||
// background: url(../resource/img/modalback.png);
|
// background: url(../resource/img/modalback.png);
|
||||||
|
padding: 12px !important;
|
||||||
background: linear-gradient(135deg, #f6faff 0%, #f1f7ff 100%);
|
background: linear-gradient(135deg, #f6faff 0%, #f1f7ff 100%);
|
||||||
}
|
}
|
||||||
.ant-modal {
|
.ant-modal {
|
||||||
|
@ -139,7 +139,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.ant-modal-confirm .ant-modal-body {
|
.ant-modal-confirm .ant-modal-body {
|
||||||
padding: 24px !important;
|
padding: 12px !important;
|
||||||
}
|
}
|
||||||
@media screen and (max-height: 600px) {
|
@media screen and (max-height: 600px) {
|
||||||
.ant-modal {
|
.ant-modal {
|
||||||
|
|
|
@ -132,4 +132,4 @@ html.dark {
|
||||||
padding: 24px 16px 16px 16px;
|
padding: 24px 16px 16px 16px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,7 +4,15 @@
|
||||||
@import './btn.less';
|
@import './btn.less';
|
||||||
// update-end--author:liaozhiyang---date:20240130---for:【issues/5857】Button color类型颜色失效
|
// update-end--author:liaozhiyang---date:20240130---for:【issues/5857】Button color类型颜色失效
|
||||||
// @import './table.less';
|
// @import './table.less';
|
||||||
|
.jeecg-basic-table-form-container .ant-form {
|
||||||
|
margin-bottom: 14px !important;
|
||||||
|
}
|
||||||
|
.ant-row {
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
.table-page-search-submitButtons[data-v-6bf815c6] {
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
// TODO beta.11 fix
|
// TODO beta.11 fix
|
||||||
.ant-col {
|
.ant-col {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
|
@ -60,9 +60,9 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- <a-divider /> -->
|
<!-- <a-divider /> -->
|
||||||
<div style="text-align: left;margin: 12px 0;">
|
<div style="text-align: left;margin: 12px 0;">
|
||||||
<a-button type="dashed" size="small" @click="handlePrview(item)">预览</a-button>
|
<a-button type="dashed" size="small" @click="handlePrview(item)" style="font-size: 12px;">预览</a-button>
|
||||||
<a-button type="dashed" size="small" @click="handleOrgSelected(item)" style="margin-left:10px;">配置</a-button>
|
<a-button type="dashed" size="small" @click="handleOrgSelected(item)" style="font-size: 12px;margin-left:10px;">配置</a-button>
|
||||||
<a-button type="dashed" size="small" @click="handleAddContent(item)" style="margin-left:10px;">日志</a-button>
|
<a-button type="dashed" size="small" @click="handleAddContent(item)" style="font-size: 12px;margin-left:10px;">日志</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-card>
|
</a-card>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="p-2">
|
||||||
<!--引用表格-->
|
<!--引用表格-->
|
||||||
<BasicTable @register="registerTable">
|
<BasicTable @register="registerTable">
|
||||||
<!--插槽:table标题-->
|
<!--插槽:table标题-->
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="p-2">
|
||||||
<a-tabs v-model:activeKey="tabActiveKey" class="tabs-container">
|
<a-tabs v-model:activeKey="tabActiveKey" class="tabs-container">
|
||||||
<a-tab-pane key="dataAsync" tab="配置信息">
|
<a-tab-pane key="dataAsync" tab="配置信息">
|
||||||
<!--引用表格-->
|
<!--引用表格-->
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="p-2">
|
<div>
|
||||||
<!--查询区域-->
|
<!--查询区域-->
|
||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="p-2">
|
<div>
|
||||||
<!--查询区域-->
|
<!--查询区域-->
|
||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="p-2">
|
||||||
<a-tabs v-model:activeKey="tabActiveKey" class="tabs-container">
|
<a-tabs v-model:activeKey="tabActiveKey" class="tabs-container">
|
||||||
<a-tab-pane key="dataAsync" tab="配置信息">
|
<a-tab-pane key="dataAsync" tab="配置信息">
|
||||||
<!--引用表格-->
|
<!--引用表格-->
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="p-2">
|
<div>
|
||||||
<a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
|
<a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
|
||||||
<a-tab-pane key="3" tab="抄表" >
|
<a-tab-pane key="3" tab="抄表" >
|
||||||
<ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>
|
<ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="p-2">
|
<div>
|
||||||
<a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
|
<a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
|
||||||
<a-tab-pane key="42" tab="抄表" >
|
<a-tab-pane key="42" tab="抄表" >
|
||||||
<ApiRequestLogList ref="ApiRequestLogListModal42"></ApiRequestLogList>
|
<ApiRequestLogList ref="ApiRequestLogListModal42"></ApiRequestLogList>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="p-2">
|
||||||
<a-tabs v-model:activeKey="tabActiveKey" class="tabs-container">
|
<a-tabs v-model:activeKey="tabActiveKey" class="tabs-container">
|
||||||
<a-tab-pane key="dataAsync" tab="配置信息">
|
<a-tab-pane key="dataAsync" tab="配置信息">
|
||||||
<!--引用表格-->
|
<!--引用表格-->
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
|
<div>
|
||||||
|
|
||||||
<!--引用表格-->
|
<!--引用表格-->
|
||||||
<BasicTable @register="registerTable">
|
<BasicTable @register="registerTable">
|
||||||
<!--插槽:table标题-->
|
<!--插槽:table标题-->
|
||||||
|
@ -7,6 +9,7 @@
|
||||||
<template v-slot:bodyCell="{ column, record, index, text }">
|
<template v-slot:bodyCell="{ column, record, index, text }">
|
||||||
</template>
|
</template>
|
||||||
</BasicTable>
|
</BasicTable>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" name="yiweilian-apiLogList" setup>
|
<script lang="ts" name="yiweilian-apiLogList" setup>
|
||||||
|
@ -110,5 +113,8 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
.jeecg-basic-table-form-container {
|
||||||
|
padding: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" bodyStyle="padding:14px;"
|
||||||
</j-modal> -->
|
|
||||||
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
|
|
||||||
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
|
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
|
||||||
<ApiLogAlarmList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiLogAlarmList>
|
<ApiLogAlarmList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiLogAlarmList>
|
||||||
<ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
|
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
|
||||||
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
|
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="p-2">
|
<div>
|
||||||
<!--查询区域-->
|
<!--查询区域-->
|
||||||
<div class="jeecg-basic-table-form-container">
|
<div class="jeecg-basic-table-form-container">
|
||||||
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
|
@ -133,25 +133,8 @@
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
.jeecg-basic-table-form-container {
|
.jeecg-basic-table-form-container {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
.table-page-search-submitButtons {
|
.ant-form{
|
||||||
display: block;
|
margin-bottom: 14px;
|
||||||
margin-bottom: 24px;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
.query-group-cust{
|
|
||||||
min-width: 100px !important;
|
|
||||||
}
|
|
||||||
.query-group-split-cust{
|
|
||||||
width: 30px;
|
|
||||||
display: inline-block;
|
|
||||||
text-align: center
|
|
||||||
}
|
|
||||||
.ant-form-item:not(.ant-form-item-with-help){
|
|
||||||
margin-bottom: 16px;
|
|
||||||
height: 32px;
|
|
||||||
}
|
|
||||||
:deep(.ant-picker),:deep(.ant-input-number){
|
|
||||||
width: 100%;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -224,7 +224,14 @@ export const formSchema: FormSchema[] = [
|
||||||
return values.isUpdate;
|
return values.isUpdate;
|
||||||
},
|
},
|
||||||
required: true,
|
required: true,
|
||||||
labelWidth: '160px'
|
labelWidth: '160px',
|
||||||
|
rules: [{ required: true },
|
||||||
|
{
|
||||||
|
pattern: /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/,
|
||||||
|
message: '请输入有效的HH:mm格式时间(如08:30)',
|
||||||
|
trigger: 'blur'
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '历史上报间隔(小时)',
|
label: '历史上报间隔(小时)',
|
||||||
|
|
Loading…
Reference in New Issue