fix: 问题单修改

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

@@ -238,7 +238,11 @@ function PersonInfo() {
 
     const getAssets = (id, editFlag) => {
         if (id) {
-            ajax.getAssets({ id: id }).then(res => {
+            let temp_params = {id: id}
+            if(showEdit || editFlag){
+                temp_params.user_id = currentPersonId
+            }
+            ajax.getUserGoods(temp_params).then(res => {
                 if (res.status == 20000) {
                     if (showEdit || editFlag) {
                         let temparr = [];

src/pages/Nav/index.scss

@@ -16,7 +16,7 @@
     align-items: center;
 }
 .nav-contanier{
-    width: 1600px;
+    width: 1510px;
     height: 710px;
     display: flex;
     flex-direction: row;

src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx

@@ -139,7 +139,7 @@ function OutMonitorMgm(props) {
     setDefaultParams({ ...postData, ...pageInfo });
     // console.log(postData);
     setTabLoading(true);
-    ajax.getMonitorList({ ...postData, ...v, ...pageInfo , data_source:2}).then( // data_source用于区分路内和路外的请求
+    ajax.getOutMonitorList({ ...postData, ...v, ...pageInfo , data_source:2}).then( // data_source用于区分路内和路外的请求
       (res) => {
         if (parseInt(res?.status) === 20000) {
           setResultData(res?.data || {});
@@ -403,7 +403,7 @@ function OutMonitorMgm(props) {
       message.error("请选择泊位");
       return;
     }
-    ajax[values?.id ? "monitorEdit" : "monitorAdd"]({
+    ajax[values?.id ? "monitorOutEdit" : "monitorOutAdd"]({
       ...values,
       berth_ids: rowData?.berth_ids,
     }).then(
@@ -436,7 +436,7 @@ function OutMonitorMgm(props) {
   // 下载模板
   const downloadTemplate = (e) => {
     // 获取模板地址
-    ajax.monitorAdd().then(
+    ajax.monitorOutAdd().then(
       (res) => {
         if (res.status === 20000 && res?.data) {
           window.location.href = res?.data;
@@ -515,7 +515,7 @@ function OutMonitorMgm(props) {
       message.error("请上传文件");
       return;
     }
-    ajax.monitorAdd({ files: fileList }).then(
+    ajax.monitorOutAdd({ files: fileList }).then(
       (res) => {
         if (res?.status == 20000) {
           message.success(res?.message);

src/services/InroadMgm/PersonMgm/index.js

@@ -47,6 +47,14 @@ const getAssets = (p)=>{
     data: p
   })
 }
+//获取所有已经领用的物品列表  
+const getUserGoods = (p)=>{
+  return ajax({
+    url: "/api/bpm/user/get_user_goods",
+    type: 'get',
+    data: p
+  })
+}
 // 获取所有路段列表 
 const getPersonAllRoad = (p)=>{
   return ajax({
@@ -79,6 +87,7 @@ export default {
   getCurrentPersonInfo,
   getDeparts,
   getAssets,
+  getUserGoods,
   getPersonAllRoad,
   addUserPersonInfo,
   editUserPersonInfo

src/services/search.js

@@ -326,6 +326,13 @@ const getMonitorList = (params) => {
     data: params,
   });
 };
+const getOutMonitorList = (params) => {
+  return ajax({
+    url: "/api/orp/nvr/get_monitor_device_list",
+    type: "get",
+    data: params,
+  });
+};
 const monitorAdd = (params) => {
   return ajax({
     url: "/api/bpm/device/add_monitor_device",
@@ -333,6 +340,13 @@ const monitorAdd = (params) => {
     data: params,
   });
 };
+const monitorOutAdd = (params) => {
+  return ajax({
+    url: "/api/orp/nvr/add_monitor_device ",
+    type: "post",
+    data: params,
+  });
+};
 const monitorEdit = (params) => {
   return ajax({
     url: "/api/bpm/device/edit_monitor_device",
@@ -340,6 +354,13 @@ const monitorEdit = (params) => {
     data: params,
   });
 };
+const monitorOutEdit = (params) => {
+  return ajax({
+    url: "/api/orp/nvr/edit_monitor_device",
+    type: "post",
+    data: params,
+  });
+};
 const monitorDel = (params) => {
   return ajax({
     url: "/api/bpm/device/del_monitor_device",
@@ -1342,5 +1363,9 @@ export default {
   deleteChangeRules,
   getDetailData,
   getRoadListData,
-  getBind
+  getBind,
+  getOutMonitorList,
+  monitorOutAdd,
+  monitorOutEdit,
+  getChannelByNvr
 }