From afada13816841e313384c079661832fd502dbfc3 Mon Sep 17 00:00:00 2001 From: timorls <318739742@qq.com> Date: Wed, 9 Mar 2022 13:43:45 +0800 Subject: [PATCH 1/3] mode --- src/pages/home/branch/test/company.js | 80 +++++++++++++++++++-------- 1 file changed, 57 insertions(+), 23 deletions(-) diff --git a/src/pages/home/branch/test/company.js b/src/pages/home/branch/test/company.js index 980a2ee..aa473a9 100644 --- a/src/pages/home/branch/test/company.js +++ b/src/pages/home/branch/test/company.js @@ -14,11 +14,11 @@ class TestCompany extends Component { this.state = { data: [ { title: "企业认证", desc: "根据企业名称、统一社会信用代码、法人姓名进行企业认证", obj: { company: "", code: "", legal_person: "", cid: "" }, label: ["企业名称", "统一社会信用代码", "法人姓名", "企业ID"], url: "/admin/test/enterprise_certification", method: 'post' }, - { title: "级联删除企业ID", desc: "根据cid，删除与其有关的所有记录", obj: { cid: "", "企业数据": [] }, label: ["企业ID", "企业数据"], url: "/admin/test/delete_cid_cascade", method: 'post', plainOptions: ['综合评价分析', '指标明细', '风险要素分析', '财务要素分析', 'ESG要素分析'] }, - { title: "级联删除评价ID", desc: "根据rid，删除与其有关的所有记录", obj: { rid: "", type: "", "评价记录": [] }, label: ["评价ID", "评价类型", "评价记录"], url: "/admin/test/delete_rid_cascade", method: 'post', plainOptions: ['评价结果', '报告数据', '综合信用报告', '评价证书', '综合评价填报'] }, + { title: "级联删除企业ID", desc: "根据cid，删除与其有关的所有记录", obj: { cid: "", data: [] }, label: ["企业ID", "企业数据"], url: "/admin/test/delete_cid_cascade", method: 'post' }, + { title: "级联删除评价ID", desc: "根据rid，删除与其有关的所有记录", obj: { rid: "", record: "", data: [] }, label: ["评价ID", "评价类型", "评价记录"], url: "/admin/test/delete_rid_cascade", method: 'post' }, { title: "企业认证状态修改", desc: "修改企业认证状态，只能修改为未认证，如需认证则通过认证接口", obj: { cid: "" }, label: ["企业ID"], url: "/admin/test/change_verified", method: 'get' }, - { title: "级联生成企业主页", desc: "根据rid，生成企业主页信息", obj: { rid: "", type: "" }, label: ["评价ID", "评价类型"], url: "/admin/test/delete_rid_cascade", method: 'post' }, - { title: "新增测试企业", desc: "新增一家测试测试", obj: { email: "", company: "",code:"",legal_person:"" }, label: ["邮箱", "企业","统一社会信用代码","法人"], url: "/admin/test/new_company", method: 'post' }, + { title: "级联生成企业主页", desc: "根据rid，生成企业主页信息", obj: { rid: "", types: "" }, label: ["评价ID", "评价类型"], url: "/admin/test/generate_rid_information", method: 'post' }, + { title: "新增测试企业", desc: "新增一家测试测试", obj: { email: "", company: "", code: "", legal_person: "" }, label: ["邮箱", "企业", "统一社会信用代码", "法人"], url: "/admin/test/new_company", method: 'post' }, ], setIsModalVisible: false, form: {}, @@ -29,16 +29,18 @@ class TestCompany extends Component { indeterminate: false, checkAll: false, checkState: false, - loading:false + loading: false, + plainOptions: [] } } + componentDidMount() { + + } + form = React.createRef() showModal = (val) => { - if (val.plainOptions) { - plainOptions = val.plainOptions - } this.setState({ setIsModalVisible: true, form: val.obj, @@ -58,24 +60,40 @@ class TestCompany extends Component { handleOk = () => { this.setState({ - loading:true + loading: true }) - const form = this.form.current + const form = this.form.current.getFieldsValue() + this.setState({ - form: form.getFieldsValue() + form: (() => { + if (form.hasOwnProperty("data")) { + return Object.assign(form, { data: this.state.checkedList }) + } else { + return form + } + })() }, () => { api[this.state.method](this.state.url, this.state.form) .then(res => { message.success(res.info); this.setState({ - loading:false, - setIsModalVisible: false + loading: false, + setIsModalVisible: false, + checkAll: false }) }) }) } - onChange = checkedList => { + onRateChange = checkedList => { + this.setState({ + checkedList, + indeterminate: !!checkedList.length && checkedList.length < plainOptions.length, + checkAll: checkedList.length === this.state.plainOptions.length, + }); + } + + onCompanyChange = checkedList => { this.setState({ checkedList, indeterminate: !!checkedList.length && checkedList.length < plainOptions.length, @@ -83,9 +101,17 @@ class TestCompany extends Component { }); } - onCheckAllChange = e => { + onRateCheckAllChange = e => { this.setState({ - checkedList: e.target.checked ? plainOptions : [], + checkedList: e.target.checked ? this.state.plainOptions : [], + indeterminate: false, + checkAll: e.target.checked, + }); + } + + onCompanyCheckAllChange = e => { + this.setState({ + checkedList: e.target.checked ?plainOptions : [], indeterminate: false, checkAll: e.target.checked, }); @@ -93,33 +119,41 @@ class TestCompany extends Component { onCheckAllState = e => { this.setState({ - checkedList: e.target.checked ? plainOptions.slice(0, plainOptions.length - 1) : [], + checkedList: e.target.checked ? this.state.plainOptions.slice(0, plainOptions.length - 1) : [], indeterminate: false, checkState: e.target.checked, checkAll: false }); } + getType = e => { + api.post("/admin/test/search_evaluate_record", { types: e }).then(res => { + this.setState({ + plainOptions: res.data + }) + }) + } + analysis(name) { if (name === '评价类型') { - return } else if (name === "企业数据") { return <> 删除企业 - + } else if (name === "评价记录") { return <> 删除记录 @@ -129,7 +163,7 @@ class TestCompany extends Component { 更改状态 - + } else { return @@ -139,7 +173,7 @@ class TestCompany extends Component { render() { return ( - +
{ From dae72e34ed8ba6db3cabaf924f6985b78a2b89d8 Mon Sep 17 00:00:00 2001 From: FECR-IBD Date: Wed, 9 Mar 2022 05:55:46 +0000 Subject: [PATCH 2/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64eb637..c08b92c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,12 +4,12 @@ stages: job: stage: deploy script: - - docker stop tfse_admin - - docker rm tfse_admin - - docker build -t tfse_admin . - - docker run -d --restart=always -p 51004:51004 --name tfse_admin tfse_admin + - docker stop tfse_admin_webapp_v0.2 + - docker rm tfse_admin_webapp_v0.2 + - docker build -t tfse_admin_webapp_v0.2 . + - docker run -d --restart=always -p 51004:51004 --name tfse_admin_webapp_v0.2 tfse_admin_webapp_v0.2 only: - master tags: - - tfse_admin - \ No newline at end of file + - tfse_admin_webapp_v0.2 + From 5f81d8e6ef13ccbfe87a76aa0f769cbfcfd01f35 Mon Sep 17 00:00:00 2001 From: timorls <318739742@qq.com> Date: Wed, 9 Mar 2022 13:59:37 +0800 Subject: [PATCH 3/3] mode --- src/pages/home/branch/test/company.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/home/branch/test/company.js b/src/pages/home/branch/test/company.js index aa473a9..e1892b5 100644 --- a/src/pages/home/branch/test/company.js +++ b/src/pages/home/branch/test/company.js @@ -81,6 +81,8 @@ class TestCompany extends Component { setIsModalVisible: false, checkAll: false }) + }).catch(err=> { + message.warning(err.data.info) }) }) }