Merge branch 'master' of lizhiqi/yongxu-web into master

src/pages/AfterSales/AfterSalesManagement/index.tsx

@@ -6,6 +6,7 @@ import { queryDeviceOperations, queryDeviceOperationsData } from '@/services/aft
 import DeviceStatusData from './deviceStatusData';
 import DeviceHistory from '@/pages/AfterSales/AfterSalesManagement/deviceHistory';
 import { ReloadOutlined, SearchOutlined } from '@ant-design/icons';
+import Overwrite from '@/pages/home/overwrite';
 
 interface DataType {
   home_name: string;
@@ -32,6 +33,8 @@ const BannerManagement: React.FC = () => {
   const [statusData, setStatusData] = useState(null);
   const [form] = Form.useForm();
   const [searchData, setSearchData] = useState<object | null>({});
+  const [visible, setVisible] = useState(false);
+  const [editData, setEditData] = useState(null);
 
   const getList = () => {
     const params = {
@@ -136,6 +139,18 @@ const BannerManagement: React.FC = () => {
     setSearchData(null);
   };
 
+  // 下发
+  const onOverwrite = (data: any) => {
+    setVisible(true);
+    setEditData(data);
+  };
+
+  // 下发弹框回调
+  const overwriteCallback = () => {
+    setVisible(false);
+    getList();
+  };
+
   const columns: ColumnsType<DataType> = [
     {
       title: '序号',
@@ -247,6 +262,13 @@ const BannerManagement: React.FC = () => {
           >
             24小时设备状态数据
           </a>
+          <a
+            onClick={() => {
+              onOverwrite(record);
+            }}
+          >
+            远程配置
+          </a>
         </Space>
       ),
     },
@@ -300,6 +322,9 @@ const BannerManagement: React.FC = () => {
             editCallback={onStatusCallback}
           />
         )}
+        {visible && (
+          <Overwrite visible={visible} editCallback={overwriteCallback} params={editData} />
+        )}
       </Card>
     </PageContainer>
   );

src/pages/home/index.tsx

@@ -5,7 +5,6 @@ import { ReloadOutlined, SearchOutlined } from '@ant-design/icons';
 import { history } from 'umi';
 import type { ColumnsType } from 'antd/es/table';
 import { queryHomeList, updateArea } from '@/services/home';
-import Overwrite from '@/pages/home/overwrite';
 import { queryTreeList } from '@/services/setting';
 
 interface DataType {
@@ -29,8 +28,6 @@ const Home: React.FC = () => {
   const [searchData, setSearchData] = useState<object | null>({});
   const [dataList, setDataList] = useState([]);
   const [pagination, setPagination] = useState({ total: 0, current: 1, pageSize: 10 });
-  const [visible, setVisible] = useState(false);
-  const [editData, setEditData] = useState(null);
   const [areaVisible, setAreaVisible] = useState(false);
   const [areaList, setAreaList] = useState([]);
   const [areaData, setAreaData] = useState({} as DataType);
@@ -103,18 +100,6 @@ const Home: React.FC = () => {
     });
   };
 
-  // 下发
-  const onOverwrite = (data: any) => {
-    setVisible(true);
-    setEditData(data);
-  };
-
-  // 下发弹框回调
-  const overwriteCallback = () => {
-    setVisible(false);
-    getData();
-  };
-
   // 跳转到房间
   const toRoom = (record: DataType) => {
     history.push({ pathname: '/roomList', state: record.record_id });
@@ -219,13 +204,6 @@ const Home: React.FC = () => {
           >
             查看房间
           </a>
-          <a
-            onClick={() => {
-              onOverwrite(record);
-            }}
-          >
-            远程配置
-          </a>
         </Space>
       ),
     },
@@ -272,9 +250,6 @@ const Home: React.FC = () => {
           onChange={tableChange}
           style={{ marginTop: '20px' }}
         />
-        {visible && (
-          <Overwrite visible={visible} editCallback={overwriteCallback} params={editData} />
-        )}
         {areaVisible && (
           <Modal
             destroyOnClose

src/pages/home/overwrite.tsx

@@ -25,23 +25,20 @@ const Overwrite: React.FC<userEditPros> = (props) => {
     form.validateFields().then((values) => {
       if (values) {
         const data = {
-          gateway: params.gateway,
+          gateway: params.device_code,
           gear: values.gear,
           value: values.value,
         };
         overwriteData(data)
           .then((res) => {
             if (res.code === 0) {
-              message.success('编辑成功');
-              editCallback();
+              message.success('下发成功');
             } else {
               message.error(res?.message);
-              editCallback();
             }
           })
           .catch((e) => {
             message.error(e?.message);
-            editCallback();
           });
       }
     });
@@ -77,11 +74,11 @@ const Overwrite: React.FC<userEditPros> = (props) => {
               <Col span={24}>
                 <Form.Item
                   {...formItemLayout}
-                  name="gateway"
+                  name="device_code"
                   label="设备编号"
-                  initialValue={params?.gateway}
+                  initialValue={params?.device_code}
                 >
-                  <Input placeholder="请输入设备编号" readOnly defaultValue={params.gateway} />
+                  <Input placeholder="请输入设备编号" readOnly defaultValue={params.device_code} />
                 </Form.Item>
               </Col>
               <Col span={24}>