Просмотр исходного кода

fix: camera配置edit接口错误

sunhongyao341504 2 лет назад
Родитель
Сommit
611f61eefe

+ 2 - 2
.env.development

@@ -15,7 +15,7 @@ VITE_DROP_CONSOLE = true
 # VITE_PROXY=[["/temp","http://172.16.23.144:8800"],["/upload","http://172.16.23.144:8086"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144:8800/api"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://58.144.197.158:19980/skyeye-admin-api"],["/eye_api","http://58.144.197.158:19980/eye_api"],["/push_stream_host","http://58.144.197.158:19980/push_stream_host"],["/skyeye-login","http://58.144.197.158:19980/skyeye-login"]]
-VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144/skyeye-admin-api"],["/eye_api","http://172.16.23.144/eye_api"],["/push_stream_host","http://172.16.23.144/push_stream_host"],["/skyeye-login","http://172.16.23.144/skyeye-login"]]
+VITE_PROXY=[["/skyeye-admin-api","http://36.133.176.76:19980/skyeye-admin-api"],["/eye_api","http://36.133.176.76:19980/eye_api"],["/push_stream_host","http://36.133.176.76:19980/push_stream_host"],["/skyeye-login","http://36.133.176.76:19980/skyeye-login"]]
 
 # API 接口地址
 VITE_GLOB_API_URL = 
@@ -23,7 +23,7 @@ VITE_GLOB_API_URL =
 VITE_GLOB_UPLOAD_URL=  
 
 # 图片前缀地址
-VITE_GLOB_IMG_URL = //172.16.23.144/skyeye_static/
+VITE_GLOB_IMG_URL = //36.133.176.76:19980/skyeye_static/
 
 
 # 接口前缀

+ 2 - 2
build/publish/config.ts

@@ -1,6 +1,6 @@
 export const config = {
-  // host: 'http://58.144.197.158:19980/remotePublish',
-  host: 'http://36.133.176.76:19980/remotePublish',
+  host: 'http://58.144.197.158:19980/remotePublish',
+  // host: 'http://36.133.176.76:19980/remotePublish',
   sourceFolder: 'dist',
   destFoler: 'skyeye-admin',
   reservedFiles: ['app.config.js'],

+ 16 - 4
src/views/cameras/overview/components/CameraEditPopover.vue

@@ -39,10 +39,22 @@
   };
 
   const onEditCamera = (data) => {
-    const temp = cloneDeep(data) as any;
-    delete temp.workshopName;
-    delete temp.workspaceName;
-    delete temp.principal;
+    // const temp = cloneDeep(data) as any;
+    // delete temp.workshopName;
+    // delete temp.workspaceName;
+    // delete temp.principal;
+    const temp = {
+      id: data.id,
+      name: data.name,
+      cameraIp: data.cameraIp,
+      cameraPort: data.cameraPort,
+      cameraType: data.cameraType,
+      username: data.username,
+      password: data.password,
+      workspaceId: data.workspaceId,
+      code: data.code,
+      remark: data.remark,
+    };
     editCamera(temp);
     props.confirmEvent && props.confirmEvent(data);
     updateValue(false);

+ 9 - 1
src/views/cameras/overview/components/CameraEditSRSPopover.vue

@@ -35,7 +35,15 @@
   };
 
   const onUpdateSRSCamera = (data) => {
-    editCamera(data).then(() => {
+    const temp = {
+      id: data.id,
+      name: data.name,
+      workspaceId: data.workspaceId,
+      code: data.code,
+      rtspurl: data.rtspurl,
+      remark: data.remark,
+    };
+    editCamera(temp).then(() => {
       updateValue(false);
     });
   };