Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

src/views/ai/logs-runed.vue

@@ -3,7 +3,7 @@
     <div class="search-bar">
       <el-date-picker @change="handleCurrentChange(1)" class="search-date" v-model="search.dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       <el-select @change="handleCurrentChange(1)" v-model="search.status" clearable class="search-select">
-        <el-option v-for="(item, key) in statusMap" :key="key" :value="key" :label="item"></el-option>
+        <el-option v-for="item in statusMap" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
     </div>
     <el-table :data="tableData" v-loading="loading" tooltipEffect="light">
@@ -25,7 +25,7 @@
                 'dm-status--warning': row.status == 5
               }"
             ></i>
-            {{ statusMap[row.status] }}
+            {{ (statusMap.find(el => el.value == row.status) || { label: '--' }).label }}
           </span>
         </template>
       </el-table-column>
@@ -44,13 +44,14 @@ export default {
   data() {
     return {
       formatDateTimeByType,
-      statusMap: {
-        1: '未开始执行',
-        2: '执行中',
-        3: '已终止',
-        4: '已完成',
-        5: '欠费暂停'
-      },
+      statusMap: [
+        { value: 1, label: '未开始执行' },
+        { value: 2, label: '执行中' },
+        { value: 3, label: '已终止' },
+        { value: 4, label: '已完成' },
+        { value: 6, label: '已结束' },
+        { value: 5, label: '欠费暂停' }
+      ],
       search: {
         activityId: '', // 活动ID
         dateRange: [],