From f0bf8839b1f1f2f80e2318a7cfa8091617dae2b6 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Sun, 2 Jun 2024 21:16:32 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                             |  2 +-
 src/components/footer-nav/index.vue         |  4 +--
 src/views/enforce/enterpriseBaseInfo.vue    |  7 +++--
 src/views/enforce/enterpriseScanPreview.vue | 13 ++++++---
 src/views/enforce/enterpriseWarningInfo.vue | 10 ++++++-
 src/views/enforce/userFilter.vue            |  8 ++++++
 src/views/enforceHome.vue                   | 32 ++++++++++++++++++---
 7 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index bcf15da..8ad34eb 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,4 +1,4 @@
 import { _get, _post,_form,_delete } from "../http/index";
 
 //查询用户列表
-export const queryUsers = (params, success, error) => _post("/app/listApp",params,success,error)
+export const queryUsers = (params, success, error) => _get("/app/listApp",params,success,error)
diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index 3267995..6faab51 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -7,9 +7,9 @@
 			<van-tabbar-item name="Classify" replace icon="shop-o" to="/enterprise/enterpriseInspectionList">
 				行政检查通知
 			</van-tabbar-item>
-			<van-tabbar-item name="My" replace icon="manager-o" to="">{{
+			<!-- <van-tabbar-item name="My" replace icon="manager-o" to="">{{
 				$t("common.lang_my")
-			}}</van-tabbar-item>
+			}}</van-tabbar-item> -->
 		</van-tabbar>
 	</div>
 </template>
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 389059b..8c1459f 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -100,7 +100,8 @@
 										<p><span class="card_box_label">检查日期：</span> {{ item.c601005 }} ，  {{ item.lawEnforcerTwo }}</p>
 									</div>
 									<div class="card_box_span">
-										<p><span class="card_box_label">检查结果：</span> {{ item.c601015 }}</p>
+										<p v-if="item.c601015 == '01'"><span class="card_box_label">检查结果：</span> 合格</p>
+                    <p v-if="item.c601015 == '02'"><span class="card_box_label">检查结果：</span> 不合格</p>
 									</div>
 								</div>
 							</van-swipe-cell>
