fix():修改路内bug

src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx

@@ -309,7 +309,7 @@ function AuditCheck() {
     if (type === "1") {
       result = { ...result, ...reportTime, ...pageData };
     } else {
-      result = { ...result, ...reportTime, ...handleTime, ...pageData, status: -1 };
+      result = { ...result, ...reportTime, ...handleTime, ...pageData };
     }
     let dateList = date ? { ...result, ...date } : result
     getProgressData(dateList);
@@ -469,7 +469,7 @@ function AuditCheck() {
             <>
               <Col span={24}>
                 <Form.Item label="处理人" name="deal_user">
-                  <Input placeholder="请输入记录编号" {...inputParams} />
+                  <Input placeholder="请输入处理人" {...inputParams} />
                 </Form.Item>
               </Col>
               <Col span={24}>

src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx

@@ -149,10 +149,10 @@ function MesNotification(props) {
         setsendData({ ...sendData, receiver_type: v })
         if (v === 3) {
             ajax.getOperator().then(res => {
-                let arr = res.data
-                let newArrStr = arr.slice(1)
+                // let arr = res.data
+                // let newArrStr = arr.slice(1)
                 if (res.status === 20000) {
-                    let _data = newArrStr.map((item) => {
+                    let _data = res.data.map((item) => {
                         item.key = item.value;
                         return item;
                     })

src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx

@@ -563,6 +563,8 @@ function ConfigRoad() {
                   <div>
                     <a
                       onClick={() => {
+                        getEditRoadDevice(record)
+                        getDevice(record)
                         ajax.getPoleInfo({ id: record.id }).then((res) => {
                           setEditTitle(true)
                           if (res.status === 20000) {
@@ -669,6 +671,8 @@ function ConfigRoad() {
     },
     create: function (params) {
       setEditTitle(false)
+      getRoadDevice(parking_id);
+      getRoadMonitorDevice(parking_id);
       console.log(12122);
       setEditPoleModal({
         ...editPoleModal,
@@ -1088,6 +1092,8 @@ function ConfigRoad() {
     visible: false,
     record: {},
   });
+  const [getMonitorData, setGetMonitorData] = useState([])
+  const [getRoadData, seGetRoadData] = useState([])
   //杆位修改弹窗
   const [editPoleModal, setEditPoleModal] = useState({
     form: editPoleForm,
@@ -1505,22 +1511,87 @@ function ConfigRoad() {
   function getRoadDevice(id) {
     ajax.getRoadDevice({ road_id: id }).then((res) => {
       if (res.status === 20000) {
-        setVideoDeviceList(res.data);
+        res.data.left.map((item) => {
+          item.key = item.value;
+          return item;
+        });
+        // console.log(res.data.left);
+        setVideoDeviceList(res.data.left);
+      } else {
+        message.error(res.message);
+      }
+    });
+  }
+  const [getEditTarket,setGetEditTarket]=useState([])
+  const [getLeftEditTarket,setGetLeftEditTarket]=useState([])
+  const [getSelectedKeys,setGetSelectedKeyst]=useState([])
+  function getEditRoadDevice(record) {
+    let data = {
+      road_id: parking_id,
+      id: record.id
+    }
+    ajax.getRoadDevice(data).then((res) => {
+      if (res.status === 20000) {
+        res.data.left.map((item) => {
+          item.key = item.value;
+          return item;
+        });
+        setGetLeftEditTarket(res.data.left);
+        setGetEditTarket(res.data.right);
       } else {
         message.error(res.message);
       }
     });
   }
+  const onSelectRoadChange = (sourceSelectedKeys, targetSelectedKeys) => {
+    console.log("sourceSelectedKeys:", sourceSelectedKeys);
+    setGetSelectedKeyst([...sourceSelectedKeys, ...targetSelectedKeys]);
+  };
+  const onSelectChangeRoad = (nextTargetKeys, direction, moveKeys) => {
+    setGetEditTarket(nextTargetKeys);
+  };
   //获取监控设备
   function getRoadMonitorDevice(id) {
     ajax.getRoadMonitorDevice({ road_id: id }).then((res) => {
       if (res.status === 20000) {
-        setMonitorDeviceList(res.data);
+        res.data.left.map((item) => {
+          item.key = item.value;
+          return item;
+        });
+        setMonitorDeviceList(res.data.left);
+      } else {
+        message.error(res.message);
+      }
+    });
+  }
+  const [getDeviceTarket,setGetDeviceTarket]=useState([])
+  const [getLeftDeviceTarket,setGetLeftDeviceTarket]=useState([])
+  const [getLeftDevicetargetKey,setGetLeftDevicetargetKey]=useState([])
+  function getDevice(record) {
+    let data = {
+      road_id: parking_id,
+      id: record.id
+    }
+    ajax.getRoadMonitorDevice(data).then((res) => {
+      if (res.status === 20000) {
+        res.data.left.map((item) => {
+          item.key = item.value;
+          return item;
+        });
+        setGetLeftDeviceTarket(res.data.left);
+        setGetDeviceTarket(res.data.right);
       } else {
         message.error(res.message);
       }
     });
   }
+  const onSelectDeviceChange = (sourceSelectedKeys, targetSelectedKeys) => {
+    console.log("sourceSelectedKeys:", sourceSelectedKeys);
+    setGetLeftDevicetargetKey([...sourceSelectedKeys, ...targetSelectedKeys]);
+  };
+  const onSelectChangeDevice = (nextTargetKeys, direction, moveKeys) => {
+    setGetDeviceTarket(nextTargetKeys);
+  };
   //获取计费规则
   const getBillRule = (operator_id) => {
     ajax
@@ -1548,6 +1619,8 @@ function ConfigRoad() {
           setEditPoleModal({ ...editPoleModal, visible: false });
           message.success(res.message);
           formRef.current.getList();
+          seGetRoadData([])
+          setGetMonitorData([])
         } else {
           message.error(res.message);
         }
@@ -1659,8 +1732,6 @@ function ConfigRoad() {
       case 3:
         setCurrentObj(poleManage);
         setRowKey(poleManage.key);
-        getRoadDevice(parking_id);
-        getRoadMonitorDevice(parking_id);
         setConfirmModalData({
           ...confirmModalData,
           func: (ids, status) => ajax.delPolePosition({ id: ids }),
@@ -2262,6 +2333,8 @@ function ConfigRoad() {
         open={editPoleModal.visible}
         onCancel={() => {
           setEditPoleModal({ ...editPoleModal, visible: false });
+          setGetMonitorData([])
+          seGetRoadData([])
         }}
         title={editTitle ? "编辑杆位" : "添加杆位"}
         onOk={submitPole}
@@ -2322,24 +2395,78 @@ function ConfigRoad() {
               </Row>
             </Input.Group>
           </Form.Item>
-          <Form.Item label="视频设备" name="video_device_ids">
-            <Select mode="multiple" options={videoDeviceList} />
-
-            {/* <label>视频设备</label> */}
+          {
+            editTitle ? <>
+              <Form.Item label="视频设备" name="video_device_ids">
+                {/* <Select mode="multiple" options={videoDeviceList} /> */}
+                <Transfer
+                  dataSource={getLeftEditTarket}
+                  titles={["未选择", "已选择"]}
+                  targetKeys={getEditTarket}
+                  onSelectChange={onSelectRoadChange}
+                  onChange={onSelectChangeRoad}
+                  selectedKeys={getSelectedKeys}
+                  render={(item) => item.label}
+                />
+                {/* <label>视频设备</label> */}
 
-            {/* <TreeSelectGroup
+                {/* <TreeSelectGroup
               unSelectedList={editPoleModal.video_device.left}
               selecedList={editPoleModal.video_device.right}
             /> */}
-          </Form.Item>
-          <Form.Item label="监控设备" name="monitor_device_ids">
-            <Select mode="multiple" options={monitorDeviceList} />
-            {/* <label>监控设备</label> */}
-            {/* <TreeSelectGroup
-              unSelectedList={editPoleModal.monitor_device.left}
-              selecedList={editPoleModal.monitor_device.right}
-            /> */}
-          </Form.Item>
+              </Form.Item>
+              <Form.Item label="监控设备" name="monitor_device_ids">
+                {/* <Select mode="multiple" options={monitorDeviceList} /> */}
+                <Transfer
+                  dataSource={getLeftDeviceTarket}
+                  titles={["未选择", "已选择"]}
+                  targetKeys={getDeviceTarket}
+                  selectedKeys={getLeftDevicetargetKey}
+                  onSelectChange={onSelectDeviceChange}
+                  onChange={onSelectChangeDevice}
+                  render={(item) => item.label}
+                />
+              </Form.Item>
+            </> :
+              <>
+                <Form.Item label="视频设备" name="video_device_ids">
+                  {/* <Select mode="multiple" options={videoDeviceList} /> */}
+                  <Transfer
+                    dataSource={videoDeviceList}
+                    titles={["未选择", "已选择"]}
+                    targetKeys={getMonitorData}
+                    onChange={(nexTargetKeys) => {
+                      setGetMonitorData(nexTargetKeys);
+                    }}
+                    render={(item) => item.label}
+                  />
+                  {/* <label>视频设备</label> */}
+
+                  {/* <TreeSelectGroup
+             unSelectedList={editPoleModal.video_device.left}
+             selecedList={editPoleModal.video_device.right}
+           /> */}
+                </Form.Item>
+                <Form.Item label="监控设备" name="monitor_device_ids">
+                  {/* <Select mode="multiple" options={monitorDeviceList} /> */}
+                  <Transfer
+                    dataSource={monitorDeviceList}
+                    titles={["未选择", "已选择"]}
+                    targetKeys={getRoadData}
+                    onChange={(nexTargetKeys) => {
+                      seGetRoadData(nexTargetKeys);
+                    }}
+                    render={(item) => item.label}
+                  />
+                  {/* <label>监控设备</label> */}
+                  {/* <TreeSelectGroup
+             unSelectedList={editPoleModal.monitor_device.left}
+             selecedList={editPoleModal.monitor_device.right}
+           /> */}
+                </Form.Item>
+              </>
+          }
+
         </Form>
       </Modal>
       {/* 杆位删除弹窗 */}

src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx

@@ -36,10 +36,10 @@ function StaggeredMgm(props) {
     const [editVisible, setEditVisible] = useState(false)
     const [addVisible, setAddVisible] = useState(false)
     let infoData = {
-        start_date: '',
-        end_date: '',
-        start_time: '',
-        end_time: '',
+        start_date: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'),
+        end_date: moment().format('YYYY-MM-DD'),
+        start_time: moment('00:00:00', 'HH:mm:ss'),
+        end_time: moment('23:59:59', 'HH:mm:ss'),
         week: '',
         num: '',
         price: '',
@@ -855,11 +855,12 @@ function StaggeredMgm(props) {
                                         <div className="redLogo">*</div>
                                         <label>错峰日期</label>
                                         <RangePicker
-                                            // defaultValue={[moment(item.start_date), moment(item.end_date)]}
+                                             value={[moment(item.start_date), moment(item.end_date)]}
                                             style={{ width: 250, marginLeft: 20 }}
                                             onChange={(date, dateString) => handleChangeDate(
                                                 date, dateString, index
                                             )}
+                                            allowClear={false}
                                             disabledDate={generateDisabledDate(index)}
                                         />
                                     </div>
@@ -867,9 +868,10 @@ function StaggeredMgm(props) {
                                         <div className="redLogo">*</div>
                                         <label>错峰时间</label>
                                         <TimePicker.RangePicker
-                                            // defaultValue={[moment(item.start_time, 'HH:mm:ss'), moment(item.end_time, 'HH:mm:ss')]}
+                                            value={[moment(item.start_time), moment(item.end_time)]}
                                             style={{ width: 250, marginLeft: 20 }}
                                             format="HH:mm:ss"
+                                            allowClear={false}
                                             onChange={(time, timeString) => handleChangeTime(
                                                 time, timeString, index
                                             )}
@@ -1039,7 +1041,8 @@ function StaggeredMgm(props) {
                                         <label>错峰日期</label>
                                         <RangePicker
                                             disabled={item.disabled}
-                                            defaultValue={[moment(item.start_date), moment(item.end_date)]}
+                                            allowClear={false}
+                                            value={[moment(item.start_date), moment(item.end_date)]}
                                             style={{ width: 250, marginLeft: 20 }}
                                             onChange={(date, dateString) => handleChangeDate(
                                                 date, dateString, index
@@ -1052,7 +1055,8 @@ function StaggeredMgm(props) {
                                         <label>错峰时间</label>
                                         <TimePicker.RangePicker
                                             disabled={item.disabled}
-                                            defaultValue={[moment(item.start_time, 'HH:mm:ss'), moment(item.end_time, 'HH:mm:ss')]}
+                                            allowClear={false}
+                                            value={[moment(item.start_time, 'HH:mm:ss'), moment(item.end_time, 'HH:mm:ss')]}
                                             style={{ width: 250, marginLeft: 20 }}
                                             format="HH:mm:ss"
                                             onChange={(time, timeString) => handleChangeTime(

src/pages/SystemMgm/AdminMgm/loadable.jsx

@@ -104,16 +104,48 @@ function AdminMgm(props) {
         console.log(v);
         setGetRoleStatus(false)
         setAddManage({ ...addManage, deptName: v, role: '', government_style: '', government_area: '' })
-        setGetPartName(v)
+        // setGetPartName(v)
         if (selectedOptions.length === 1) {
             setGovernmentStatus(false)
             setGetAreaStatus(false)
             // setGetGovernmentArea([])
+            let arr = v
+            let newArr = arr[arr.length - 1];
+            let str = newArr.toString()
+            let data = {
+                depart_id: str
+            }
+            ajax.roleList(data).then(res => {
+                if (res.status === 20000) {
+                    setGetRoleData(res.data)
+                } else {
+                    message.error(res.message)
+                }
+
+            })
         } else {
             setGovernmentStatus(true)
             setGetAreaStatus(false)
+            let arr = v
+            let newArr = arr[arr.length - 1];
+            let str = newArr.toString()
+            let data = {
+                id: str
+            }
+            ajax.getOrgDetail(data).then(res => {
+                console.log(res);
+                if (res.status === 20000) {
+                    setAddManage(Object.assign({},addManage,{
+                        government_style:res.data.control_type,
+                        government_area:res.data.control_area
+                    }))
+                } else {
+                    message.error(res.message)
+                }
+            })
         }
     };
+    console.log(addManage);
     const [getRoleStatus, setGetRoleStatus] = useState(true)
     //添加角色
     //角色