Merge branch 'all-v4-lhf' into 'all-v4'

All v4 lhf

See merge request skyeye/skyeye_frontend/skyeye-admin!267

src/api/algo/algo.ts

@@ -14,7 +14,7 @@ export interface algoUpdateModule {
   // updatedAt: string,
 }
 
-export interface Records {
+export interface AlgoDetail {
   code: string;
   createdAt: string;
   extra: string;
@@ -45,7 +45,7 @@ export interface Response<Records> {
  * v4: 分页查询算法列表
  */
 export function queryAlgoInfoPage(data: algoQueryModule) {
-  return http.request<Response<Records>>({
+  return http.request<Response<AlgoDetail>>({
     url: '/admin/algo/queryAlgoInfoPage',
     method: 'post',
     data,
@@ -56,7 +56,7 @@ export function queryAlgoInfoPage(data: algoQueryModule) {
  * v4： 查询完整算法列表
  */
 export function queryAlgoInfoAll() {
-  return http.request<Records[]>({
+  return http.request<AlgoDetail[]>({
     url: '/admin/algo/queryAlgoInfo',
     method: 'get',
   });

src/api/camera/camera-preview.ts

@@ -157,7 +157,7 @@ interface CreateCameraAlgoParam {
 /** 保存相机的某个算法 */
 export const createCameraAlgoApi = (param: CreateCameraAlgoParam) => {
   return http.request({
-    url: '/cameraPreview/saveAlgoWithConfig',
+    url: '/admin/algo/saveCameraAlgoWithConfig',
     data: param,
     method: 'post',
   });
@@ -166,7 +166,7 @@ export const createCameraAlgoApi = (param: CreateCameraAlgoParam) => {
 /** 更新相机的某个算法 */
 export const updateCameraAlgoApi = (param: SaveCameraAlgoParam & { id: number }) => {
   return http.request({
-    url: '/cameraPreview/updateAlgo',
+    url: '/admin/algo/updateCameraAlgoRel',
     data: param,
     method: 'put',
   });
@@ -176,7 +176,7 @@ export const updateCameraAlgoApi = (param: SaveCameraAlgoParam & { id: number })
 export const deleteCameraAlgoApi = (params: { cameraId: number; algoId: number }) => {
   const paramString = qs.stringify(params);
   return http.request({
-    url: '/cameraPreview/deleteAlgo?' + paramString,
+    url: '/admin/algo/deleteAlgo?' + paramString,
     method: 'delete',
   });
 };
@@ -192,7 +192,7 @@ export const getFenceApi = (
   params: GetFenceParams,
 ): Promise<{ id: number; electronicFencePolygon: string }> => {
   return http.request({
-    url: '/cameraPreview/getFence',
+    url: '/admin/cameraPreview/queryFence',
     method: 'GET',
     params,
   });
@@ -207,7 +207,7 @@ export interface SaveFenceParams {
 /** 添加电子围栏 */
 export const saveFenceApi = (data: SaveFenceParams) => {
   return http.request({
-    url: '/cameraPreview/saveFence',
+    url: '/admin/cameraPreview/saveFence',
     method: 'post',
     data,
   });
@@ -223,7 +223,7 @@ interface UpdateFenceParams {
 /** 编辑电子围栏 */
 export const editFenceApi = (data: UpdateFenceParams) => {
   return http.request({
-    url: '/cameraPreview/updateFence',
+    url: '/admin/cameraPreview/updateFence',
     method: 'put',
     data,
   });
@@ -324,9 +324,9 @@ export interface CameraAlgoPresetResp {
 }
 
 /** 获取平台相机展示电子围栏的预置位和算法 */
-export const getAppCameraAlgoPreset = (cameraCode: string): Promise<CameraAlgoPresetResp> => {
+export const getAppCameraAlgoPreset = (cameraId: number): Promise<CameraAlgoPresetResp> => {
   return http.request({
-    url: `/cameraPreview/getCameraPreset?cameraCode=${cameraCode}`,
+    url: `/admin/algo/queryCameraPreset?cameraId=${cameraId}`,
     method: 'get',
   });
 };
@@ -419,7 +419,7 @@ export const getCameraAlgoPresetList = (
   cameraId: number,
 ): Promise<{ algoInfoVOList: AlgoInfoType[] }> => {
   return http.request({
-    url: `/admin/cameraPreview/queryCameraAlgoPresetList?cameraId=${cameraId}`,
+    url: `/admin/algo/queryCameraAlgoPresetList?cameraId=${cameraId}`,
     method: 'get',
   });
 };

src/views/cameras/algo-management/useAlgoData.ts

@@ -1,9 +1,9 @@
-import { queryAlgoInfoPage, updateAlgoInfo, Records } from '@/api/algo/algo';
+import { queryAlgoInfoPage, updateAlgoInfo, AlgoDetail } from '@/api/algo/algo';
 import { ref } from 'vue';
 import { ElMessage } from 'element-plus';
 
 export function useAlgo() {
-  const algoList = ref<Records[]>();
+  const algoList = ref<AlgoDetail[]>();
   const page = ref(1);
   const total = ref(0);
   const pageSize = ref(12);

src/views/cameras/preview/components/AlgoSwitchCard/AlgoSwitchCard.vue

@@ -74,9 +74,9 @@
     emits('toggleFence', fenceStatus);
   };
 
-  const hasDeletePermission = () => userStore.checkPermission('algo_delete');
+  const hasDeletePermission = () => true || userStore.checkPermission('algo_delete');
 
-  const hasAlgoSettingMaxPermisson = () => userStore.checkPermission('algo_setting_max');
+  const hasAlgoSettingMaxPermisson = () => true ||userStore.checkPermission('algo_setting_max');
 </script>
 <style scoped>
   .algoWrapper {

src/views/cameras/preview/components/AlgorithmsSetting/AddAlgoDialog.vue

@@ -42,13 +42,13 @@
 </template>
 <script lang="ts" setup>
   import { ElDialog, ElSelect, ElOption, ElButton, ElMessage } from 'element-plus';
-  import { ref, watch } from 'vue';
+  import { ref, onMounted } from 'vue';
   import useCameraAlgoStore from '../../store/useCameraAlgoStore';
   import { storeToRefs } from 'pinia';
   import { createCameraAlgoApi } from '@/api/camera/camera-preview';
   import useCameraDetailStore from '../../store/useCameraDetailStore';
   import AlgoAddBtn from '../AlgoSwitchCard/AlgoAddBtn.vue';
-  import { AlgoItem, getAlgosByCameraCode, getAlgosByCameraId } from '@/api/camera/camera-preview';
+  import { AlgoDetail, queryAlgoInfoAll } from '@/api/algo/algo';
 
   const selectedIds = ref<number[]>([]);
   const cameraAlgoStore = useCameraAlgoStore();
@@ -65,23 +65,13 @@
     visible.value = false;
   };
 
-  const curOptionsByCode = ref<AlgoItem[]>([]);
-  watch(
-    () => detail.value?.id,
-    (newId) => {
-      if (!newId) return;
-      // getAlgosByCameraCode(newCode).then((res) => {
-      //   curOptionsByCode.value = res;
-      // });
+  const curOptionsByCode = ref<AlgoDetail[]>([]);
 
-      getAlgosByCameraId(newId).then(res => {
-        curOptionsByCode.value = res;
-      });
-    },
-    {
-      immediate: true,
-    },
-  );
+  onMounted(() => {
+    queryAlgoInfoAll().then((res) => {
+      curOptionsByCode.value = res;
+    });
+  });
 
   const handleVisibleChange = (visible: boolean) => {
     const t = setTimeout(() => {

src/views/cameras/preview/components/FenceAppSetting/FenceAppSetting.vue

@@ -36,8 +36,7 @@
   const cameraDetailStore = useCameraDetailStore();
   const { isShowFence, detail } = storeToRefs(cameraDetailStore);
 
-  const appFenceCameraDetail = ref<CameraAlgoPresetResp | null>(null);
-
+ 
   const options = ref([]);
 
   const { appPCUrl } = useGlobSetting();
@@ -57,8 +56,7 @@
 
       // FIXME: 该 api 还没有提供
       getAppCameraAlgoPreset(newId).then((res) => {
-        appFenceCameraDetail.value = res;
-        valuePreset.value = [res.algoCode, res.presetToken];
+         valuePreset.value = [res.algoCode, res.presetToken];
       });
     },
   );