From af6fa7915ef9176c1a97d1ff582a4832bfce1759 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Fri, 23 Aug 2024 10:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E7=95=99=E5=AD=98=E4=B8=80?=
 =?UTF-8?q?=E5=91=A8/=E9=80=9A=E7=9F=A5=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BD=8D=EF=BC=8C=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=90=8D=E7=A7=B0(=E5=89=8D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enforce.js                    |  9 +++++++++
 src/views/enforce/enforceNotice.vue   | 27 ++++++++++++++-------------
 src/views/enforce/enforcementPlan.vue | 10 +++++++---
 src/views/enforceHome.vue             | 18 ++++++++++--------
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/api/enforce.js b/src/api/enforce.js
index 5b3f320..29cb6f8 100644
--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@@ -19,6 +19,15 @@ export const queryEnforcementInspectionProgramList = (params, success, error)  =
  * @returns 
  */
 export const queryEnforcementInspectionProgramListNoPermission = (params, success, error)  => _get("/app/code/enforcementInspectionProgram/queryListNoPermission", params, success, error);
+/**
+ * 执法计划列表 无权限 不分页接口
+ * @param {*} params 
+ * @param {*} success 
+ * @param {*} error 
+ * @returns 
+ */
+export const queryEnforcementInspectionProgramListNoPermissionNoPaging = (params, success, error)  => _get("/app/code/enforcementInspectionProgram/queryListNoPermissionNoPaging", params, success, error);
+
 /**
  * 添加年度执法计划
  * @param {*} params 
diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue
index a5734ec..5615f6e 100644
--- a/src/views/enforce/enforceNotice.vue
+++ b/src/views/enforce/enforceNotice.vue
@@ -12,7 +12,7 @@
         <van-search
                 v-model="searchParam.searchText"
                 show-action
-                placeholder="请输入关键字查询"
+                placeholder="请输入计划名称/单位"
                 @search="onSearch"
         >
             <template #action>
@@ -35,7 +35,7 @@
                               <a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a>
                             </div>
                             <div class="item-time" style="display: flex; justify-content: space-between;">
-                               <span>{{ item.enforcementDepartment }}</span>
+                               <span>{{ item.bureauDeptName }}</span>
                                <span>{{ item.createTime }}</span>
                            </div>
 
@@ -72,7 +72,8 @@
         //日期查询
         searchDate: ref(''),
         //是否发布 1 是
-        isPublish: 1
+        isPublish: 1,
+        searchType:"notice"
     });
 
     const data = reactive({
@@ -103,8 +104,9 @@
     const queryList = () => {
         searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
         queryEnforcementInspectionProgramListNoPermission(searchParam, success => {
+            //debugger
             data.curPage++;
-            data.loading = false;   // 查4出结果停止加载
+            data.loading = false;   
             if (success.total <= data.dataList.length) {
                 // 查到最后没数据
                 data.finished = ref(true);
@@ -122,16 +124,15 @@
     }
 
     const onSearch = (val) => {
-        queryEnforcementInspectionProgramListNoPermission(
-            {
-                "searchText": searchParam.searchText
-            }
-            , success => {
-                console.log(success)
-                data.dataList = success.data;
-            }, error => {
+        // queryEnforcementInspectionProgramListNoPermission(searchParam
+        //     , success => {
+        //         console.log(success)
+        //         data.dataList = success.data;
+        //     }, error => {
 
-            })
+        //     })
+        data.dataList = [];
+        queryList();
     };
     const onClickButton = () => {
         data.curPage = 1;
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 00364a6..9fc7df5 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -123,6 +123,7 @@
         // 用户id
         dataScopeId: "",
         // dataScopeId: "1731",
+        searchType:"plan"
     });
 
     const data = reactive({
@@ -171,16 +172,19 @@
     }
 
     const onSearch = (val) => {
-        queryEnforcementInspectionProgramList(
+/*         queryEnforcementInspectionProgramList(
             {
-                "searchText": searchParam.searchText
+                "searchText": searchParam.searchText,
+                "searchType": "plan"
             }
             , success => {
                 console.log(success)
                 data.dataList = success.data;
             }, error => {
 
-            })
+            }) */
+            data.dataList = [];
+            queryList();
     };
     const onClickButton = () => {
         data.curPage = 1;
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 0499bd9..6e9a503 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -158,8 +158,8 @@
         }
     }
     const queryList = () => {
-        queryEnforcementInspectionProgramListNoPermission({}, success => {
-            if (success.rows.length > 4) {
+        queryEnforcementInspectionProgramListNoPermissionNoPaging({dateType:4}, success => {
+/*             if (success.rows.length > 4) {
                 for (let i = 0; i < 5; i++) {
                     carouselList.push(success.rows[i]);
                     noticeObj.noticeList.push(success.rows[i].planName)
@@ -173,17 +173,17 @@
                     // noticeStr += success.data[i].planName != null ?success.data[i].planName + "":"";
                 }
                 noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
-            } else {
-                carouselList = success.rows;
+            } else { */
+                carouselList = success.data;
 
-                for (let i = 0; i < success.rows.length; i++) {
+                for (let i = 0; i < success.data.length; i++) {
                     // carouselList.push(success.data[i]);
-                    noticeObj.noticeList.push(success.rows[i].planName);
+                    noticeObj.noticeList.push(success.data[i].planName);
                     var obj = {
-                        content: success.rows[i].planName
+                        content: success.data[i].planName
                     }
                     data.noticeList.push(obj)
-                }
+                //}
                 // noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
             }
             freshMap.key = 1
@@ -191,6 +191,8 @@
             console.log(data.noticeList);
             // timerObj.timer = setInterval(flushMessage, 4000);
             setNotificationMove();
+
+            
         }, error => {
 
         })