diff --git a/src/components/manual-distribution/form.vue b/src/components/manual-distribution/form.vue
index 1968ed018b3809d66303008212fcc814b4492e16..448896d2b469266a7aa869546130ffffae916bba 100644
--- a/src/components/manual-distribution/form.vue
+++ b/src/components/manual-distribution/form.vue
@@ -78,8 +78,10 @@
 </template>
 
 <script setup>
+import { ElMessage } from "element-plus";
 import { reactive, watch, ref, computed } from "vue";
 import { METHODS, ADD_NUM } from "./env";
+import axios from "@/request/http.js";
 const props = defineProps({
   disabled: {
     type: Boolean,
@@ -160,43 +162,20 @@ const addTrue = ref(0);
 // 获取远程用户列表
 const userLists = ref([]);
 const getUserLists = () => {
-  userLists.value = [
-    {
-      user_id: 1,
-      user_name: 11,
-      phone: 13000000001,
-    },
-    {
-      user_id: 2,
-      user_name: 22,
-      phone: 13000000002,
-    },
-    {
-      user_id: 3,
-      user_name: 33,
-      phone: 13000000003,
-    },
-    {
-      user_id: 4,
-      user_name: 44,
-      phone: 13000000004,
-    },
-    {
-      user_id: 5,
-      user_name: 55,
-      phone: 13000000005,
-    },
-    {
-      user_id: 6,
-      user_name: 66,
-      phone: 13000000006,
-    },
-    {
-      user_id: 7,
-      user_name: 77,
-      phone: 13000000007,
-    },
-  ];
+  axios.get("/v1/api/user/devOps").then((res) => {
+    if (res.data.code == 200) {
+      userLists.value =
+        res.data.data?.map((e) => {
+          return {
+            user_id: e.system_account,
+            user_name: e.name,
+            phone: e.phone,
+          };
+        }) || [];
+    } else {
+      ElMessage.error(res.data.msg);
+    }
+  });
 };
 // 格式化处理用户下拉列表，去除已经选择的用户，并将当前选中的也显示到列表中
 const userOptions = computed(() => {
diff --git a/src/page/main/forewarning/indicator-config/index.vue b/src/page/main/forewarning/indicator-config/index.vue
index 5cc856eaf4a412a83bc8856f681277f11f9a08c9..9eb9da246cc0f071321c0dd93ddbf8cee6415c04 100644
--- a/src/page/main/forewarning/indicator-config/index.vue
+++ b/src/page/main/forewarning/indicator-config/index.vue
@@ -37,7 +37,7 @@
                   style="width: 400px"
                   v-model="filter.time"
                   type="datetimerange"
-                  value-format="yyyy-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
                   range-separator="至"
                   start-placeholder="开始时间"
                   end-placeholder="结束时间" />
@@ -210,7 +210,9 @@ const selectable = (row, index) => {
   return row.is_enabled === 2;
 };
 const getTableRows = () => {
-  let params = { ...state.filter, class_id: node.value.data.class_id };
+  const [start_time = "", end_time = ""] = state.filter.time;
+  let params = { ...state.filter, class_id: node.value.data.class_id, start_time, end_time };
+  Reflect.deleteProperty(params, "time");
   axios.get("/v1/api/metric_config/list", { params }).then((res) => {
     if (res.data.code == 200) {
       state.tableRows =
diff --git a/src/page/main/forewarning/rule-set/detail/index.vue b/src/page/main/forewarning/rule-set/detail/index.vue
index 9d62615041936dbab10bccac2ac70277fed45635..f693b0804e3ed32e332ca8531cda2a82295404dd 100644
--- a/src/page/main/forewarning/rule-set/detail/index.vue
+++ b/src/page/main/forewarning/rule-set/detail/index.vue
@@ -58,6 +58,8 @@ import gapTitle from "@/components/gap-title.vue";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 import Info from "@/components/warn-detail/info.vue";
 import { METHODS } from "@/components/manual-distribution/env.js";
+import { Empty } from "../modules/env.js";
+import { GetRuleTypeOptions } from "../modules/interface.js";
 const route = useRoute();
 const { id } = route.query;
 const STATUS_OBJ = ["禁用", "启用"];
@@ -215,7 +217,7 @@ const getInfoData = () => {
           ]);
           watning_scope_data.value[e.name] = e.value == ".*" ? "全部" : `${selectRule[e.compare]} ${e.value}`;
         });
-        let isEmpty = !data.alert_rule_type || data.alert_rule_type == "empty";
+        let isEmpty = Empty(data.alert_rule_type);
         if (!isEmpty) {
           ruleHeaders.value = [
             {
@@ -227,9 +229,9 @@ const getInfoData = () => {
         }
         ruleRows.value = data.alert_condition.map((e) => {
           return {
-            warning_threshold: `${e.thresholds_min}${ruleTypeOptions.value[data.alert_rule_type].unit} - ${
+            warning_threshold: `${e.thresholds_min}${ruleTypeOptions.value[data.alert_rule_type]?.unit || ""} - ${
               e.thresholds_max
-            }${ruleTypeOptions.value[data.alert_rule_type].unit}`,
+            }${ruleTypeOptions.value[data.alert_rule_type]?.unit || ""}`,
             risk_level: riskLevelOptions[e.risk_level],
           };
         });
@@ -248,41 +250,8 @@ const getInfoData = () => {
       }
     });
 };
-const getRuleTypeOptions = () => {
-  let arr = [
-    {
-      id: "empty",
-      label: "空",
-    },
-    {
-      id: "1",
-      label: "百分比范围",
-      unit: "%",
-    },
-    {
-      id: "2",
-      label: "毫秒范围",
-      unit: "ms",
-    },
-    {
-      id: "3",
-      label: "秒范围",
-      unit: "s",
-    },
-    {
-      id: "4",
-      label: "个范围",
-      unit: "个",
-    },
-    {
-      id: "5",
-      label: "温度范围",
-      unit: "℃",
-    },
-  ];
-  arr.forEach((e) => {
-    ruleTypeOptions.value[e.id] = e;
-  });
+const getRuleTypeOptions = async () => {
+  ruleTypeOptions.value = await GetRuleTypeOptions();
   getInfoData();
 };
 onBeforeMount(() => {
diff --git a/src/page/main/forewarning/rule-set/edit/index.vue b/src/page/main/forewarning/rule-set/edit/index.vue
index c0359b5f767c438c869fd87c5078b23aaa07658e..f418e3fbd61acbe88c043999f2b06fece560e4c4 100644
--- a/src/page/main/forewarning/rule-set/edit/index.vue
+++ b/src/page/main/forewarning/rule-set/edit/index.vue
@@ -21,6 +21,7 @@ import addForm from "../modules/add-form.vue";
 import axios from "@/request/http.js";
 import { ElMessage } from "element-plus";
 import { Save } from "../modules/interface.js";
+import { Empty } from "../modules/env.js";
 const infoData = ref({});
 
 const router = useRouter();
@@ -54,8 +55,7 @@ const getInfoData = () => {
     .then((res) => {
       if (res.data.code == 200) {
         const { data } = res.data;
-        console.log("data: ", data);
-        const isEmpty = !data.alert_rule_type || data.alert_rule_type == "empty";
+        const isEmpty = Empty(data.alert_rule_type);
         let type_json = {
           1: () => {
             let obj = {
@@ -67,26 +67,27 @@ const getInfoData = () => {
                 rule_type: data.alert_rule_type,
               },
             };
-            // if (isEmpty) {
-            //   obj.type_com_ref.risk_level = data.alert_condition[0].risk_level;
-            // } else {
-            obj.type_com_ref.warning_scpoe_form =
-              data.alert_range?.map((e) => {
-                return {
-                  ...e,
-                  select: e.compare,
-                  options: [],
-                };
-              }) || [];
-            obj.type_com_ref.ruleRows =
-              data.alert_condition?.map((e) => {
-                return {
-                  from: e.thresholds_min,
-                  to: e.thresholds_max,
-                  risk_level: e.risk_level,
-                };
-              }) || [];
-            // }
+            if (isEmpty) {
+              obj.type_com_ref.risk_level = data.alert_condition[0].risk_level;
+            } else {
+              obj.type_com_ref.warning_scpoe_form =
+                data.alert_range?.map((e) => {
+                  return {
+                    ...e,
+                    value: e.value == ".*" ? "" : e.value,
+                    select: e.value == ".*" ? "all" : e.compare,
+                    options: [],
+                  };
+                }) || [];
+              obj.type_com_ref.ruleRows =
+                data.alert_condition?.map((e) => {
+                  return {
+                    from: e.thresholds_min,
+                    to: e.thresholds_max,
+                    risk_level: e.risk_level,
+                  };
+                }) || [];
+            }
             return obj;
           },
           2: () => {
diff --git a/src/page/main/forewarning/rule-set/modules/common.js b/src/page/main/forewarning/rule-set/modules/common.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/page/main/forewarning/rule-set/modules/custom.vue b/src/page/main/forewarning/rule-set/modules/custom.vue
index 6e5c9b21c6d678e165e6919b68fb2e93a7f6ff6e..abf08827987234f04afbffaf2dc3c8d6c6887028 100644
--- a/src/page/main/forewarning/rule-set/modules/custom.vue
+++ b/src/page/main/forewarning/rule-set/modules/custom.vue
@@ -150,6 +150,8 @@
 import { computed, onBeforeMount, reactive, ref } from "vue";
 import gapTitle from "@/components/gap-title.vue";
 import { ElMessage } from "element-plus";
+import { Empty } from "../modules/env.js";
+import { GetRuleTypeOptions } from "./interface.js";
 const props = defineProps({
   form: {
     type: Object,
@@ -194,7 +196,9 @@ const state = reactive({
     risk_level: [{ required: true, message: "请选择风险程度", trigger: "change" }],
   },
 });
-const isEmpty = computed(() => state.form.rule_type == "empty");
+const isEmpty = computed(() => {
+  return Empty(state.form.rule_type);
+});
 const changeWarnCustomTarget = () => {};
 const changeWarnCustomType = () => {};
 const setLimits = (index) => {
@@ -323,61 +327,8 @@ const limit = computed(() => {
     }
   );
 });
-const getRuleTypeOptions = () => {
-  let arr = [
-    {
-      id: "empty",
-      label: "空",
-    },
-    {
-      id: "1",
-      label: "百分比范围",
-      unit: "%",
-      limit: {
-        down: 0,
-        up: 100,
-      },
-    },
-    {
-      id: "2",
-      label: "毫秒范围",
-      unit: "ms",
-      limit: {
-        down: 0,
-        up: "",
-      },
-    },
-    {
-      id: "3",
-      label: "秒范围",
-      unit: "s",
-      limit: {
-        down: 0,
-        up: "",
-      },
-    },
-    {
-      id: "4",
-      label: "个范围",
-      unit: "个",
-      limit: {
-        down: 0,
-        up: "",
-      },
-    },
-    {
-      id: "5",
-      label: "温度范围",
-      unit: "℃",
-      limit: {
-        down: "",
-        up: "",
-      },
-    },
-  ];
-  arr.forEach((e) => {
-    ruleTypeOptions.value[e.id] = e;
-  });
+const getRuleTypeOptions = async () => {
+  ruleTypeOptions.value = await GetRuleTypeOptions();
 };
 const ruleHeaders = [
   {
diff --git a/src/page/main/forewarning/rule-set/modules/env.js b/src/page/main/forewarning/rule-set/modules/env.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e4ecc64a6626c98831495d28ded56835cca6ca9
--- /dev/null
+++ b/src/page/main/forewarning/rule-set/modules/env.js
@@ -0,0 +1,3 @@
+export const Empty = (key) => {
+    return !key || key == "empty"
+}
\ No newline at end of file
diff --git a/src/page/main/forewarning/rule-set/modules/gateway.vue b/src/page/main/forewarning/rule-set/modules/gateway.vue
index 4f9c22eeb23f715ab14c15c8168fc8e9d1126797..d82a2c4b34428d67d609efaec023b55ccc1cbedf 100644
--- a/src/page/main/forewarning/rule-set/modules/gateway.vue
+++ b/src/page/main/forewarning/rule-set/modules/gateway.vue
@@ -84,6 +84,7 @@
 import { computed, nextTick, onBeforeMount, reactive, ref } from "vue";
 import gapTitle from "@/components/gap-title.vue";
 import { ElMessage } from "element-plus";
+import { GetRuleTypeOptions } from "./interface.js";
 const props = defineProps({
   form: {
     type: Object,
@@ -96,61 +97,7 @@ const props = defineProps({
 });
 const ruleTypeOptions = ref({});
 const getRuleTypeOptions = async (cb) => {
-  let arr = [
-    {
-      id: "empty",
-      label: "空",
-    },
-    {
-      id: "1",
-      label: "百分比范围",
-      unit: "%",
-      limit: {
-        down: 0,
-        up: 100,
-      },
-    },
-    {
-      id: "2",
-      label: "毫秒范围",
-      unit: "ms",
-      limit: {
-        down: 0,
-        up: "",
-      },
-    },
-    {
-      id: "3",
-      label: "秒范围",
-      unit: "s",
-      limit: {
-        down: 0,
-        up: "",
-      },
-    },
-    {
-      id: "4",
-      label: "个范围",
-      unit: "个",
-      limit: {
-        down: 0,
-        up: "",
-      },
-    },
-    {
-      id: "5",
-      label: "温度范围",
-      unit: "℃",
-      limit: {
-        down: "",
-        up: "",
-      },
-    },
-  ];
-  arr.forEach((e) => {
-    ruleTypeOptions.value[e.id] = e;
-  });
-  await nextTick();
+  ruleTypeOptions.value = await GetRuleTypeOptions();
   cb && cb();
 };
 const state = reactive({
diff --git a/src/page/main/forewarning/rule-set/modules/interface.js b/src/page/main/forewarning/rule-set/modules/interface.js
index 44e349d4351591dd1dc80bc15e0ee811914df6f9..309258f8a5e1ec7f8d346ac7389906b629b74d7e 100644
--- a/src/page/main/forewarning/rule-set/modules/interface.js
+++ b/src/page/main/forewarning/rule-set/modules/interface.js
@@ -113,4 +113,41 @@ export const Save = (res, p, cb) => {
             ElMessage.error(res.data.data)
         }
     })
+}
+export const GetRuleTypeOptions = () => {
+    let arr = [{
+            id: "empty",
+            label: "空",
+        },
+        {
+            id: "1",
+            label: "百分比范围",
+            unit: "%",
+        },
+        {
+            id: "2",
+            label: "毫秒范围",
+            unit: "ms",
+        },
+        {
+            id: "3",
+            label: "秒范围",
+            unit: "s",
+        },
+        {
+            id: "4",
+            label: "个范围",
+            unit: "个",
+        },
+        {
+            id: "5",
+            label: "温度范围",
+            unit: "℃",
+        },
+    ];
+    let obj = {}
+    arr.forEach((e) => {
+        obj[e.id] = e;
+    });
+    return obj
 }
\ No newline at end of file
diff --git a/src/page/main/forewarning/rule-set/modules/static.vue b/src/page/main/forewarning/rule-set/modules/static.vue
index b6a65ea9debd8f303c4fad48ef28fb8adab77a50..a34a13ee7c16bff3e3c9d0eb998ca2fadbd99740 100644
--- a/src/page/main/forewarning/rule-set/modules/static.vue
+++ b/src/page/main/forewarning/rule-set/modules/static.vue
@@ -94,6 +94,8 @@ import gapTitle from "@/components/gap-title.vue";
 import Gateway from "./gateway.vue";
 import { ElMessage } from "element-plus";
 import axios from "@/request/http.js";
+import { Empty } from "../modules/env.js";
+
 const showSelect = ["=~", "!~"];
 const selectRule = ref({
   all: "全部",
@@ -161,7 +163,7 @@ const state = reactive({
 const module_data = ref({});
 const alert_rule_type = ref("");
 const isEmpty = computed(() => {
-  return !alert_rule_type.value || alert_rule_type.value == "empty";
+  return Empty(alert_rule_type.value);
 });
 const chooseWarnIndicator = () => {
   axios
@@ -226,7 +228,7 @@ const formFormat = computed(() => {
     warn_target,
     warn_type,
     isEmpty: isEmpty.value,
-    alert_rule_type: module_data.value,
+    alert_rule_type: module_data.value.alert_rule_type,
   };
   if (!isEmpty.value) {
     obj = {
@@ -285,7 +287,6 @@ const ruleHeaders = [
 ];
 const rule_rows = computed(() => props.form?.ruleRows || []);
 const info = () => {
-  console.log(1);
   state.form.warn_type =
     props.form.warn_target && props.form.warn_type ? [props.form.warn_target, props.form.warn_type] : [];
   state.form.warn_indicator = props.form.warn_indicator;