diff --git a/src/api/compliance/conmm.js b/src/api/compliance/conmm.js
index d2d9b138..2c9e16a2 100644
--- a/src/api/compliance/conmm.js
+++ b/src/api/compliance/conmm.js
@@ -17,6 +17,16 @@ export function getZjzbSwjgVoList(data) {
     }
   })
 }
+export function getZjzbSwjgVoList2(data) {
+  return request({
+    url: 'crmZjzbdmVo/getZjzbSwjgVoList2',
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 // 征收项目
 export function getZjzbZsxmVoList(data) {
   return request({
@@ -31,7 +41,7 @@ export function getZjzbZsxmVoList(data) {
 // 应征凭证种类
 export function getZjzbDzbzdszlVoList(data) {
   return request({
-    url: 'crmZjzbdmVo/getZjzbDzbzdszlVoList',
+    url: 'crmZjzbdmVo/getZjzbDzbzdszlVoList2',
     method: 'get',
     data: data,
     headers: {
diff --git a/src/store/modules/compliance.js b/src/store/modules/compliance.js
index 9ac25ebe..d06b7188 100644
--- a/src/store/modules/compliance.js
+++ b/src/store/modules/compliance.js
@@ -1,6 +1,6 @@
 
 import { debounce } from 'throttle-debounce'
-import { getZjzbSwjgVoList,getZjzbZsxmVoList,getZjzbDzbzdszlVoList,crmZjzbdmVoList,getZjzbdlVoList } from '@/api/compliance/conmm' 
+import { getZjzbSwjgVoList2,getZjzbZsxmVoList,getZjzbDzbzdszlVoList,crmZjzbdmVoList,getZjzbdlVoList } from '@/api/compliance/conmm' 
 const hrm = {
   state: {
     zjzbSwjg: [] || JSON.parse(localStorage.getItem('SET_SWFG')),
@@ -35,7 +35,7 @@ const hrm = {
       commit
     }) {
       return new Promise((resolve, reject) => {
-        getZjzbSwjgVoList().then(res => {
+        getZjzbSwjgVoList2().then(res => {
           const resData = res.data || {}
           localStorage.setItem('SET_SWFG', JSON.stringify(resData))
           commit('SET_SWFG', resData)
diff --git a/src/views/compliance/keypoint/index.vue b/src/views/compliance/keypoint/index.vue
index 17f66fc0..b0ca9dc4 100644
--- a/src/views/compliance/keypoint/index.vue
+++ b/src/views/compliance/keypoint/index.vue
@@ -5,7 +5,7 @@
           <el-form ref="searchForm" :model="searchForm" label-width="150px" size="small">
             <el-row :gutter="20">
                 <el-col :span="8">
-                  <el-form-item label="主管税务机关" >
+                  <el-form-item label="市级机关" >
                       <el-select v-model="searchForm.zgswjg" filterable  style="width: 100%;">
                         <el-option v-for="item in zgswjgList" :key="item.zjzbSwjgVo.swjgDm"  :label="item.zjzbSwjgVo.swjgmc" :value="item.zjzbSwjgVo.swjgDm"></el-option>
                       </el-select>
@@ -65,7 +65,7 @@
             <div class="page">
                 <el-pagination
                 background 
-                layout="prev, pager, next" 
+                layout="total,prev, pager, next" 
                 :page-size="page.limit" 
                 @current-change="getData"  
                 :total="page.totalRow"
diff --git a/src/views/compliance/keypoint/rankingDetails.vue b/src/views/compliance/keypoint/rankingDetails.vue
index 82a54ebd..60660e6f 100644
--- a/src/views/compliance/keypoint/rankingDetails.vue
+++ b/src/views/compliance/keypoint/rankingDetails.vue
@@ -124,16 +124,13 @@ export default {
         getData(e) {
             this.loading=true
             let params = {
-                ...this.page,
-              ...this.$route.query,
+              ...this.page,
+              zjrqq: this.searchForm.zjrqq,
+              zjrqz: this.searchForm.zjrqz,
+              qxSwjgdm: this.searchForm.zgswjg,
+              dwmc:this.searchForm.dwmc,
               wgy:this.searchForm.wgy
             }
-            if(params.zjrqq){
-                params.zjrqqDate = params.zjrqq
-            }
-            if(params.zjrqz){
-                params.zjrqzDate = params.zjrqz
-            }
             rankByEnterpriseRiskDetail(params).then(res => {
                 this.tableData = res.data.list
                 this.page.totalRow=res.data.totalRow
diff --git a/src/views/compliance/statistics/alertstatistics.vue b/src/views/compliance/statistics/alertstatistics.vue
index c5374e2f..9ef50fa9 100644
--- a/src/views/compliance/statistics/alertstatistics.vue
+++ b/src/views/compliance/statistics/alertstatistics.vue
@@ -4,16 +4,9 @@
          <div class="searchBox">
             <el-form ref="searchForm" :model="searchForm" :rules="rules" label-width="120px" size="small">
                 <el-row :gutter="20">
-                    <el-col :span="8">
-                         <el-form-item label="主管税务机关" >
-                            <el-select v-model="searchForm.zgswjg" disabled  style="width: 100%;" @change="changeBureau">
-                               <el-option v-for="item in zgswjgList" :key="item.zjzbSwjgVo.swjgDm"  :label="item.zjzbSwjgVo.swjgmc" :value="item.zjzbSwjgVo.swjgDm"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                    <el-col :span="8">
-                           <el-form-item label="主管税务所（科分局）">
-                            <el-input v-model="searchForm.swjg" disabled></el-input>
+                           <el-form-item label="主管税务机关">
+                            <el-input v-model="searchForm.swjgmc" disabled></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -24,8 +17,6 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row :gutter="20" v-if="isExpanded">  
                     <el-col :span="8">
                         <el-form-item label="应征凭证种类">
                             <el-select v-model="searchForm.yzpzlx" filterable style="width: 100%;">
@@ -34,9 +25,12 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                </el-row>
+                <el-row :gutter="20" v-if="isExpanded">  
+
                     <el-col :span="8">
                         <el-form-item label="自检指标">
-                            <el-select v-model="searchForm.zjzbmc" filterable style="width: 100%;">
+                            <el-select v-model="searchForm.zjzb" filterable style="width: 100%;">
                                 <el-option label="全部" value=""></el-option>
                                 <el-option v-for="item in jczbList" :key="item.zbDm"  :label="item.zbmc" :value="item.zbDm"></el-option>
                             </el-select>
@@ -47,8 +41,6 @@
                              <el-input v-model="searchForm.ssgly"></el-input>
                         </el-form-item>
                     </el-col>
-                </el-row>  
-                <el-row :gutter="20" v-if="isExpanded"> 
                     <el-col :span="8">
                         <el-form-item label="申报日期">
                             <el-date-picker
@@ -63,6 +55,9 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
+                </el-row>  
+                <el-row :gutter="20" v-if="isExpanded"> 
+
                     <el-col :span="8">
                         <el-form-item label="自检日期">
                             <el-date-picker
@@ -120,7 +115,7 @@
             <div class="page">
                 <el-pagination
                 background 
-                layout="prev, pager, next" 
+                                layout="total,prev, pager, next" 
                 :page-size="page.limit" 
                 @current-change="getData"  
                 :total="page.totalRow"
@@ -151,7 +146,7 @@
              <div  style="justify-content: flex-end; margin-top: 10px; display: flex;">
                 <el-pagination
                 background 
-                layout="prev, pager, next" 
+                                layout="total,prev, pager, next" 
                 :page-size="page.limit" 
                 @current-change="getData"  
                 :total="page.totalRow"
@@ -181,7 +176,7 @@ export default {
         dialogTableVisible:false,
         settings:false,
         searchForm:{
-            zgswjg:'',
+            swjg:'',
             zgsws:'',
             yzpzzl:'',
             zjzb:'',
@@ -237,24 +232,9 @@ export default {
             limit: 20,
             totalRow:0
         },
-        selfData:[
-            {
-               tyxydm:'913609027165371025',
-               nsrmc:'宜春市新坊钽铌', 
-               djzclx:'私营有限责..',
-               kzztdjlx:'单位纳税人税务登记',
-               hy:'住宅房屋建筑',
-               zsxmmc:'企业所得税',
-               yzpzzlmc:'《A200000中华人民共和企业所得税季国缴纳税申报表(A类，2021年版)》',
-               zjzbmc:'企业所得税报营业收入与财务报表比对不符',
-               skssqq:'2025-07-01',
-               sksqqz:'2025-09-30',
-               ccsbrw:'2025-10-11',
-               zxsbrq:'2025-10-11'
-            }
-          ],
-          subbureau: [],
-          jczbList: [],
+        selfData:[],
+        subbureau: [],
+        jczbList: [],
         zsxmList:[]
       }
     },
@@ -266,7 +246,6 @@ export default {
                 const elink = document.createElement('a');
                 elink.download = '文件名称.xlsx';
                 elink.style.display = 'none';
-                            console.log('11111111111111',res)
                 const blob = new Blob([res.data], { type: 'application/x-msdownload' });
                 elink.href = URL.createObjectURL(blob);
                 document.body.appendChild(elink);
@@ -276,38 +255,15 @@ export default {
             })
         },
         reset() {
-            this.searchForm = {
-                sbsjDate:'',
-                zjrqDate:''
-            }
-            let sjSwjgDm = this.$route.query.sjSwjgDm ? this.$route.query.sjSwjgDm : this.$route.query.swjgDm
-            this.searchForm.zgswjg = sjSwjgDm
-            this.searchForm.swjg=this.$route.query.sjSwjgDm ? this.$route.query.swjg : ''
+            let params = JSON.parse(JSON.stringify(this.$route.query))
+            this.searchForm= params
             this.getData()
         },
         changeSearch() {
             this.getData()
         },
-        changeBureau(e) {
-            this.zgswjgList.forEach(item => {
-                if (item.zjzbSwjgVo.swjgDm == e) {
-                    this.subbureau = item.zjzbSwjgVos
-                }
-            })
-        },
         initData() {
-            this.loading=true
-            this.$store.dispatch('GetSwgUserInfo').then(res => {
-                this.zgswjgList = res.data
-                let sjSwjgDm = this.$route.query.sjSwjgDm ? this.$route.query.sjSwjgDm : this.$route.query.swjgDm
-                this.searchForm.zgswjg = sjSwjgDm
-                this.searchForm.swjg=this.$route.query.sjSwjgDm ? this.$route.query.swjg : ''
-                res.data.map(item => {
-                    if (item.zjzbSwjgVo.swjgDm == sjSwjgDm) {
-                        this.subbureau = item.zjzbSwjgVos
-                    }
-                })
-
+            this.loading = true
                 this.$store.dispatch('GetZsxmList').then(res => {
                     this.zsxmList=res.data
                 })
@@ -317,18 +273,25 @@ export default {
                 this.$store.dispatch('GetJczbList').then(res => {
                     this.jczbList=res.data
                 })
+                let params = JSON.parse(JSON.stringify(this.$route.query))
+                this.searchForm= params
                 this.getData()
-            })
         },
         getData(e) {
             this.loading=true
             let params = {
-                sbrqq: this.searchForm.sbsjDate.length>1 ? this.searchForm.sbsjDate[0] : '',
-                sbrqz: this.searchForm.sbsjDate.length > 1 ? this.searchForm.sbsjDate[1] : '',
-                zjrqq: this.searchForm.zjrqDate.length>1 ? this.searchForm.zjrqDate[0] : '',
-                zjrqz: this.searchForm.zjrqDate.length>1 ? this.searchForm.zjrqDate[1] : '',
+                sbrqq: this.searchForm.sbsjDate? this.searchForm.sbsjDate[0] : '',
+                sbrqz: this.searchForm.sbsjDate? this.searchForm.sbsjDate[1] : '',
+                zjrqq: this.searchForm.zjrqDate? this.searchForm.zjrqDate[0] : '',
+                zjrqz: this.searchForm.zjrqDate? this.searchForm.zjrqDate[1] : '',
+                qxSwjgdm: this.searchForm.swjgmdm,
+                detailType: this.searchForm.detailType,
+                zsxm: this.searchForm.zsxm,
+                zjzb:this.searchForm.zjzb,
+                yzpzlx: this.searchForm.yzpzzl,
+                ssgly:this.searchForm.ssgly,
                 ...this.page,
-                ...this.searchForm
+                // ...this.searchForm
             }
             accountQueryDetail(params).then(res => {
                 this.tableData = res.data.list
@@ -342,11 +305,12 @@ export default {
     },
     created() {
         this.initData()
+
     },
     computed: {
         ...mapGetters(['zjzbSwjg']),
         tableHeight() {
-            return this.isExpanded ? window.innerHeight - 500   : window.innerHeight - 350  
+            return this.isExpanded ? window.innerHeight - 400   : window.innerHeight - 300  
         },
         filteredColumns() {
             return this.columns.filter(column => 
diff --git a/src/views/compliance/statistics/index.vue b/src/views/compliance/statistics/index.vue
index 0bb0838c..38c984e7 100644
--- a/src/views/compliance/statistics/index.vue
+++ b/src/views/compliance/statistics/index.vue
@@ -5,15 +5,15 @@
             <el-form ref="searchForm" :model="searchForm" label-width="120px" size="small">
                 <el-row :gutter="20">
                     <el-col :span="8">
-                         <el-form-item label="主管税务机关" >
-                            <el-select v-model="searchForm.zgswjg" filterable  style="width: 100%;" @change="changeBureau">
+                         <el-form-item label="市级机关" >
+                            <el-select v-model="searchForm.sjSwjgdm" filterable  style="width: 100%;" @change="changeBureau">
                                <el-option v-for="item in zgswjgList" :key="item.zjzbSwjgVo.swjgDm"  :label="item.zjzbSwjgVo.swjgmc" :value="item.zjzbSwjgVo.swjgDm"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
                    <el-col :span="8">
-                           <el-form-item label="主管税务所（科分局）">
-                            <el-select v-model="searchForm.zgsws" style="width: 100%;">
+                           <el-form-item label="区县级机关">
+                            <el-select v-model="searchForm.qxSwjgdm" filterable style="width: 100%;">
                                 <el-option v-for="item in subbureau" :key="item.swjgDm"  :label="item.swjgmc" :value="item.swjgDm"></el-option>
                             </el-select>
                         </el-form-item>
@@ -38,7 +38,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="自检指标">
-                            <el-select v-model="searchForm.zjzbmc" filterable style="width: 100%;">
+                            <el-select v-model="searchForm.zjzb" filterable style="width: 100%;">
                                 <el-option label="全部" value=""></el-option>
                                 <el-option v-for="item in jczbList" :key="item.zbDm"  :label="item.zbmc" :value="item.zbDm"></el-option>
                             </el-select>
@@ -105,35 +105,35 @@
                 :height="tableHeight"
             >
                 <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-                <el-table-column prop="swjg" label="主管税务机关" width="300"></el-table-column>
+                <el-table-column prop="swjgmc" label="主管税务机关" width="300"></el-table-column>
                 <el-table-column  prop="sbzjhc"  label="申报自检户次"  align="center">
                     <template slot-scope="scope">
-                        <el-link  type="primary"  target="_blank"  @click="handleClick(scope.row)" :underline="false">{{ scope.row.sbzjhc }}</el-link>
+                        <el-link  type="primary"  target="_blank"  @click="handleClick(scope.row,'sbzjhc')" :underline="false">{{ scope.row.sbzjhc }}</el-link>
                     </template>
                 </el-table-column>
                 <el-table-column  prop="wxclhc"  label="无需处理户次" align="center">
                     <template slot-scope="scope">
-                         <span class="blue-text" @click="handleClick(scope.row)">{{ scope.row.wxclhc }}</span>
+                         <span class="blue-text" @click="handleClick(scope.row,'wxclhc')">{{ scope.row.wxclhc }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column  prop="jctghc"  label="检查通过户次" align="center">
                     <template slot-scope="scope">
-                         <span class="blue-text" @click="handleClick(scope.row)">{{ scope.row.jctghc }}</span>
+                         <span class="blue-text" @click="handleClick(scope.row,'jctghc')">{{ scope.row.jctghc }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column  prop="wgzhc"  label="未更正户次" align="center">
                     <template slot-scope="scope">
-                         <span class="blue-text" @click="handleClick(scope.row)">{{ scope.row.wgzhc }}</span>
+                         <span class="blue-text" @click="handleClick(scope.row,'wgzhc')">{{ scope.row.wgzhc }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column  prop="ybse1"  label="已更正(问题未解决)户次" align="center">
                     <template slot-scope="scope">
-                         <span class="blue-text" @click="handleClick(scope.row)">{{ scope.row.ybse1 }}</span>
+                         <span class="blue-text" @click="handleClick(scope.row,'ybtse1')">{{ scope.row.ybse1 }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column  prop="ybse2"  label="已更正(问题已解决)户次" align="center">
                     <template slot-scope="scope">
-                         <span class="blue-text" @click="handleClick(scope.row)">{{ scope.row.ybse2 }}</span>
+                         <span class="blue-text" @click="handleClick(scope.row,'ybtse2')">{{ scope.row.ybse2 }}</span>
                     </template>
                 </el-table-column>
                 <!-- <el-table-column  prop="children"  label="补正税款金额" align="center">
@@ -146,16 +146,16 @@
                     </template>
                 </el-table-column> -->
             </el-table>
-            <div class="page">
+            <!-- <div class="page">
                 <el-pagination
                 background 
-                layout="prev, pager, next" 
+                                layout="total,prev, pager, next" 
                 :page-size="page.limit" 
                 @current-change="getData"  
                 :total="page.totalRow"
                 :current-page.sync="page.page"
                 style="font-weight: normal;"></el-pagination>
-            </div>
+            </div> -->
         </div> 
         <el-dialog title="导入" @close="close"  :visible.sync="dialogVisible">
             <el-upload
@@ -178,7 +178,7 @@
 </template>
 <script>
 import { accountQuery,uploadExcelForSbzjjg } from '@/api/compliance/statistics' 
-import { getZjzbSwjgVoList } from '@/api/compliance/conmm' 
+import { getZjzbSwjgVoList,getZjzbSwjgVoList2 } from '@/api/compliance/conmm' 
 export default {
     data() {
         return {
@@ -194,8 +194,12 @@ export default {
         loading:false,
         isExpandAll:false,
         searchForm: {
-            sbsjDate:'',
-            zjrqDate:''
+            sbsjDate:[],
+            zjrqDate: [],
+            qxSwjgdm: '',
+            zjzb: '',
+            zsxm: '',
+            ssgly:''
         },
         subbureau:[],
         zgswjgList: [],
@@ -235,8 +239,8 @@ export default {
         },
         reset() {
             this.searchForm = {
-                sbsjDate:'',
-                zjrqDate:''
+                sbsjDate:[],
+                zjrqDate:[]
             }
             this.searchForm.zgswjg = this.zgswjgList[0].zjzbSwjgVo.swjgDm
             this.subbureau = this.zgswjgList[0].zjzbSwjgVos
@@ -251,13 +255,17 @@ export default {
                     this.subbureau = item.zjzbSwjgVos
                 }
             })
+            this.searchForm.qxSwjgdm=''
         },
         initData() {
             this.loading = true
+            getZjzbSwjgVoList2().then(res => {
+                console.log('测试1111',res)
+            })
             this.$store.dispatch('GetSwgUserInfo').then(res => {
                 this.zgswjgList = res.data
-                this.searchForm.zgswjg = res.data[0].zjzbSwjgVo.swjgDm
-                this.subbureau = res.data[0].zjzbSwjgVos
+                // this.searchForm.zgswjg = res.data[0].zjzbSwjgVo.swjgDm
+                // this.subbureau = res.data[0].zjzbSwjgVos
                 this.getData()
             })
             this.$store.dispatch('GetZsxmList').then(res => {
@@ -280,17 +288,20 @@ export default {
                 ...this.searchForm
             }
             accountQuery(params).then(res => {
-                let list = []
-                list.push(res.data)
-                this.tableData = list
+                this.tableData = res.data
                 this.loading = false
             })
         },
       toggleExpand() {
         this.isExpanded = !this.isExpanded;
       },
-      handleClick(row){
-        this.$router.push({path:`/compliance/alertstatistics`, query:row})
+        handleClick(row,detailType) {
+            let params = {
+                ...row,
+                ...this.searchForm,
+                detailType:detailType
+        }
+        this.$router.push({path:`/compliance/alertstatistics`, query:params})
       }
     },
     computed: {
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index d7f13773..41612325 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -273,9 +273,7 @@ export default {
           icon: 'wk wk-employees'
         }
       }
-      console.log('111111111111111',this.compliance)
       if (this.compliance.compliance) {
-              console.log('22222222222222222222222',this.compliance.compliance)
         tempsItems.compliance = {
           title: '合规风险',
           type: 12,
@@ -373,7 +371,6 @@ export default {
         for (let index = 0; index < this.headerModule.length; index++) {
           const key = this.headerModule[index]
           const menu = this.allItemsObj[key]
-          console.log('menu', menu)
           if (menu && allList.length < 8) {
             allList.push(menu)
           }