From 6de583d8957187de4b56688c78fbcd3d08d1e52f Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Wed, 31 Jul 2024 17:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AD=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E4=BF=AE=E6=94=B9=E6=89=A7=E6=B3=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/enforcementPlanAdd.vue    |  8 ++++----
 src/views/enforce/enterpriseWarningInfo.vue | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 042c20d..f42dcba 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -70,17 +70,17 @@
                             readonly
                             :rules="[{ required: true, message: '请选择执法部门'}]"
                     />
-                    <!-- <van-field
+                    <van-field
                       v-model="submitData.enforcementTime"
-                      label="执法时间"
+                      label="上传时间"
                       placeholder="请选择"
                       clickable
                       is-link
                       readonly
                       required
-                      :rules="[{ required: true, message: '请选择执法时间'}]"
+                      :rules="[{ required: true, message: '请选择上传时间'}]"
                       @click="selectEnforcementTime"
-                    /> -->
+                    />
                     <van-popup v-model:show="data.showPicker" position="bottom">
                         <van-date-picker
                                 title="选择日期"
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index 5e86bae..48fd0c4 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -21,10 +21,10 @@
       </van-popup>
     </div>-->
   <div class="search-button-list">
-    <van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'" @click="searchDateType(null)" round type="primary" size="mini">
-      全部预警
+    <van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(1)" round type="primary" size="mini">
+      本企业预警
     </van-button>
-    <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'" @click="searchDateType(1)" round type="primary"
+    <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(0)" round type="primary"
                 size="mini">本部门预警
     </van-button>
   </div>
@@ -96,7 +96,8 @@
 		//企业统一信用码
 		enterpriseNumber: ref(useCommon.enterpriseNumber),
     //搜索时间
-    searchDate: ref()
+    searchDate: ref(),
+    warnType: 1,
 	});
 
 	const data = reactive({
@@ -247,9 +248,10 @@
 	}
 
 
-	const searchDateType = (val) =>{
+	const searchWarnType = (val) =>{
 		searchParam.dateType =  val;
 		searchParam.isComplaint =  null;
+    searchParam.warnType =  val;
 		queryList();
 	}
 	const searchComplaint = (val) =>{