From dac1cff441a74b7ea056233bbd0d0fbeb2c83020 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Wed, 23 Apr 2025 16:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E6=AE=B5=E4=BC=81=E4=B8=9A=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue                          | 16 ++++++++--------
 src/views/enforce/comprehensiveAnalysis.vue |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 2727b75..29d2442 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,7 +1,7 @@
 <template>
-    <!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> -->
-    <!-- v-if="!isLoading" -->
-    <div class="home app_content" >
+    <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+    <div class="home app_content" v-if="!isLoading">
+    <!-- <div class="home app_content"> -->
         <!-- 导航栏 -->
         <!--		<div class="header_body">-->
         <!--			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@@ -138,8 +138,8 @@
         return randomNum.toString().padStart(6, '0');
     }
 
-    const getEnterpriseMerchant = (phoneNumber) => {
-        getEnterpriseMerchantAuthorization({merchantTel: phoneNumber}, success => {
+    const getEnterpriseMerchant = (enterpriseNum, phoneNumber) => {
+        getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNum, merchantTel: phoneNumber}, success => {
             if (!(success.data == null && success.data.length == 0)) {
                 useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
             }
@@ -190,7 +190,7 @@
             //     }
             //      //设置已经初始化
             //     useCommon.SET_IS_FIRST_LOAD(false)
-            //     getEnterpriseMerchant(success.data.phonenumber.toString());
+            //     getEnterpriseMerchant(success.data.enterpriseNumber.toString(), success.data.phonenumber.toString());
             // }, error => {
             // })
 
@@ -208,7 +208,7 @@
                 // console.log(err)
                 console.log("鉴权", err);
                 // todo 临时工
-                getEnterpriseMerchant(useCommon.phonenumber.toString());
+                getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
             });
 
             w6s.ready(() => {
@@ -233,7 +233,7 @@
                             }
                               //设置已经初始化
                             useCommon.SET_IS_FIRST_LOAD(false)
-                            getEnterpriseMerchant(success.data.phonenumber.toString());
+                            getEnterpriseMerchant(success.data.enterpriseNumber.toString(), success.data.phonenumber.toString());
                                if(useCommon.firstLoad){
                                       isLoading.value = false;
                                 }
diff --git a/src/views/enforce/comprehensiveAnalysis.vue b/src/views/enforce/comprehensiveAnalysis.vue
index f5da8de..bc243a6 100644
--- a/src/views/enforce/comprehensiveAnalysis.vue
+++ b/src/views/enforce/comprehensiveAnalysis.vue
@@ -2,7 +2,8 @@
 <html>
 <body>
 <div class="page_wrapper">
-  <div class="tab_title"> <span :class="{'active':data.ontabClass1}" @click="searchTypeChange('user')"><b>个人</b>维度</span> <span :class="{'active':data.ontabClass2}" @click="searchTypeChange('bureauDept')" ><b>部门</b>维度</span> </div>
+  <!-- <div class="tab_title"> <span :class="{'active':data.ontabClass1}" @click="searchTypeChange('user')"><b>个人</b>维度</span> <span :class="{'active':data.ontabClass2}" @click="searchTypeChange('bureauDept')" ><b>部门</b>维度</span> </div> -->
+  <div class="tab_title"> <span :class="{'active':data.ontabClass1}" @click="searchTypeChange('user')"><b>个人</b></span> <span :class="{'active':data.ontabClass2}" @click="searchTypeChange('bureauDept')" ><b>单位</b></span> </div>
   <div class="tab_cont">
     <div class="time_now">{{ data.dateStr }}</div>
     <div class="time_select"> <span :class="{'active':data.submitData.dateType=='month'}" @click="dateTypeChange('month')">月度</span><span :class="{'active':data.submitData.dateType=='quarter'}" @click="dateTypeChange('quarter')">季度</span><span :class="{'active':data.submitData.dateType=='year'}" @click="dateTypeChange('year')">年度</span>