Skip to content

H
hnyc-data
Commit c7795c53 by fanyongjun
Options

9.16

parent 3c0987e2
Showing with 43 additions and 41 deletions
src/view/Manage/Assets/components/AssetList.js
...@@ -200,7 +200,7 @@ class AssetListCOM extends Component { ...@@ -200,7 +200,7 @@ class AssetListCOM extends Component {
<span dangerouslySetInnerHTML={{ __html: item.remarks }} /> <span dangerouslySetInnerHTML={{ __html: item.remarks }} />
</Col> </Col>
<Col md={6}> <Col md={6}>
{item.expireDate && <Text>失效时间：</Text>} {item.expireDate && <Text>数据验收确认时间：</Text>}
{item.expireDate} {item.expireDate}
</Col> </Col>
</Row> </Row>
......
src/view/Manage/Assets/components/AssetListHelper.js
...@@ -103,45 +103,47 @@ export class DataDetail extends Component { ...@@ -103,45 +103,47 @@ export class DataDetail extends Component {
const { tableModel, showApplyButton, isAppling, onApply } = this.props; const { tableModel, showApplyButton, isAppling, onApply } = this.props;
return ( return (
<Descriptions size="small" column={3}> <div>
<Descriptions.Item label="资产名称"> <Descriptions size="small" column={3}>
<span dangerouslySetInnerHTML={{ __html: `${tableModel.name}` }} /> <Descriptions.Item label="资产名称">
</Descriptions.Item> <span dangerouslySetInnerHTML={{ __html: `${tableModel.name}` }} />
<Descriptions.Item label="所属目录">{tableModel.catalog}</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="所属系统">{tableModel.system}</Descriptions.Item> <Descriptions.Item label="所属目录">{tableModel.catalog}</Descriptions.Item>
<Descriptions.Item label="发布时间">{tableModel.createTime_str}</Descriptions.Item> <Descriptions.Item label="所属系统">{tableModel.system}</Descriptions.Item>
{/* <Descriptions.Item label="资产密级">{tableModel.assetStrictLevel_}</Descriptions.Item> */} <Descriptions.Item label="发布时间">{tableModel.createTime_str}</Descriptions.Item>
<Descriptions.Item label="更新周期">{tableModel.updateCycle}</Descriptions.Item> {/* <Descriptions.Item label="资产密级">{tableModel.assetStrictLevel_}</Descriptions.Item> */}
{/* <Descriptions.Item label="表内容及业务含义">{metaData.business}</Descriptions.Item> */} <Descriptions.Item label="更新周期">{tableModel.updateCycle}</Descriptions.Item>
<Descriptions.Item label="数据周期">{tableModel.dataCycle}</Descriptions.Item> {/* <Descriptions.Item label="表内容及业务含义">{metaData.business}</Descriptions.Item> */}
{/* <Descriptions.Item label="数据更新特点">{metaData.updateFeature}</Descriptions.Item> <Descriptions.Item label="数据周期">{tableModel.dataCycle}</Descriptions.Item>
<Descriptions.Item label="主题域">{metaData.domain}</Descriptions.Item> {/* <Descriptions.Item label="数据更新特点">{metaData.updateFeature}</Descriptions.Item>
{metaData.hasOwnProperty('leaderInfo') && ( <Descriptions.Item label="主题域">{metaData.domain}</Descriptions.Item>
<Descriptions.Item label="负责人">{metaData.leaderInfo}</Descriptions.Item> {metaData.hasOwnProperty('leaderInfo') && (
)} */} <Descriptions.Item label="负责人">{metaData.leaderInfo}</Descriptions.Item>
<Descriptions.Item label="描述"> )} */}
<span <Descriptions.Item label="描述">
dangerouslySetInnerHTML={{
__html: tableModel.remarks ? tableModel.remarks : '无',
}}
/>
</Descriptions.Item>
{
showApplyButton&&<Descriptions.Item>
<span <span
className={ classnames('pointer', isAppling?'text-warning':'text-primary') } dangerouslySetInnerHTML={{
onClick={e => { __html: tableModel.remarks ? tableModel.remarks : '无',
e.preventDefault();
if (onApply) {
onApply();
}
}} }}
> />
申请
</span>
</Descriptions.Item> </Descriptions.Item>
}
</Descriptions> </Descriptions>
{
showApplyButton&&<Button
type={isAppling?'':'primary'}
style={{height:30,marginBottom:8,}}
onClick={e => {
e.preventDefault();
if (onApply) {
onApply();
}
}}
>
申请授权
</Button>
}
</div>
); );
} }
} }
...@@ -181,7 +183,7 @@ const ApplyDescFunc = ({ dataDesc, form, apply }) => { ...@@ -181,7 +183,7 @@ const ApplyDescFunc = ({ dataDesc, form, apply }) => {
let options = []; let options = [];
options = dataSource.map((o,i) => { options = dataSource.map((o,i) => {
return { return {
label: o.name, label: o.displayName,
value: o.ordinalPosition, value: o.ordinalPosition,
}; };
}); });
...@@ -224,8 +226,8 @@ const ApplyDescFunc = ({ dataDesc, form, apply }) => { ...@@ -224,8 +226,8 @@ const ApplyDescFunc = ({ dataDesc, form, apply }) => {
return ( return (
<Fragment> <Fragment>
<Row> <Row>
<Col md={4}><h3>字段概览</h3></Col> <Col md={4} style={{lineHeight:'32px'}}><h3>字段概览</h3></Col>
<Col md={20} className='text-right pt-4'> <Col md={20}>
<Search <Search
placeholder="请输入字段过滤" placeholder="请输入字段过滤"
style={{ width: 200 }} style={{ width: 200 }}
......
src/view/User/Apply/components/ListBox.jsx
...@@ -145,7 +145,7 @@ export default class ListBox extends Component { ...@@ -145,7 +145,7 @@ export default class ListBox extends Component {
<Row> <Row>
<Col md={18}> <Text>资产备注：</Text> <span dangerouslySetInnerHTML={{ __html: item.remarks }} /> </Col> <Col md={18}> <Text>资产备注：</Text> <span dangerouslySetInnerHTML={{ __html: item.remarks }} /> </Col>
<Col md={6}> <Col md={6}>
{item.expireDate && <Text>失效时间：</Text>} {item.expireDate && <Text>数据验收确认时间：</Text>}
{item.expireDate} {item.expireDate}
</Col> </Col>
</Row> </Row>
......
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