diff --git a/jjb.config.js b/jjb.config.js index 979bca2..83d7b34 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -24,7 +24,8 @@ module.exports = { contextInject: { // 应用Key appKey: "", - fileUrl: "http://192.168.20.240:9787/mnt/", + // fileUrl: "http://192.168.20.240:9787/mnt/", + fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", }, // public/index.html注入全局变量 windowInject: { diff --git a/package.json b/package.json index a8dae4b..51839b3 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.0.161" + "zy-react-library": "^1.0.162" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js b/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js index 309a6ac..949d07c 100644 --- a/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js +++ b/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js @@ -37,7 +37,7 @@ function List(props) { labelCol={{ span: 8 }} form={form} options={[ - { name: "likePromiseName", label: "安全承诺模板名称" }, + { name: "promiseName", label: "安全承诺模板名称" }, ]} onFinish={getData} /> diff --git a/src/pages/Container/Enterprise/Management/Add/index.js b/src/pages/Container/Enterprise/Management/Add/index.js index 534e9ec..7e344e4 100644 --- a/src/pages/Container/Enterprise/Management/Add/index.js +++ b/src/pages/Container/Enterprise/Management/Add/index.js @@ -347,7 +347,7 @@ const ChoiceTemplateModalComponent = (props) => { labelCol={{ span: 8 }} form={form} options={[ - { name: "likePromiseName", label: "安全承诺名称" }, + { name: "promiseName", label: "安全承诺名称" }, ]} onFinish={getData} /> diff --git a/src/pages/Container/Enterprise/Management/List/index.js b/src/pages/Container/Enterprise/Management/List/index.js index 95875a8..ea4a168 100644 --- a/src/pages/Container/Enterprise/Management/List/index.js +++ b/src/pages/Container/Enterprise/Management/List/index.js @@ -16,8 +16,8 @@ function List(props) { const { tableProps, getData } = useTable(props["busPromiseList"], { form, transform: formData => ({ - eqCreateTimeS: formData.datas?.[0], - eqCreateTimeE: formData.datas?.[1], + createTimeS: formData.dates?.[0], + createTimeE: formData.dates?.[1], }), }); // 点击下发 @@ -42,12 +42,12 @@ function List(props) { form.setFieldValue("levelName", label)} />) }, + { name: "promiseName", label: "安全承诺名称" }, + { name: "level", label: "安全承诺级别", render: ( form.setFieldValue("levelName", label)} />) }, { name: "dates", label: "下发时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - { name: "eqDepartments", label: "涉及部门", render: () }, + { name: "departments", label: "涉及部门", render: () }, { - name: "eqSignState", + name: "signState", label: "签署状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "0", name: "已完成" }, { bianma: "1", name: "未完成" }], diff --git a/src/pages/Container/Enterprise/Management/Release/index.js b/src/pages/Container/Enterprise/Management/Release/index.js index 63419f2..2da23af 100644 --- a/src/pages/Container/Enterprise/Management/Release/index.js +++ b/src/pages/Container/Enterprise/Management/Release/index.js @@ -14,7 +14,7 @@ function List(props) { const [form] = Form.useForm(); const { tableProps } = useTable(props["busPromisePeople"], { form, - params: { eqPromiseId: query.promiseId }, + params: { promiseId: query.promiseId }, }); const [busPromiseTemplateModalOpen, setBusPromiseTemplateModalOpen] = useState(false); const [id, setId] = useState(""); diff --git a/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js b/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js index caf2e89..16c8d52 100644 --- a/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js +++ b/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js @@ -53,7 +53,7 @@ function List(props) { labelCol={{ span: 8 }} form={form} options={[ - { name: "likePromiseName", label: "安全承诺模板名称" }, + { name: "promiseName", label: "安全承诺模板名称" }, { name: "promiseType", label: "安全承诺类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: PROMISE_TYPE_ENUM }, ]} onFinish={getData} diff --git a/src/pages/Container/Supervise/Management/Add/index.js b/src/pages/Container/Supervise/Management/Add/index.js index f4012a1..4250fe8 100644 --- a/src/pages/Container/Supervise/Management/Add/index.js +++ b/src/pages/Container/Supervise/Management/Add/index.js @@ -226,7 +226,7 @@ function Add(props) { render: ( { form.setFieldValue(["promisePersons", field.name, "postId"], ""); form.setFieldValue(["promisePersons", field.name, "postName"], ""); @@ -404,7 +404,7 @@ const ChoiceTemplateModalComponent = (props) => { labelCol={{ span: 8 }} form={form} options={[ - { name: "likePromiseName", label: "安全承诺名称" }, + { name: "promiseName", label: "安全承诺名称" }, ]} onFinish={getData} /> diff --git a/src/pages/Container/Supervise/Management/List/index.js b/src/pages/Container/Supervise/Management/List/index.js index 10f78f7..1b38d6b 100644 --- a/src/pages/Container/Supervise/Management/List/index.js +++ b/src/pages/Container/Supervise/Management/List/index.js @@ -21,11 +21,11 @@ function List(props) { const { tableProps, getData } = useTable(props["busPromiseList"], { form, transform: formData => ({ - eqCreateTimeS: formData.createTime?.[0], - eqCreateTimeE: formData.createTime?.[1], + createTimeS: formData.createTime?.[0], + createTimeE: formData.createTime?.[1], }), params: { - eqReleasePlatform: releasePlatform, + releasePlatform, }, }); const getDorpInfo = async () => { @@ -53,29 +53,28 @@ function List(props) { } }; - // eqReleasePlatform 下发对象 return (
) }, + { name: "promiseName", label: "安全承诺名称" }, + { name: "level", label: "安全承诺级别", render: () }, { - name: "eqPromiseType", + name: "promiseType", label: "安全承诺类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: PROMISE_TYPE_ENUM, }, { - name: "eqSignState", + name: "signState", label: "签署状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "0", name: "已完成" }, { bianma: "1", name: "未完成" }], }, { name: "createTime", label: "下发时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, { - name: "eqCorpId", + name: "corpId", label: "签订单位", render: FORM_ITEM_RENDER_ENUM.SELECT, items: dorpInfo, diff --git a/src/pages/Container/Supervise/Management/Release/index.js b/src/pages/Container/Supervise/Management/Release/index.js index 63419f2..2da23af 100644 --- a/src/pages/Container/Supervise/Management/Release/index.js +++ b/src/pages/Container/Supervise/Management/Release/index.js @@ -14,7 +14,7 @@ function List(props) { const [form] = Form.useForm(); const { tableProps } = useTable(props["busPromisePeople"], { form, - params: { eqPromiseId: query.promiseId }, + params: { promiseId: query.promiseId }, }); const [busPromiseTemplateModalOpen, setBusPromiseTemplateModalOpen] = useState(false); const [id, setId] = useState(""); diff --git a/src/pages/Container/Supervise/busPromise/ListView/index.js b/src/pages/Container/Supervise/busPromise/ListView/index.js index 38aedd7..dc752c2 100644 --- a/src/pages/Container/Supervise/busPromise/ListView/index.js +++ b/src/pages/Container/Supervise/busPromise/ListView/index.js @@ -14,7 +14,7 @@ function List(props) { const { tableProps, getData } = useTable(props["busPromiseList"], { form, params: { - eqCorpId: query.id, + corpId: query.id, }, }); @@ -25,7 +25,7 @@ function List(props) { diff --git a/src/pages/Container/Supervise/busPromise/View/index.js b/src/pages/Container/Supervise/busPromise/View/index.js index cb8a104..a7962d2 100644 --- a/src/pages/Container/Supervise/busPromise/View/index.js +++ b/src/pages/Container/Supervise/busPromise/View/index.js @@ -16,7 +16,7 @@ function List(props) { const query = useGetUrlQuery(); const { tableProps } = useTable(props["busPromisePeopleList"], { params: { - eqCorpId: query.id, + corpId: query.id, }, });