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

算法参数配置

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

src/modules/algo-params-setting-base/components/AlgoCanSelect/AlgoCanSelect.vue

@@ -58,7 +58,7 @@
       // display: flex;
       // flex-wrap: wrap;
       // gap: 12px;
-      max-height: 442px;
+      height: 442px;
       overflow-y: auto;
     }
 

src/modules/algo-params-setting-base/components/FenceToolbar/FenceToolbar.vue

@@ -24,23 +24,25 @@
         />
       </div>
       <PresetSelect />
-
-      <div class="fenceListWrapper" v-if="fenceStore.allFences.length > 0">
-        <FenceNameItem
-          :active="item.id === fenceStore.currentFenceId"
-          v-for="item in fenceStore.allFences"
-          :detail="item"
-          :key="item.id"
-          @click="handleSelectFence(item.id)"
-          @delete="handleDeleteFence"
-          @edit="handleEditFenceInfo(item)"
-        />
+      <div class="fenceListWrapper">
+        <div v-if="fenceStore.allFences.length > 0">
+          <FenceNameItem
+            :active="item.id === fenceStore.currentFenceId"
+            v-for="item in fenceStore.allFences"
+            :detail="item"
+            :key="item.id"
+            @click="handleSelectFence(item.id)"
+            @delete="handleDeleteFence"
+            @edit="handleEditFenceInfo(item)"
+          />
+        </div>
+        <Description :is-simple="Boolean(!cameraDetailStore.detail?.isPtz)" v-if="fenceStore.allFences.length === 0" />
       </div>
-      <div style="text-align: right" v-if="fenceStore.allFences.length > 0">
+
+      <div style="text-align: right" v-if="fenceStore.allFences.length > 0 || fenceStore.initialFence.length > 0">
         <ElButton size="small" @click="handleCancelFence">取消</ElButton>
         <ElButton type="primary" size="small" @click="handleSaveFence">保存</ElButton>
       </div>
-      <Description :is-simple="Boolean(!cameraDetailStore.detail?.isPtz)" v-if="fenceStore.allFences.length === 0" />
     </div>
 
     <div>