Merge branch 'dev' into zy

src/App.vue

 <template>
   <div id="app" @click="readFlag = false">
     <el-config-provider>
-      <bg-menu :path="nowParent.path" @openMsg="openMsg"></bg-menu>
+      <bg-menu :path="nowParent ? nowParent[0].path : ''" @openMsg="openMsg"></bg-menu>
       <div class="container" v-if="pageShow">
         <!-- <bg-nav :highlightParentRule="highlightParentRule" :title="nowParent.menuName" width="208px" :list="nowParent.children" v-show="navShow" class="con-nav" /> -->
         <bg-nav

src/bg-ui/bg-filter-group.vue

@@ -13,6 +13,7 @@
           @keydown.enter="search"
           @clear="search"
           clearable
+          :style="{ width: inputWidth }"
           v-model.trim="modelValue">
           <template #append>
             <div class="append-btn" @click="search">
@@ -59,6 +60,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  inputWidth: {
+    type: String,
+    default: "280px",
+  },
 });
 
 watch(props, (n, o) => {

src/bg-ui/index.scss

@@ -1999,7 +1999,7 @@ a {
       flex: 1;
     }
     .right-filter {
-      width: 398px;
+      min-width: 398px;
       justify-content: end;
       display: flex;
       .el-input {

src/page/main/forewarning/list/index.vue

@@ -122,7 +122,7 @@
         </bg-pagination>
       </div>
     </div>
-    <!-- todo: 推送提醒 -->
+    <!-- 推送提醒 -->
     <el-dialog title="推送提醒" v-model="pushDialog" width="780px" :before-close="cancelPushDialog">
       <div class="warning_info">
         <bg-icon
@@ -537,8 +537,8 @@ const pushConfirm = () => {
       if (state.pushType == 1) {
         ids.push(state.actionRow.id);
       } else {
-        state.selected.forEach((e) => {
-          ids.push(e.id);
+        ids = state.selected.map((e) => {
+          return e.id;
         });
       }
       let params = {
@@ -573,8 +573,8 @@ const confirmClose = () => {
       if (state.closeType == 1) {
         ids.push(state.actionRow.id);
       } else {
-        state.selected.forEach((e) => {
-          ids.push(e.id);
+        ids = state.selected.map((e) => {
+          return e.id;
         });
       }
       let params = {

src/page/main/forewarning/rule-set/detail/index.vue

+<template>
+  <div>规则详情</div>
+</template>
+
+<script setup></script>
+
+<style lang="scss" scoped></style>