diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index 8b02f9a..20a6f3d 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -70,6 +70,8 @@
               :max-date="data.maxDate"
               :style="{ height: '80vh' }">
           </van-calendar>
+          <van-button @click="cancelCalendar" size="mini" style="margin-left: 46%;background: white">清空</van-button>
+
         </van-popup>
       </div>
 
@@ -92,7 +94,7 @@
         </van-popup>
       </div>
       <div class="warning-rule" style="margin-top: -8px">
-        <span><van-icon name="warning-o"/></span><span>请输入关键字搜索。</span>
+        <span><van-icon name="warning-o"/></span><span>{{data.warnText}}</span>
       </div>
 
         <!-- 中间 -->
@@ -227,7 +229,8 @@
         refreshing: false,
         curPage: 1,
         total: 0,
-        is_show: false
+        flag:0,//文本提示显示判断
+        warnText:""
     });
 
     // 设置初始值为当前时间
@@ -242,6 +245,7 @@
       //默认展示前30个自然日
       if (searchParam.numLeft==null && searchParam.numRight==null
           && searchParam.beginTime==null && searchParam.endTime==null) {
+          data.flag =0;
         const formatDate = (date) =>
             `${date.getFullYear()}-${date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1)
                 : date.getMonth()+1}-${date.getDate() < 10 ? '0'+date.getDate() : date.getDate()}`;
@@ -252,6 +256,18 @@
       searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
       if (null!=searchParam.searchValue && searchParam.searchValue.length>0) {
         queryRegistrationListNew(searchParam, success => {
+              if(data.flag ===0){
+                data.warnText = "近30天 被检查数量："+success.total+"家 总计检查次数："+success.msg+"次";
+              }
+              if(data.flag ===1){
+                data.warnText = "搜索时间为"+searchParam.beginTime+"至"+searchParam.endTime;
+              }
+              if(data.flag ===2){
+                data.warnText = "搜索次数为"+searchParam.numLeft+"至"+searchParam.numRight;
+              }
+              if(data.flag ===3){
+                data.warnText = "搜索时间为"+searchParam.beginTime+"至"+searchParam.endTime+";搜索次数为"+searchParam.numLeft+"至"+searchParam.numRight;
+              }
               data.curPage++;
               data.loading = false;   // 查4出结果停止加载
           if (success.total <= data.dataList.length) {
@@ -419,7 +435,11 @@
       const [start, end] = values;
       searchParam.beginTime =formatDate(start);
       searchParam.endTime = formatDate(end);
-
+      data.flag =1;
+      if ((searchParam.numLeft!=null &&  searchParam.numLeft!=='')
+          || (searchParam.numRight!=null &&  searchParam.numRight!='')) {
+          data.flag =3;
+      }
       data.showCalendarPicker = false;
       data.dateShow = true;
       data.curPage = 1;
@@ -427,19 +447,43 @@
       onRefresh();
     }
 
+    const cancelCalendar = (value) => {
+      debugger
+      data.flag =0;
+      if ((searchParam.numLeft!=null &&  searchParam.numLeft!=='')
+          || (searchParam.numRight!=null &&  searchParam.numRight!='')) {
+        data.flag =2;
+      }
+      data.showCalendarPicker = false;
+      const formatDate = (date) =>
+          `${date.getFullYear()}-${date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1)
+              : date.getMonth()+1}-${date.getDate() < 10 ? '0'+date.getDate() : date.getDate()}`;
+      searchParam.beginTime = formatDate(new Date(new Date().setDate(new Date().getDate() - 30)));
+      searchParam.endTime = formatDate(new Date());
+      onRefresh();
+    }
+
 
     const confirmNum = (value) => {
+      data.flag =2;
+      if (searchParam.beginTime!=null ||searchParam.endTime!=null) {
+          data.flag =3;
+      }
       data.showNumPicker = false;
       data.curPage = 1;
       data.dataList = [];
       onRefresh();
-
     }
 
     const cancelNum = (value) => {
+      data.flag =0;
+      if (searchParam.beginTime!=null ||searchParam.endTime!=null) {
+        data.flag =1;
+      }
       data.showNumPicker = false;
       searchParam.numLeft=null;
       searchParam.numRight=null;
+      onRefresh();
     }
 
     const nowDate = (time) => {