diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index 039fea7..eda5452 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -4,10 +4,10 @@
         <!-- <div class="header_body">
             <header-nav :leftArrow="false" titelText="预警信息"/>
         </div>-->
-        <van-search 
-            v-model="searchParam.searchValue" 
-            show-action 
-            placeholder="企业名称" 
+        <van-search
+            v-model="searchParam.searchValue"
+            show-action
+            placeholder="企业名称"
             clearable="true"
             clear-icon="clear"
             clear-trigger="always"
@@ -70,7 +70,7 @@
               :max-date="data.maxDate"
               :style="{ height: '80vh' }">
           </van-calendar>
-          <van-button @click="cancelCalendar" size="mini" style="margin-left: 46%;background: white">清空</van-button>
+          <van-button @click="cancelCalendar" size="mini" style="margin-left: 43%;background: #3972f1;color:white">清空时间</van-button>
 
         </van-popup>
       </div>
@@ -230,7 +230,8 @@
         curPage: 1,
         total: 0,
         is_show: false,
-        flag:0,//文本提示显示判断
+        isSelectTime: false,
+        isSelectNum: false,
         warnText:""
     });
 
@@ -246,7 +247,6 @@
       //默认展示前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()}`;
@@ -256,17 +256,20 @@
       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.isSelectTime && data.isSelectNum) {
+                  data.warnText = "搜索时间为"+searchParam.beginTime+"至"+searchParam.endTime+
+                      ";搜索次数为"+searchParam.numLeft+"至"+searchParam.numRight;
+              } else if (data.isSelectTime) {
+                  data.warnText = "搜索时间为"+searchParam.beginTime+"至"+searchParam.endTime+";搜索次数为全部";
+              }else if (data.isSelectNum) {
+                  data.warnText = "近30天 搜索次数为"+searchParam.numLeft+"至"+searchParam.numRight;
+              }else {
+                 data.warnText = "企业过多,请输入关键字进行查询";
+                 // 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;
+              if (!data.isSelectTime && (searchParam.searchValue==null || searchParam.searchValue==="")) {
+                 success.total= 0;
+                 success.rows= new Array();
               }
               data.curPage++;
               data.loading = false;   // 查4出结果停止加载
@@ -435,25 +438,17 @@
       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.isSelectTime = true;
       data.curPage = 1;
       data.dataList = [];
       onRefresh();
     }
 
     const cancelCalendar = (value) => {
-      data.flag =0;
-      if ((searchParam.numLeft!=null &&  searchParam.numLeft!=='')
-          || (searchParam.numRight!=null &&  searchParam.numRight!='')) {
-        data.flag =2;
-      }
       data.showCalendarPicker = false;
+      data.isSelectTime = 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()}`;
@@ -464,22 +459,16 @@
 
 
     const confirmNum = (value) => {
-      data.flag =2;
-      if (searchParam.beginTime!=null ||searchParam.endTime!=null) {
-          data.flag =3;
-      }
       data.showNumPicker = false;
+      data.isSelectNum = true;
       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;
+      data.isSelectNum = false;
       searchParam.numLeft=null;
       searchParam.numRight=null;
       onRefresh();