Browse Source

feat:修改bug

dev
zhaobing’ 1 year ago
parent
commit
dfee7e2210
  1. 2
      web/client/src/sections/install/components/TrendModal.jsx
  2. 2
      web/client/src/sections/install/components/burrModal.jsx
  3. 2
      web/client/src/sections/install/components/interruptModal.jsx
  4. 4
      web/client/src/sections/install/containers/burr.jsx
  5. 6
      web/client/src/sections/install/containers/cacl.jsx
  6. 6
      web/client/src/sections/install/containers/interrupt.jsx
  7. 2
      web/client/src/sections/install/containers/trend.jsx

2
web/client/src/sections/install/components/TrendModal.jsx

@ -155,7 +155,7 @@ const TrendModal = (props) => {
return <div>
<Modal title="异常参数编辑" maskClosable={false} visible={visible} onCancel={closeModal} width={1000}
footer={[<div>
<Button type="primary" theme='borderless' htmlType="submit" onClick={btnFormSubmit}>保存</Button>
<Button type="primary" theme='solid' htmlType="submit" onClick={btnFormSubmit}>保存</Button>
<Button key="cancel" onClick={closeModal}>关闭</Button>
</div>]}>
<Form getFormApi={formApi => {

2
web/client/src/sections/install/components/burrModal.jsx

@ -126,7 +126,7 @@ const checkNumber = (rule, val) => {
return (<>
<Modal maskClosable={false} title="异常参数编辑" visible={visible} onCancel={closeModal} width={900}
footer={[<div>
<Button type="primary" theme='borderless' htmlType="submit" onClick={btnFormSubmit}>保存</Button>
<Button type="primary" theme='solid' htmlType="submit" onClick={btnFormSubmit}>保存</Button>
<Button key="cancel" onClick={closeModal}>关闭</Button>
</div>]}>
<Form

2
web/client/src/sections/install/components/interruptModal.jsx

@ -110,7 +110,7 @@ const InterruptModal = (props) => {
return <div>
<Modal maskClosable={false} title="异常参数编辑" visible={visible} onCancel={closeModal} width={900}
footer={[<div>
<Button type="primary" theme='borderless' htmlType="submit" onClick={btnFormSubmit}>保存</Button>
<Button type="primary" theme='solid' htmlType="submit" onClick={btnFormSubmit}>保存</Button>
<Button key="cancel" onClick={closeModal}>关闭</Button>
</div>]}>
<Form labelPosition="left" getFormApi={formApi => {

4
web/client/src/sections/install/containers/burr.jsx

@ -227,11 +227,11 @@ const Burr = (props) => {
</Form.Input>
</Col>
<Col span={2}>
<Button style={{ marginBottom: 0 }} type='primary' theme='borderless' onClick={batchSave}>批量保存</Button>
<Button style={{ marginBottom: 0 }} type='primary' theme='solid' onClick={batchSave}>批量保存</Button>
</Col>
<Col span={2}>
<Popconfirm title="确认批量删除选中的参数配置?" onConfirm={batchDelete}>
<Button style={{ fontSize: 13 }} theme='borderless' type='danger'>批量删除</Button>
<Button style={{ fontSize: 13 }} theme='solid' type='danger'>批量删除</Button>
</Popconfirm>
</Col>
</Row>

6
web/client/src/sections/install/containers/cacl.jsx

@ -340,7 +340,7 @@ const Calc = (props) => {
case 'burr':
return (
<Col span={4}>
<Form.Input field='bv1' placeholder="毛刺阈值:数字" label="Burr阈值" rules={[{
<Form.Input field='bv1' placeholder="毛刺阈值:数字" label="毛刺阈值" rules={[{
required: true, message: "请输入数字", validator: checkNumber
}]} trigger='blur'>
</Form.Input>
@ -351,7 +351,7 @@ const Calc = (props) => {
<Col span={18}>
<Row gutter={10}>
<Col span={4} >
<Form.Input field='bv2' placeholder="毛刺阈值:数字" label="中断阈值" rules={[{
<Form.Input field='bv2' placeholder="毛刺阈值:数字" label="毛刺阈值" rules={[{
required: true, message: "请输入正整数", validator: checkInterger
}]} trigger='blur' />
</Col>
@ -458,7 +458,7 @@ const Calc = (props) => {
{renderParamsConfig()}
<Col span={6}>
{/* <Button style={{ marginRight: 10, marginLeft: 10 }} type="tertiary">数据对比</Button> */}
<Button theme='borderless' type='secondary' style={{ marginRight: 10,marginLeft: 10 }} onClick={handleSave}>保存配置</Button>
<Button theme='solid' type='primary' style={{ marginRight: 10,marginLeft: 10 }} onClick={handleSave}>保存配置</Button>
</Col>
</Row>
</Form>

6
web/client/src/sections/install/containers/interrupt.jsx

@ -216,15 +216,15 @@ const Interrupt = (props) => {
rules={[{
required: true, message: "请输入正整数", validator: checkInterger
}]} trigger='blur'
onChange={e => batchInterrupt(e)} placeholder="中断阈值:正整数">
onChange={e => batchInterrupt(e)} placeholder="中断阈值:正整数">
</Form.Input>
</Col>
<Col span={2}>
<Button style={{ marginBottom: 0 }} onClick={batchSave} type='primary' theme='borderless'>批量保存</Button>
<Button style={{ marginBottom: 0 }} onClick={batchSave} type='primary' theme='solid'>批量保存</Button>
</Col>
<Col span={2}>
<Popconfirm title="确认批量删除选中的参数配置?" onConfirm={batchDelete}>
<Button style={{ fontSize: 13 }} theme='borderless' type='danger'>批量删除</Button>
<Button style={{ fontSize: 13 }} theme='solid' type='danger'>批量删除</Button>
</Popconfirm>
</Col>
</Row>

2
web/client/src/sections/install/containers/trend.jsx

@ -310,7 +310,7 @@ const Trend = (props) => {
</Col>
<Col span={2}>
<Popconfirm style={{ marginBottom: 0 }} title="确认批量删除选中的参数配置?" onConfirm={batchDelete}>
<Button style={{ fontSize: 13 }} theme='borderless' type='danger'>批量删除</Button>
<Button style={{ fontSize: 13 }} theme='solid' type='danger'>批量删除</Button>
</Popconfirm>
</Col>
<Col span={2}>

Loading…
Cancel
Save