bug修护
parent
7352e0ee9c
commit
c5218e1d0c
|
|
@ -10,7 +10,7 @@ module.exports = {
|
||||||
javaGitBranch: "dev",
|
javaGitBranch: "dev",
|
||||||
// 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095)
|
// 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095)
|
||||||
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
|
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
|
||||||
API_HOST: "https://gbs-gateway.qhdsafety.com",
|
API_HOST: "http://127.0.0.1",
|
||||||
},
|
},
|
||||||
production: {
|
production: {
|
||||||
// 应用后端分支名称,部署上线需要
|
// 应用后端分支名称,部署上线需要
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import { tools } from "@cqsjjb/jjb-common-lib";
|
||||||
import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
||||||
import { NS_EQUIP_INFO } from "~/enumerate/namespace";
|
import { NS_EQUIP_INFO } from "~/enumerate/namespace";
|
||||||
import { positiveNumberRule } from "~/utils/validators";
|
import { positiveNumberRule } from "~/utils/validators";
|
||||||
|
import { toEquipPageQuery } from "../equipPageQuery";
|
||||||
|
|
||||||
const { router } = tools;
|
const { router } = tools;
|
||||||
const DUAL_CHANNEL_MAP = { 1: "是", 2: "否" };
|
const DUAL_CHANNEL_MAP = { 1: "是", 2: "否" };
|
||||||
|
|
@ -41,9 +42,7 @@ function EquipInfoPage(props) {
|
||||||
} = equipInfo || {};
|
} = equipInfo || {};
|
||||||
|
|
||||||
const handleSearch = () => {
|
const handleSearch = () => {
|
||||||
props.equipInfoList({
|
props.equipInfoList(toEquipPageQuery(router.query));
|
||||||
...router.query,
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
@ -143,17 +142,6 @@ function EquipInfoPage(props) {
|
||||||
<Select.Option value="便携式">便携式</Select.Option>
|
<Select.Option value="便携式">便携式</Select.Option>
|
||||||
</ControlWrapper.Select>
|
</ControlWrapper.Select>
|
||||||
</Form.Item>,
|
</Form.Item>,
|
||||||
<Form.Item key="enableFlag" name="enableFlag">
|
|
||||||
<ControlWrapper.Select
|
|
||||||
label="设备状态"
|
|
||||||
placeholder="请选择"
|
|
||||||
allowClear
|
|
||||||
style={{ width: "100%" }}
|
|
||||||
>
|
|
||||||
<Select.Option value={1}>启用</Select.Option>
|
|
||||||
<Select.Option value={2}>禁用</Select.Option>
|
|
||||||
</ControlWrapper.Select>
|
|
||||||
</Form.Item>,
|
|
||||||
]}
|
]}
|
||||||
onReset={(value) => {
|
onReset={(value) => {
|
||||||
router.query = { ...value, current: 1, size: 10 };
|
router.query = { ...value, current: 1, size: 10 };
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
||||||
import { Button, Form, Input, Modal, Table } from "antd";
|
import { Button, Form, Input, Modal, Table } from "antd";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { NS_EQUIP_INFO } from "~/enumerate/namespace";
|
import { NS_EQUIP_INFO } from "~/enumerate/namespace";
|
||||||
|
import { toEquipPageQuery } from "~/pages/Container/EnterpriseInfo/equipPageQuery";
|
||||||
|
|
||||||
function OrgEquipmentSelectModalInner(props) {
|
function OrgEquipmentSelectModalInner(props) {
|
||||||
const { open, onCancel, onConfirm, existingIds = [] } = props;
|
const { open, onCancel, onConfirm, existingIds = [] } = props;
|
||||||
|
|
@ -15,11 +16,13 @@ function OrgEquipmentSelectModalInner(props) {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
try {
|
try {
|
||||||
const values = searchForm.getFieldsValue();
|
const values = searchForm.getFieldsValue();
|
||||||
const res = await props.equipInfoList({
|
const res = await props.equipInfoList(
|
||||||
|
toEquipPageQuery({
|
||||||
current: page,
|
current: page,
|
||||||
size: pageSize,
|
size: pageSize,
|
||||||
deviceName: values.deviceName || undefined,
|
deviceName: values.deviceName || undefined,
|
||||||
});
|
}),
|
||||||
|
);
|
||||||
if (res?.success !== false) {
|
if (res?.success !== false) {
|
||||||
setDataSource(res?.data || []);
|
setDataSource(res?.data || []);
|
||||||
setPagination((prev) => ({ ...prev, current: page, pageSize, total: res?.total || 0 }));
|
setPagination((prev) => ({ ...prev, current: page, pageSize, total: res?.total || 0 }));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue