Skip to content

C
CivManage
Commit facaeff6 authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

fix: '表字段字段配置界面样式修改'

parent 5f3f16f2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 54 deletions
src/pages/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
View file @ facaeff6
......@@ -168,6 +168,7 @@ const AddModal = props => {
const { TreeNode } = TreeSelect;
const [timeData, setTimeData] = useState('');
const { Option } = Select;
const [synchronization, setSynchronization] = useState('');
// 提交
const onSubmit = () => {
// 不切换树
......@@ -177,6 +178,12 @@ const AddModal = props => {
if (validate) {
setLoading(true);
let obj = form.getFieldsValue();
let aa = '';
if (synchronization == true) {
aa = 1;
} else {
aa = 0;
}
let data = [
{
Unit: obj.Unit || '',
......@@ -194,7 +201,7 @@ const AddModal = props => {
Order: pramData.Order,
Name: obj.Name,
Alias: obj.Alias,
SyncEvent: obj.SyncEvent,
SyncEvent: aa,
ValidationRule: obj.ValidationRule,
ExceptionEventFields: characterValue,
},
......@@ -358,6 +365,13 @@ const AddModal = props => {
setCharacterValue(res[0].data.root.ExceptionEventFields);
setCheckedList(res[0].data.root.ExceptionEventFields.split(','));
}
if (res[0].data.root.SyncEvent === 1) {
form.setFieldsValue({ SyncEvent: true });
setSynchronization(true);
} else {
form.setFieldsValue({ SyncEvent: false });
setSynchronization(false);
}
setShape(res[0].data.root.Shape);
console.log(res[0].data.root.Shape);
if (res[0].data.root.Shape == '文本') {
......@@ -632,6 +646,13 @@ const AddModal = props => {
setRadio('');
setRadio1('');
setRadio3('');
setPep('');
setCho('');
setCheckboxAll1('');
setCheckboxAllID1('');
setFlag(false);
setHide(true);
setSynchronization(false);
}
}, [isVisible]);
......@@ -958,6 +979,13 @@ const AddModal = props => {
setCharacterValue(aa.ExceptionEventFields);
setCheckedList(aa.ExceptionEventFields.split(','));
}
if (aa.SyncEvent === 1) {
form.setFieldsValue({ SyncEvent: true });
setSynchronization(true);
} else {
form.setFieldsValue({ SyncEvent: false });
setSynchronization(false);
}
setShape(aa.Shape);
if (aa.Shape == '文本') {
setDetail('输入内容将显示在前端输入框提示信息中');
......@@ -979,6 +1007,7 @@ const AddModal = props => {
setDetail('');
}
console.log(aa.Shape);
console.log(aa.Config);
let coordinates = false,
picture = false,
must = false;
......@@ -1216,6 +1245,13 @@ const AddModal = props => {
setCharacterValue(res[0].data.root.ExceptionEventFields);
setCheckedList(res[0].data.root.ExceptionEventFields.split(','));
}
if (res[0].data.root.SyncEvent === 1) {
form.setFieldsValue({ SyncEvent: true });
setSynchronization(true);
} else {
form.setFieldsValue({ SyncEvent: false });
setSynchronization(false);
}
setShape(res[0].data.root.Shape);
console.log(res[0].data.root.Shape);
let coordinates = false,
......@@ -1426,11 +1462,13 @@ const AddModal = props => {
});
}
if (res[0].data.root.Config.endsWith('.n')) {
form.setFieldsValue({ choose: true });
setCho(true);
} else {
console.log(111);
form.setFieldsValue({ choose: false });
setCho(false);
} else {
console.log(222);
form.setFieldsValue({ choose: true });
setCho(true);
}
break;
}
......@@ -1450,6 +1488,12 @@ const AddModal = props => {
if (validate) {
setLoading(true);
let obj = form.getFieldsValue();
let aa = '';
if (synchronization == true) {
aa = 1;
} else {
aa = 0;
}
let data = [
{
Unit: obj.Unit || '',
......@@ -1467,7 +1511,7 @@ const AddModal = props => {
Order: pramData.Order,
Name: obj.Name,
Alias: obj.Alias,
SyncEvent: obj.SyncEvent,
SyncEvent: aa,
ValidationRule: obj.ValidationRule,
ExceptionEventFields: characterValue,
},
......@@ -1605,6 +1649,7 @@ const AddModal = props => {
ShowConfig: '',
pepole: '',
choose: '',
SyncEvent: '',
});
setRadio(0);
setRadio3('0');
......@@ -1613,6 +1658,7 @@ const AddModal = props => {
setCho('');
setCheckboxAll1('');
setCheckboxAllID1('');
setSynchronization(false);
setFlag(false);
setHide(true);
if (i == 1.14) {
......@@ -1827,6 +1873,10 @@ const AddModal = props => {
setCheckboxAllID1(e.target.checked);
};
const changeSy = e => {
setSynchronization(e.target.checked);
};
return (
<>
<Drawer
......@@ -1898,15 +1948,19 @@ const AddModal = props => {
</div>
</Item>
<Item label="同步" name="SyncEvent" labelCol={{ span: 4 }}>
<Radio.Group>
<Checkbox checked={synchronization} onChange={changeSy}>
工单 → 事件
</Checkbox>
{/* <Radio.Group>
<Radio value={0} style={{ marginRight: '0.5rem' }}>
不同步
</Radio>
<Radio value={1} style={{ marginRight: '0.5rem' }}>
工单 → 事件
</Radio>
</Radio.Group> */}
{/* <Radio value={2}>事件（上报时） → 工单</Radio> */}
</Radio.Group>
</Item>
<Row>
{/* <Col span={1} /> */}
......@@ -2270,8 +2324,8 @@ const AddModal = props => {
<Tooltip
title={
<>
<span>默认展示形式为下拉框</span>
<Image width={200} src={partImage} />
<span>弹窗显示人员所属机构</span>
<Image width={200} src={AllImage} />
</>
}
>
......@@ -2286,21 +2340,6 @@ const AddModal = props => {
</div>
}
>
<Tooltip
title={
<>
<span>展示形式为弹窗显示人员所属机构</span>
<Image width={200} src={AllImage} />
</>
}
>
<InfoCircleOutlined
style={{
color: 'rgb(24 144 255)',
marginRight: '5px',
}}
/>
</Tooltip>
<div style={{ display: 'inline-block', marginRight: '10px' }}>
<Item name="All1" style={{ marginBottom: '0' }}>
<Checkbox
......@@ -2342,7 +2381,7 @@ const AddModal = props => {
return (
<>
<Item
label="角色|机构"
label="过滤"
name="ConfigName"
labelCol={{ span: 4 }}
rules={[
......@@ -2369,7 +2408,7 @@ const AddModal = props => {
return (
<>
<Item
label="角色|机构"
label="过滤："
name="Config"
labelCol={{ span: 4 }}
rules={[
......@@ -2445,11 +2484,7 @@ const AddModal = props => {
case '位置坐标':
return (
<Item label="字段名称" name="Config" labelCol={{ span: 4 }}>
<Input
allowClear
style={{ width: '93%' }}
placeholder="请输入坐标位置"
/>
<Input allowClear placeholder="请输入坐标位置" />
</Item>
);
case '地址':
......@@ -2512,7 +2547,7 @@ const AddModal = props => {
fontSize: '24px',
color: '#1890FF',
marginTop: '8px',
marginLeft: '-10px',
marginLeft: '-3px',
}}
/>
</Tooltip>
......
src/pages/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx
View file @ facaeff6
......@@ -587,7 +587,6 @@ const AddModal = props => {
}
};
const mapTree = org => {
console.log(org);
const haveChildren = Array.isArray(org.children) && org.children.length > 0;
return haveChildren ? (
<TreeNode value={org.name} title={org.name} disabled>
......
src/pages/log/serviceLog/index.jsx
View file @ facaeff6
This diff is collapsed.
src/pages/log/serviceLog/index.less
View file @ facaeff6
.serviceLog{
.head{
.serviceLog {
.head {
padding: 10px;
background: white;
margin-bottom: 2px;
min-width: 1030px;
}
.chart{
.foot {
padding: 10px;
background: white;
font-size:20px;
font-size: 20px;
}
.table{
.table {
border-top: 1px solid #f0eded;
// overflow: auto;//不要这个，pagination否则无法固定底部
.ant-table-thead tr th{
.ant-table-thead tr th {
font-weight: 600;
color:rgba(0,0,0,0.85);
background-color:#F6F9FE;
color: rgba(0, 0, 0, 0.85);
background-color: #f6f9fe;
}
.ant-table-body{
height:calc(100vh - 580px);
.ant-table-body {
height: calc(100vh - 565px);
border-right: white;
overflow: auto !important;
}
.ant-pagination{
.ant-pagination {
z-index: 999;
border-top: 1px solid #f0eded;
}
.ant-table-pagination{
.ant-table-pagination {
padding-right: 12px;
background: white;
margin: 1px 0;
padding:8px;
padding: 8px;
padding-right: 20px;
}
.ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last{
border-right: 1px solid #DBE7FB !important;
.ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last {
border-right: 1px solid #dbe7fb !important;
}
.ant-table.ant-table-small {
width: 99%;
margin: 10px auto;
}
.ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last{
border: 1px solid #DBE7FB;
.ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last {
border: 1px solid #dbe7fb;
}
}
.ant-spin-container {
background-color: white;
}
.fontColor{
.fontColor {
font-weight: 600;
}
.icon{
margin-top: -5px !important;
.icon {
// margin-top: -5px !important;
vertical-align: text-bottom;
}
.sel{
.sel {
width: 100px;
}
}
.ant-table-column-sorter-up + .ant-table-column-sorter-down {
margin-top: 0;
}
.ant-select-arrow .anticon > svg {
vertical-align: middle;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment