Merge branch 'zy' into dev

src/page/main/forewarning/indicator-config/detail/index.vue

@@ -44,7 +44,7 @@
         <Info :labelData="rule_label" :valueData="rule_data">
           <template #alert_rule_type="{ valueData }">
             <span>
-              {{ ruleTypeOptions[valueData.alert_rule_type] }}
+              {{ ruleTypeOptions[valueData.alert_rule_type]?.label || "" }}
             </span>
           </template>
         </Info>
@@ -129,6 +129,8 @@ const rule_data = ref({});
 const ruleTypeOptions = ref({});
 const getRuleTypeOptions = async () => {
   ruleTypeOptions.value = await GetRuleTypeOptions();
+  console.log("ruleTypeOptions.value: ", ruleTypeOptions.value);
+  getInfoData();
 };
 const advanced_label = [
   [
@@ -209,8 +211,7 @@ const getInfoData = () => {
           check_period: check_period + "分钟",
         };
         rule_data.value = {
-          //   alert_rule_type: alert_rule_type,
-          alert_rule_type: "1",
+          alert_rule_type: alert_rule_type,
         };
       } else {
         ElMessage.error(res.data.data);
@@ -219,7 +220,6 @@ const getInfoData = () => {
 };
 onBeforeMount(() => {
   getRuleTypeOptions();
-  getInfoData();
 });
 </script>
 

src/page/main/ticket/business-ticket-manage/modules/add-form.vue

 <template>
   <div class="add-form">
-    <el-form :model="state.form" ref="form" :rules="state.rules" label-width="110px">
+    <el-form :model="state.form" ref="form" :rules="state.rules" label-width="115px">
       <el-form-item label="工单名称" prop="ticket_name">
         <el-input v-model="state.form.ticket_name" :disabled="isEdit" placeholder="请输入工单名称"></el-input>
       </el-form-item>
@@ -18,6 +18,7 @@
           <ManualDistributionForm
             ref="manual_distribution_form"
             :noElLabel="false"
+            labelWidth="115px"
             :methodLists="ORDER_METHODS"
             methodLabel="推送方式"
             :history="history" />

src/page/main/ticket/business-ticket-manage/modules/by-week.vue

 <template>
-  <el-form :model="state.form" ref="form" :rules="rules" label-width="110px">
+  <el-form :model="state.form" ref="form" :rules="rules" label-width="115px">
     <el-form-item label="按周 （多选）" prop="week_days">
       <el-select v-model="state.form.week_days" :multiple="true" placeholder="请选择" style="flex: 1">
         <el-option v-for="item in weekDayOptions" :key="item.id" :label="item.name" :value="item.id"> </el-option>