Merge branch 'feature/3月迭代' into master

src/components/dm-new-member-group/table.vue

@@ -10,7 +10,7 @@
         <div class="btn"><el-button size="small" type="primary" @click="addGroup">新增分组</el-button></div>
       </div>
     </div>
-    <el-table :data="tableData" ref="table" style="width:100%" v-loading="loading" @select="handleSelect" @selection-change="handleSelectionChange" row-key="memberTagGroupId" @row-click="selectRow">
+    <el-table :data="tableData" ref="table" style="width:100%" v-loading="loading" @select="handleSelect" height="355px" @selection-change="handleSelectionChange" row-key="memberTagGroupId" @row-click="selectRow">
       <el-table-column type="selection" width="55" :selectable="selectable"> </el-table-column>
       <el-table-column label="分组名称" min-width="180px" prop="groupName">
         <template slot-scope="{ row }">
@@ -80,7 +80,7 @@ export default {
       loading: false,
       tableData: [],
       totalCount: 0,
-      pageSize: 5,
+      pageSize: 20,
       currentPage: 1,
       dataSearch: '',
       fixedType: 0 // 0普通的分组，  1固化分组  3固化分组分堆
@@ -232,4 +232,7 @@ export default {
 .h-18 {
   line-height: 18px;
 }
+/deep/ .el-table__header .el-checkbox {
+  display: none;
+}
 </style>

src/components/dm-new-rule/ruleFilter.vue

@@ -373,6 +373,11 @@ export default {
     background: #2f54eb;
     margin-right: 8px;
   }
+  .text {
+    font-size: 14px;
+    color: #303133;
+    width: 100%;
+  }
 }
 .ruleFilter {
   width: 400px;

src/views/ai/task/task.vue

@@ -94,7 +94,7 @@ import { page, rechargeCenter, stopActivityPlan, startActivityPlan, pageStatisti
 import { formatDateTimeByType } from '@/utils/index.js';
 import filterAvater from '@/mixins/filterAvater.js';
 import dmDropdown from '@/components/dm-drop-down/dm-drop-down';
-const maxTimeRange = 180 * 24 * 60 * 60 * 1000; // 6个月
+const maxTimeRange = 365 * 24 * 60 * 60 * 1000; // 12个月
 export default {
   mixins: [filterAvater],
   data() {
@@ -106,14 +106,14 @@ export default {
         activityName: '',
         scene: '',
         activityPlanStatus: '',
-        time: [new Date().getTime() - maxTimeRange, new Date().getTime() + maxTimeRange],
+        time: [new Date().getTime() - 365 * 24 * 60 * 60 * 1000, new Date().getTime()],
         pageNum: 1,
         pageSize: 20
       },
       total: 0,
       pickerOptions: {
         disabledDate: time => {
-          return time.getTime() < new Date().getTime() - maxTimeRange || time.getTime() > new Date().getTime() + maxTimeRange;
+          return time.getTime() < new Date().getTime() - maxTimeRange || time.getTime() > new Date().getTime();
         }
       },
       btnArr: [