.

src/pages/Machinery/Machinery/Edit/index.jsx

@@ -99,9 +99,12 @@ export default (props) => {
     if (device != null) {
       getTerminalDeviceList(device.deviceId).then((res) => {
         setDeviceList([res]);
+        setVisible(true);
       })
+    } else {
+      setVisible(true);
     }
-    setVisible(true);
+
   }
   const handleClose = () => {
     setVisible(false);
@@ -130,7 +133,12 @@ export default (props) => {
       message.info('请绑定摄像头');
       return;
     }
-    let config = `{'deviceId':${device.deviceId},'channel':${data.channel},'netType':${data.netType}}`;
+    let obj = {
+      deviceId: device.deviceId,
+      channel: data.channel,
+      netType: data.netType
+    }
+    let config = JSON.stringify(obj);
     setDeviceLoading(true);
     addDevice({ ...deviceDetail, machineryId: id, apiConfig: config }).then((res) => {
       message.success('保存成功！');
@@ -148,17 +156,17 @@ export default (props) => {
   }, [terminalId])
 
   useEffect(() => {
-    getMachineryTypeList({ pageSize: 999 }).then((res) => {
+    getMachineryTypeList({ pageSize: 500 }).then((res) => {
       setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getRegionList({ pageSize: 999 }).then((res) => {
+    getRegionList({ pageSize: 500 }).then((res) => {
       setRegionList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getCooperativeList({ pageSize: 999 }).then((res) => {
+    getCooperativeList({ pageSize: 500 }).then((res) => {
       setCooperativeList(res.records);
     }).catch((err) => {
       console.log(err.message)
@@ -178,11 +186,12 @@ export default (props) => {
       getdeviceDetail(id).then((res) => {
         setDeviceDetail(res);
         if (res) {
-          //eval('(' + res.apiConfig + ')') json字符串转普通对象
-          deviceForm.setFieldsValue(eval('(' + res.apiConfig + ')'));
+          //json字符串转普通对象
+          let confit = JSON.parse(res.apiConfig)
+          deviceForm.setFieldsValue(confit);
           if (res && res.deviceId != null) {
             //获取绑定设备详情
-            getTerminalDeviceList(eval('(' + res.apiConfig + ')').deviceId).then((res) => {
+            getTerminalDeviceList(confit.deviceId).then((res) => {
               setDevice(res);
               setBind(true)
             })