@@ -192,8 +193,7 @@ const data = reactive({
 	enterpriseInfo: {},
 	checkDataList:[],
 	punishDataList:[],
-	forceDataList:[
-		{lawEnforcementItem:"经济纠纷",lawEnforcement:"深圳市福田区应急管理局",lawDate:"2024-04-12",remark:""}],
+	forceDataList:[],
     showLawEnforcerFlag:false,
     currentPage: 1,
     good:"#7FFFD4",
@@ -288,6 +288,7 @@ onMounted(() =>{
         //查询历史强制案件
         queryQZAJList(success.data.enterpriseNumber,res =>{
           console.log("历史强制案件---",res.data)
+          data.forceDataList = res.data;
         },error =>{
 
         })
diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue
index 6ff2b98..3093659 100644
--- a/src/views/enforce/enterpriseScanPreview.vue
+++ b/src/views/enforce/enterpriseScanPreview.vue
@@ -26,11 +26,11 @@
           </li>
         </ul>
       </div>
-        <div v-if="data.TabId === 0">
+        <div v-if="data.TabId == 0">
           <enterpriseBaseInfo :enterpriseNumber="data.enterpriseNumber"></enterpriseBaseInfo>
         </div>
-        <div v-if="data.TabId === 1">
-          <enterpriseWarningInfo></enterpriseWarningInfo>
+        <div v-if="data.TabId == 1">
+          <enterpriseWarningInfo :enterpriseNumber="data.searchParam.enterpriseNumber"></enterpriseWarningInfo>
         </div>
 
 		</div>
@@ -81,6 +81,7 @@ const boutiqueAttr = reactive({
 }); // 商品卡片展示
 
 const check = (index) =>{
+  console.log("点击切换tab",index);
   data.TabId = index;
 };
 
@@ -138,10 +139,14 @@ const onLoad = () => {
 onMounted(() => {
   getEnterpriseInformation(data.enterpriseNumber,success =>{
       if (null != success.data) {
+        console.log(success.data);
 		  data.searchParam.enterpriseNumber = success.data.enterpriseNumber;
+      console.log(data.searchParam.enterpriseNumber);
 		  //查询企业历史检查案件
 		 queryEarlyWarning(data.searchParam,success =>{
-		 		data.warningInfo = success.data[0];
+		 		if(success.data.length > 0){
+          data.warningInfo = success.data[0];
+        }
 		 	},error =>{
 		 
 		 	})
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index 5a80fb9..ac1b3ec 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -102,10 +102,18 @@
 		columnsType :['year', 'month'],
 	});
 
+  const props = defineProps({
+	enterpriseNumber: {
+		type: String,
+		default: "",
+	},
+});
+
 	// 设置初始值为当前时间
 	onMounted(() => {
 		// getCard();
-		searchParam.enterpriseNumber = useCommon.enterpriseNumber;
+		// searchParam.enterpriseNumber = useCommon.enterpriseNumber;
+    searchParam.enterpriseNumber = props.enterpriseNumber;
 		queryList();
 		data.dateSearch = nowDate(new Date());
 	});
diff --git a/src/views/enforce/userFilter.vue b/src/views/enforce/userFilter.vue
index 933022d..8a21150 100644
--- a/src/views/enforce/userFilter.vue
+++ b/src/views/enforce/userFilter.vue
@@ -46,12 +46,20 @@ export default {
       searchParam: {
         //搜索框
           userName: '',
+          userId:'',
+          dataScopeId:"",
      },
      dataList:[]
     }
   },
   created(){
       // this.queryList()
+      console.log(useCommon.userId);
+      if(useCommon.userId == null || useCommon.userId == ''){
+        this.searchParam.dataScopeId = 1731;
+      }else{
+        this.searchParam.dataScopeId = useCommon.userId;
+      }
   },
   methods: {
     closePopup() {
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 4e67f75..80841b3 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -8,11 +8,17 @@
 		<!-- 中间 -->
 		<div class="warp_body">
       <div class="logobox"></div>
-      <div class="streamer" @click=""><i></i><span class="marquee"><span class="scroll-text">2024年度宝安区新安街道年度行政执法检查计划</span></span></div>
+      <div class="streamer" @click="" >
+        <i></i>
+        <span class="marquee">
+          <span class="scroll-text"  v-for="(item, index) in carouselList" >{{ item.planName }}</span>
+        </span>
+        
+      </div>
       <div class="noticbox" @click="toNoticeView"><i></i><span class="new"></span>通知</div>
 			<!-- <refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"> -->
 				<div class="carousel_box" @onLoad="onLoad">
-					<carousel-card v-if="carouselList.length" v-model:carouselList="carouselList"></carousel-card>
+					<!-- <carousel-card v-if="carouselList.length" v-model:carouselList="carouselList"></carousel-card> -->
 				</div>
 				<div class="boutique_box">
 					<!-- <van-cell :border="false" title="精品" /> -->
@@ -51,10 +57,11 @@
 <script setup name="Home">
  import Vconsolefrom from 'vconsole';
 	import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
+  import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
 const { useCommon } = $globalStore;
 const router = useRouter();
 const route = useRoute();
-let carouselList = reactive([]); // 轮播列表
+var carouselList = reactive([]); // 轮播列表
 let boutique = reactive([]); // 精品数据
 let recommend = reactive([]); // 推荐
 let freshMap = reactive({
@@ -63,6 +70,7 @@ let freshMap = reactive({
 	listFinished: false, // 是否加载完成标识
 });
 const data = reactive({});
+const adviceList = reactive([]);
 const boutiqueAttr = reactive({
 	columnNum: 4,
 	itemClass: "boutique_item",
@@ -110,6 +118,21 @@ const toNoticeView = async() =>{
     path: "/enforce/enforceNotice",
   });
 }
+const queryList = () =>{
+  queryEnforcementInspectionProgramListNoPermission({},success =>{
+    console.log(success)
+    if(success.data.length > 4 ){
+      for (let i = 0; i <= 3; i++) {
+        carouselList.push(success.data[i]); 
+      }  
+    }else{
+      carouselList = success.data; 
+    }
+    console.log(carouselList)
+  },error =>{
+
+  })
+}
 
 //下拉刷新
 const onRefresh = () => {
@@ -143,6 +166,7 @@ onMounted(() => {
         }
       },error =>{
    })
+   queryList();
 });
 </script>
 
@@ -287,7 +311,7 @@ onMounted(() => {
   white-space: nowrap;
 }
 
-.scroll-text {
+::v-deep .scroll-text {
   display: inline-block;
   padding-left: 100%; /* 初始时隐藏在右侧 */
   animation: marquee 5s linear infinite; /* 设置动画 */