Merge branch 'lhf-fix' into 'dev'

feat:[相机列表] 增加鹰眼追踪查询条件

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

src/api/camera/camera-overview.ts

@@ -31,6 +31,7 @@ export type CameraQueryParams = {
   pageNumber?: number;
   pageSize?: number;
   sourceType?: string;
+  openEagle?: number;
 };
 
 export enum IsPtz {

src/views/cameras/overview/components/ConditionQuery.vue

@@ -42,20 +42,28 @@
       </div>
       <div>
         <span>联网状态：</span>
-        <el-select v-model="networkingState" placeholder="请选择添加方式" class="protocal-select">
-          <el-option :value="-1" label="无" />
+        <el-select v-model="networkingState" placeholder="请选择添加方式" class="simple-select">
+          <el-option :value="-1" label="全部" />
           <el-option :value="0" label="已联网" />
           <el-option :value="1" label="未联网" />
         </el-select>
       </div>
       <div>
-        <span>是否进入平台：</span>
-        <el-select v-model="integrationState" placeholder="请选择添加方式" class="protocal-select">
-          <el-option :value="-1" label="无" />
+        <span>进入平台：</span>
+        <el-select v-model="integrationState" placeholder="请选择添加方式" class="simple-select">
+          <el-option :value="-1" label="全部" />
           <el-option :value="0" label="是" />
           <el-option :value="1" label="否" />
         </el-select>
       </div>
+      <div>
+        <span>鹰眼追踪：</span>
+        <el-select v-model="openEagle" placeholder="请选择添加方式" class="simple-select">
+          <el-option :value="-1" label="全部" />
+          <el-option :value="1" label="是" />
+          <el-option :value="0" label="否" />
+        </el-select>
+      </div>
     </el-space>
     <div class="flex-1 flex justify-end">
       <el-button type="primary" @click="getCameraItems"> 查询 </el-button>
@@ -82,6 +90,7 @@
     queryWorkSpace,
     integrationState,
     networkingState,
+    openEagle,
   } = storeToRefs(cameraOverview);
   const { getCameraItems } = cameraOverview;
 
@@ -93,6 +102,7 @@
     queryWorkSpace.value = '';
     integrationState.value = -1;
     networkingState.value = -1;
+    openEagle.value = -1;
   };
 
   onMounted(() => {
@@ -109,6 +119,10 @@
     width: 160px;
   }
 
+  .simple-select {
+    width: 80px;
+  }
+
   .query-head {
     padding: 24px 57px 18px 21px;
   }

src/views/cameras/overview/stores/useCameraOverview.ts

@@ -12,14 +12,17 @@ import {
 import { CameraIPItem, CameraNVRItem, CameraSRS, CameraShowItem } from '../type';
 import { useRequest } from 'vue-hooks-plus';
 
+const ALL = -1;
+
 export const useCameraOverview = defineStore('camera-overview', () => {
   const queryType = ref('');
   const queryTypeContent = ref('');
   const queryCameraType = ref('');
   const queryWorkSpace = ref('');
   const querySourceType = ref('');
-  const networkingState = ref<number>(-1);
-  const integrationState = ref<number>(-1);
+  const networkingState = ref<number>(ALL);
+  const integrationState = ref<number>(ALL);
+  const openEagle = ref<number>(ALL);
   const total = ref(0);
   const page = ref(1);
   const size = ref(10);
@@ -55,12 +58,15 @@ export const useCameraOverview = defineStore('camera-overview', () => {
       console.log('queryCameraType.value', querySourceType.value);
       params.sourceType = querySourceType.value;
     }
-    if (networkingState.value != -1) {
+    if (networkingState.value != ALL) {
       params.networkingState = networkingState.value;
     }
-    if (integrationState.value != -1) {
+    if (integrationState.value != ALL) {
       params.integrationState = integrationState.value;
     }
+    if (openEagle.value != ALL) {
+      params.openEagle = openEagle.value;
+    }
     return getCameraList(params).then((res) => {
       return res;
     });
@@ -143,6 +149,7 @@ export const useCameraOverview = defineStore('camera-overview', () => {
     querySourceType,
     queryWorkSpace,
     integrationState,
+    openEagle,
     networkingState,
     cameraItems,
     loading,