diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx index ec219a7..90f2752 100644 --- a/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx +++ b/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx @@ -7,13 +7,14 @@ import ajax from "@/services"; import { TableModule ,FormInput,FormSelect} from "@/components"; import "./index.scss"; import moment from "moment"; +import { utils } from "@/config/common"; // import errorImg from "@/assets/images/layout/error.png" // import { useLocation } from "react-router-dom"; function GroundLockManagement() { const [selectData, setSelectData] = useState({ supplier:[], //供应商下拉 - model:[], //类型下拉 - status:[], //状态下拉 + model:[{value: 0, label: "全部"}], //类型下拉 + status:[{value: 0, label: "全部"}], //状态下拉 pile_id:[], //物理桩下拉 }); const listData={ @@ -26,15 +27,6 @@ function GroundLockManagement() { } const columns = [ { - title: "序号", - dataIndex: "index", - key: "index", - align:"center", - render: (_, record, index) => { - return index + 1; - }, - }, - { title: "设备名称", dataIndex: "name", align: "center", @@ -145,7 +137,8 @@ function GroundLockManagement() { //搜索参数初始化 const initFormData = { name: "", - date_type: "0", + model: 0, + status: 0 }; const [visible, setVisible] = useState(false); // 新增数据 @@ -155,6 +148,7 @@ function GroundLockManagement() { //搜索的总结果数 const [total, setTotal] = useState(10); function search(params) { + utils.tableScrollTop("parent-table-scroll"); ajax.getDeviceLockList(params).then((res) => { if (res.status === 20000) { setTableData(res.data.list); @@ -176,11 +170,11 @@ function GroundLockManagement() { } // 确定 const handleOk = () => { - if(!rowData.name){ + if(!rowData.name||rowData.name.match(/^\s+$/)){ message.destroy(); message.warning(`设备名称不可为空`); return - }else if(!rowData.code){ + }else if(!rowData.code||rowData.code.match(/^\s+$/)){ message.destroy(); message.warning(`设备编码不可为空`); return @@ -241,6 +235,7 @@ function GroundLockManagement() { return ( <> { - return index + 1; - }, - }, - { title: "设备名称", dataIndex: "name", align: "center", @@ -72,7 +64,7 @@ function PhysicalPileManagement() { //搜索参数初始化 const initFormData = { name: "", - // charging_station_id: "0", + charging_station_id: 0, }; const [visible, setVisible] = useState(false); // 新增数据 @@ -83,6 +75,7 @@ function PhysicalPileManagement() { const [total, setTotal] = useState(0); function search(params) { + utils.tableScrollTop("parent-table-scroll"); ajax.getList(params).then((res) => { if (res.status === 20000) { setTableData(res.data.list); @@ -104,16 +97,16 @@ function PhysicalPileManagement() { } // 确定 const handleOk = () => { - if(!rowData.name){ + if(!rowData.name||rowData.name.match(/^\s+$/)){ message.destroy(); message.warning(`设备名称不可为空`); return - }else if(!rowData.code){ + }else if(!rowData.code||rowData.code.match(/^\s+$/)){ message.destroy(); message.warning(`硬件编码不可为空`); return } - else if(!rowData.model){ + else if(!rowData.model||rowData.model.match(/^\s+$/)){ message.destroy(); message.warning(`设备型号不可为空`); return @@ -159,6 +152,7 @@ function PhysicalPileManagement() { return ( <> { if (res.status === 20000) { let data=res.data.list diff --git a/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx b/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx index 44e3d56..d0968ad 100644 --- a/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx +++ b/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx @@ -6,6 +6,7 @@ import { message, Pagination, Table, Space, Modal, Button ,Popover,Input,TimePic import ajax from "@/services"; import { TableModule ,FormInput,FormSelect} from "@/components"; import "./index.scss"; +import { utils } from "@/config/common"; import moment from "moment"; // import errorImg from "@/assets/images/layout/error.png" // import { useLocation } from "react-router-dom"; @@ -51,15 +52,6 @@ function RuleDetail() { } const columns = [ { - title: "序号", - dataIndex: "index", - key: "index", - align:"center", - render: (_, record, index) => { - return index + 1; - }, - }, - { title: "名称", dataIndex: "name", align: "center", @@ -183,6 +175,7 @@ function RuleDetail() { //储存编辑的id const [editId,setEditId] = useState(""); function search(params) { + utils.tableScrollTop("parent-table-scroll"); ajax.getTimeRuleDetailsList(params).then((res) => { if (res.status === 20000) { setTableData(res.data.list); @@ -205,7 +198,7 @@ function RuleDetail() { } // 确定 const handleOk = () => { - if(!rowData.name){ + if(!rowData.name || rowData.name.match(/^\s+$/)){ message.destroy(); message.warning(`名称不可为空`); return @@ -289,6 +282,7 @@ function RuleDetail() { return ( <>
{ + let sameMenu = [] let sessionStorageData= JSON.parse(sessionStorage.getItem('tabList')) - let sameMenu = sessionStorageData.filter(item => { return item.path.indexOf("/offPeak/managementTime")>-1}) + if(sessionStorageData===null){ + sessionStorageData=[] + }else{ + sameMenu= sessionStorageData.filter(item => { return item.path.indexOf("/offPeak/managementTime")>-1}) + } + if(sameMenu.length==0){ sessionStorageData.push({text: "管理时间", name: "managementTime", icon: "", path: `/offPeak/managementTime?&id=${record.id}`}) sessionStorage.setItem("tabList",JSON.stringify(sessionStorageData)) @@ -123,6 +130,7 @@ function TimeRule() { //储存编辑的id const [editId,setEditId] = useState(""); function search(params) { + utils.tableScrollTop("parent-table-scroll"); ajax.getTimeRuleList(params).then((res) => { if (res.status === 20000) { setTableData(res.data.list); @@ -167,7 +175,7 @@ function TimeRule() { }; // 确定 const handleOk = () => { - if(!rowData.name){ + if(!rowData.name||rowData.name.match(/^\s+$/)){ message.destroy(); message.warning(`名称不可为空`); return