Compare commits

..

No commits in common. "0819789efc8f774e2d67f70218c71156dc60f372" and "3fbe3acbd8149e80da14a85bb243e95f35ca8bc3" have entirely different histories.

3 changed files with 20 additions and 11 deletions

View File

@ -10,7 +10,7 @@ module.exports = {
javaGitBranch: "dev",
// 本地联调 safetyEval-servicecontext-path: /safetyEval默认端口 8095
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
API_HOST: "http://127.0.0.1",
API_HOST: "https://gbs-gateway.qhdsafety.com",
},
production: {
// 应用后端分支名称,部署上线需要

View File

@ -24,7 +24,6 @@ import { tools } from "@cqsjjb/jjb-common-lib";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_EQUIP_INFO } from "~/enumerate/namespace";
import { positiveNumberRule } from "~/utils/validators";
import { toEquipPageQuery } from "../equipPageQuery";
const { router } = tools;
const DUAL_CHANNEL_MAP = { 1: "是", 2: "否" };
@ -42,7 +41,9 @@ function EquipInfoPage(props) {
} = equipInfo || {};
const handleSearch = () => {
props.equipInfoList(toEquipPageQuery(router.query));
props.equipInfoList({
...router.query,
});
};
useEffect(() => {
@ -142,6 +143,17 @@ function EquipInfoPage(props) {
<Select.Option value="便携式">便携式</Select.Option>
</ControlWrapper.Select>
</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) => {
router.query = { ...value, current: 1, size: 10 };

View File

@ -2,7 +2,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Input, Modal, Table } from "antd";
import { useEffect, useState } from "react";
import { NS_EQUIP_INFO } from "~/enumerate/namespace";
import { toEquipPageQuery } from "~/pages/Container/EnterpriseInfo/equipPageQuery";
function OrgEquipmentSelectModalInner(props) {
const { open, onCancel, onConfirm, existingIds = [] } = props;
@ -16,13 +15,11 @@ function OrgEquipmentSelectModalInner(props) {
setLoading(true);
try {
const values = searchForm.getFieldsValue();
const res = await props.equipInfoList(
toEquipPageQuery({
current: page,
size: pageSize,
deviceName: values.deviceName || undefined,
}),
);
const res = await props.equipInfoList({
current: page,
size: pageSize,
deviceName: values.deviceName || undefined,
});
if (res?.success !== false) {
setDataSource(res?.data || []);
setPagination((prev) => ({ ...prev, current: page, pageSize, total: res?.total || 0 }));