Преглед изворни кода

feat: 多相机配置添加权限以及新增获取算法接口参数

dao qin пре 1 година
родитељ
комит
3c1c1c846a

+ 2 - 0
src/types/permission/constants.ts

@@ -29,6 +29,8 @@ export enum PERM_ALGO {
   CONFIG_ADD = 'algo_admin_module:config_add', // 算法添加
   CONFIG_DELETE = 'algo_admin_module:config_delete', // 算法删除
   CONFIG_PARAM = 'algo_admin_module:config_param', // 算法参数配置
+  CONFIG_ADD_GROUP = 'algo_admin_module:config_add_group', // 多相机算法参数配置——添加分组
+  CONFIG_DELETE_GROUP = 'algo_admin_module:config_delete_group', // 多相机算法参数配置-—删除分组
 }
 
 /**

+ 6 - 35
src/views/cameras/camera-group-setting/CamerGroupSetting.vue

@@ -1,6 +1,9 @@
 <!-- 算法参数配置页面 -->
 <template>
-  <AlgoParamsSettingBase :cameraAllAlgoList="cameraAllAlgoList" :isCameraGroup="true">
+  <AlgoParamsSettingBase 
+  :cameraAllAlgoList="cameraAllAlgoList" 
+  :isCameraGroup="true" 
+  :getCameraAlgoList="queryGroupAlgoInfoByCameraId">
     <template #cameraTree>
       <CameraTreeList ref="CameraTreeRef"/>
     </template>
@@ -8,7 +11,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { watch, ref, computed } from 'vue';
+  import { watch, ref } from 'vue';
   import { useRoute } from 'vue-router';
   import AlgoParamsSettingBase from '@/modules/algo-params-setting-base/AlgoParamsSettingBase.vue';
   import CameraTreeList from './components/CameraTreeList.vue';
@@ -35,36 +38,4 @@
 
 </script>
 
-<style lang="scss" scoped>
-  .camera-group-page {
-    height: 100%;
-    background-color: rgba(255, 255, 255, 1);
-  }
-  .camera-group-header {
-      display: flex;
-      align-items: center;
-      padding: 16px 0 15px 20px;
-      border-bottom: 1px solid #e9e9e9;
-
-      .camera-group-rollback {
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-
-        img {
-          width: 14px;
-        }
-
-        span {
-          font-size: 14px;
-          color: #333333;
-          margin-left: 10px;
-        }
-
-      }
-
-      .camera-name {
-        margin-left: 10px;
-      }
-    }
-</style>
+<style lang="scss" scoped></style>

+ 1 - 2
src/views/cameras/camera-group-setting/components/CameraTreeList.vue

@@ -16,7 +16,7 @@
   import { ref, onMounted } from 'vue';
   import { useRoute } from 'vue-router';
   import CameraTreeCom from '@/modules/camera-tree/CameraTree.vue';
-  import { CameraTree, CameraTreeNodeType, CameraQueryForm } from '@/api/camera/camera-preview';
+  import { CameraTree, CameraTreeNodeType } from '@/api/camera/camera-preview';
   import { queryCameraTreeByGroupId } from '@/api/camera/camera-preview-group';
   import { ElMessage } from 'element-plus';
   import { useRouteQuery } from '@vueuse/router';
@@ -46,7 +46,6 @@
     });
   });
 
-
 </script>
 
 <style scoped lang="scss">

+ 6 - 1
src/views/cameras/preview/components/CameraConfigGroup/CameraConfigGroup.vue

@@ -6,6 +6,7 @@
           type="primary"
           @click="createGroupDialog = true"
           style="margin-top: 24px; margin-bottom: 16px; width: 138px"
+          v-permission="{ action: [PERM_ALGO.CONFIG_ADD_GROUP] }"
         >
           <img src="@/assets/images/create.png" style="margin-top: -1px; margin-right: 5px" />新建相机分组
         </el-button>
@@ -47,7 +48,10 @@
               </el-tooltip>
               
               <el-tooltip effect="light" content="删除" placement="bottom">
-                <img src="@/views/message/alarmMessages/img/delete.png" @click="handleDelete(scope.row)" />
+                <img src="@/views/message/alarmMessages/img/delete.png" 
+                @click="handleDelete(scope.row)" 
+                 v-permission="{ action: [PERM_ALGO.CONFIG_DELETE_GROUP] }"
+                />
               </el-tooltip>
             </div>
           </template>
@@ -108,6 +112,7 @@ import useCameraGroupQuery from './hooks/useCameraGroupQuery';
 import { CameraGroupTableItem, CameraGroupStatus, IsMainCamera } from '@/types/camera/camera-preview';
 import { deleteDetectionGroup, updateGroupStatus, saveDetectionGroup } from '@/api/camera/camera-preview-group';
 import SettingCamera from './components/SettingCamera.vue'
+import { PERM_ALGO } from '@/types/permission/constants';
 
 const router = useRouter();
 const { requestParams, total, queryCameraGroupPage, cameraGroupList, loading } = useCameraGroupQuery();