From 718d62d9e1159c6ada6e4dc40179b4e0329fd79c Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Fri, 24 May 2024 18:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=99=BB=E5=BD=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enterprise.js                         |  6 +--
 .../footer-enforcement-nav/index.vue          |  7 ---
 src/views/common/analyse.vue                  |  8 +--
 src/views/enforce/enforcementPlan.vue         |  1 +
 src/views/enforce/enterpriseBaseInfo.vue      | 54 ++++++++++---------
 src/views/enforceHome.vue                     | 10 ++--
 .../enterprise/enterpriseInspectionDetail.vue |  4 +-
 src/views/enterprise/registrationList.vue     | 11 ++++
 8 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/src/api/enterprise.js b/src/api/enterprise.js
index 78b2160..2eebae6 100644
--- a/src/api/enterprise.js
+++ b/src/api/enterprise.js
@@ -53,7 +53,7 @@ export const queryHistoryQrCodeList = (params, success, error) =>_get("/app/ente
  * @param {*} error 
  * @returns 
  */
-export const queryXzjcjbxxList = (enterpriseNumber, success, error) =>_get("/code/xzjcjbxx/" +enterpriseNumber, success, error)
+export const queryXzjcjbxxList = (enterpriseNumber, success, error) =>_get("/app/xzjcjbxx/queryList/" +enterpriseNumber, null,success, error)
 
 /**
  *  查询强制案件
@@ -62,7 +62,7 @@ export const queryXzjcjbxxList = (enterpriseNumber, success, error) =>_get("/cod
  * @param {*} error 
  * @returns 
  */
-export const queryQZAJList = (enterpriseNumber, success, error) =>_get("/code/queryQZAJList/" +enterpriseNumber, success, error)
+export const queryQZAJList = (enterpriseNumber, success, error) =>_get("/app/xzjcjbxx/queryQZAJList/" +enterpriseNumber, null,success, error)
 /**
  *  查询历史处罚案件
  * @param {*} enterpriseNumber 
@@ -70,4 +70,4 @@ export const queryQZAJList = (enterpriseNumber, success, error) =>_get("/code/qu
  * @param {*} error 
  * @returns 
  */
-export const queryCFAJList = (enterpriseNumber, success, error) =>_get("/code/queryCFAJList/" + enterpriseNumber, success, error)
+export const queryCFAJList = (enterpriseNumber, success, error) =>_get("/app/xzjcjbxx/queryCFAJList/" + enterpriseNumber,null,success, error)
diff --git a/src/components/footer-enforcement-nav/index.vue b/src/components/footer-enforcement-nav/index.vue
index cb1a7ad..aa6e847 100644
--- a/src/components/footer-enforcement-nav/index.vue
+++ b/src/components/footer-enforcement-nav/index.vue
@@ -34,13 +34,6 @@ let data = reactive({
 	footerActive: "Home",
 	dot: false,
 });
-const active = ref(0);
-    const icon = {
-      warn: '/assets/images/warn.png',
-      plan:"",
-      make:"",
-
-    };
 
 </script>
 <style lang="less" scoped>
diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue
index 0d2d8eb..3167e68 100644
--- a/src/views/common/analyse.vue
+++ b/src/views/common/analyse.vue
@@ -46,8 +46,7 @@ import { onBeforeUnmount } from 'vue';
 import util from "@/util/area";
 import {queryStatisticalData} from '@/api/enforce';
 import * as echarts from 'echarts';
-const { useMy } = $globalStore
-
+const { useCommon, useShopCard } = $globalStore;
 const router = useRouter();
 const route = useRoute();
 let queryaddressId = ref("");
@@ -345,7 +344,9 @@ const initData = (dataX,dataY,dataPercent,targetId) => {
 
 onMounted(() => {
   
-  queryStatisticalData(null,success =>{
+  queryStatisticalData({
+    "dataScopeId": useCommon.userId
+  },success =>{
     var arrData = [];
     var arrCompanyData = [];
     var countTotal= 0;
@@ -387,6 +388,7 @@ onMounted(() => {
       userDataY.push(res.total);
       userDataPercent.push((res.total / userTotal * 100).toFixed(2));
     })
+    console.log(userDataPercent)
     success.data.enterpriseType.forEach(res =>{
       console.log(res)
       arrCompanyData.push({
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 7890657..97a716b 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -124,6 +124,7 @@ const data = reactive({
  // 设置初始值为当前时间
 onMounted(() => {
   console.log(useCommon.enterpriseNumber);
+  console.log(useCommon.userId);
 	// getCard();
   searchParam.enterpriseNumber = useCommon.enterpriseNumber;
   searchParam.dataScopeId = useCommon.userId;
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 2d492e9..d58f33a 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -91,16 +91,16 @@
 							
 <!--									<div  style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline&#45;&#45;bottom"></div>-->
 									<div class="card_box_span">
-										<p class="zf-name">{{ item.lawEnforcementItem }}</p>
-									</div> -->
-									<div class="card_box_span">
-										<p><span class="card_box_label">案件名称：</span> {{ item.lawEnforcement }}</p>
+										<p class="zf-name">{{ item.c601002 }}</p>
 									</div>
+									<!-- <div class="card_box_span">
+										<p><span class="card_box_label">案件名称：</span> {{ item.c601002 }}</p>
+									</div> -->
 									<div class="card_box_span">
-										<p><span class="card_box_label">检查日期：</span> {{ item.lawEnforcer }} ，  {{ item.lawEnforcerTwo }}</p>
+										<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.remark }}</p>
+										<p><span class="card_box_label">检查结果：</span> {{ item.c601015 }}</p>
 									</div>
 								</div>
 							</van-swipe-cell>
@@ -113,16 +113,17 @@
 							    <div class="card_box">
 <!--									<div  style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline&#45;&#45;bottom"></div>-->
 									<div class="card_box_span">
-										<p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
+										<p style="font-size: 16px;font-weight: bold;">{{ item.c201002 }}</p>
 									</div>
 									<div class="card_box_span">
-										<p><span class="card_box_label">处罚方式：</span> {{ item.lawEnforcement }}</p>
+										<p v-if="item.c206010 == '01'"><span class="card_box_label">处罚类别：</span>予以处罚</p>
+                    <p v-if="item.c206010 == '02'"><span class="card_box_label">处罚类别：</span>不予处罚</p>
 									</div>
-									<div class="card_box_span">
+									<!-- <div class="card_box_span">
 										<p><span class="card_box_label">处罚种类：</span> {{ item.lawKind }}</p>
-									</div>
+									</div> -->
 									<div class="card_box_span">
-										<p><span class="card_box_label">决定时间：</span> {{ item.remark }}</p>
+										<p><span class="card_box_label">处罚日期：</span> {{ item.c206013 }}</p>
 									</div>
 								</div>
 							</van-swipe-cell>
@@ -136,16 +137,17 @@
 							
 <!--									<div class="van-hairline&#45;&#45;bottom"></div>-->
 									<div class="card_box_span">
-										<p>{{ item.lawEnforcementItem }}</p>
+										<p v-if="item.c301002 != '无'">{{ item.c301002 }}</p>
+                    <p v-if="item.c301002 == '无'">************</p>
 									</div>
 									<div class="card_box_span">
-										<p><span class="card_box_label">强制种类：</span> {{ item.lawEnforcement }}</p>
+										<p><span class="card_box_label">强制种类：</span> {{ item.c302002 }}</p>
 									</div>
 									<div class="card_box_span">
 										<p><span class="card_box_label">强制措施：</span> {{ item.lawDate }}</p>
 									</div>
 									<div class="card_box_span">
-										<p><span class="card_box_label">批准时间：</span> {{ item.remark }}</p>
+										<p><span class="card_box_label">批准时间：</span> {{ item.c302007 }}</p>
 									</div>
 								</div>
 							</van-swipe-cell>
@@ -189,8 +191,7 @@ const data = reactive({
 	searchParam:{},
 	enterpriseInfo: {},
 	checkDataList:[],
-	punishDataList:[
-		{lawEnforcementItem:"安全生产违法",lawEnforcement:"深圳市福田区应急管理局",lawKind:"罚款",remark:"当日执行"}],
+	punishDataList:[],
 	forceDataList:[
 		{lawEnforcementItem:"经济纠纷",lawEnforcement:"深圳市福田区应急管理局",lawDate:"2024-04-12",remark:""}],
     showLawEnforcerFlag:false,
@@ -236,8 +237,8 @@ const queryList = () =>{
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
 	//查询企业信息
-    // getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
-    getEnterpriseInformation(props?.enterpriseNumber,success =>{
+    getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
+    // getEnterpriseInformation(props?.enterpriseNumber,success =>{
       if (null != success.data) {
           data.enterpriseInfo.enterpriseName = success.data.enterpriseName
           data.enterpriseInfo.enterpriseNumber = success.data.enterpriseNumber
@@ -269,22 +270,23 @@ onMounted(() =>{
 
 		  // })
         //查询企业历史检查案件
-        queryXzjcjbxxList(data.enterpriseInfo.enterpriseNumber,success =>{
-          console.log("历史检查案件---",success.data)
-          data.checkDataList = success.data;
+        queryXzjcjbxxList(success.data.enterpriseNumber,res =>{
+          console.log("历史检查案件---",res.data)
+          data.checkDataList = res.data;
         },error =>{
 
         });
         //查询历史强制案件
-        queryQZAJList(data.enterpriseInfo.enterpriseNumber,success =>{
-          console.log("历史强制案件---",success.data)
+        queryQZAJList(success.data.enterpriseNumber,res =>{
+          console.log("历史强制案件---",res.data)
         },error =>{
 
         })
 
-        //查询历史强制案件
-        queryCFAJList(data.enterpriseInfo.enterpriseNumber,success =>{
-          console.log("历史处罚案件---",success.data)
+        //历史处罚案件
+        queryCFAJList(success.data.enterpriseNumber,res =>{
+          console.log("历史处罚案件---",res.data)
+          data.punishDataList = res.data;
         },error =>{
 
         })
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 2c52326..4e67f75 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="home app_content">
 		<!-- 导航栏 -->
-		<div class="header_body">
-			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
-		</div>
+		<!-- <div class="header_body">
+        			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
+        		</div> -->
 
 		<!-- 中间 -->
 		<div class="warp_body">
@@ -49,6 +49,7 @@
 </template>
 
 <script setup name="Home">
+ import Vconsolefrom from 'vconsole';
 	import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
 const { useCommon } = $globalStore;
 const router = useRouter();
@@ -126,12 +127,13 @@ const onLoad = () => {
 };
 
 onMounted(() => {
-
+  new Vconsolefrom();
 	let fullUrl = window.location.href;
 	let code = fullUrl.substring(fullUrl.indexOf('code=')+5, fullUrl.indexOf('&state='));
 	// getSzyptLoginAuth(route?.query?.code,success =>{
 	getSzyptLoginAuth(code,success =>{
 		console.log(success.data)
+    useCommon.SET_USER_ID(success.data.userId);
 	},error =>{
 
 	})
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 7ab69fc..57ab62d 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -8,11 +8,11 @@
 		<div>
 <!--            <van-cell-group>-->
         <van-form @failed="onFailed" @submit="submit">
-           <van-field
+           <!-- <van-field
             v-model="submitData.lawEnforcementCode"
              label="登记编号"
              readonly
-           />
+           /> -->
             <van-field
               v-model="submitData.enterpriseName"
               label="企业名称"
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 767083e..608eb12 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -225,6 +225,17 @@ onDeactivated(() => {
 
 });
 
+ countWorkdays = (startDate) => {
+  let workdays = 0;
+  endDate = new Date();
+  for (let date = new Date(startDate); date <= endDate; date.setDate(date.getDate() + 1)) {
+    if (date.getDay() % 6 !== 0) { // 假设周末是6 (星期六) 和 0 (星期日)
+      workdays++;
+    }
+  }
+  return workdays;
+}
+
 // 返回
 const goBack = () => {
 	router.go(-1);