diff --git a/src/api/rightsComfort/supervision.ts b/src/api/rightsComfort/supervision.ts
index 072fdeb..069d6b9 100644
--- a/src/api/rightsComfort/supervision.ts
+++ b/src/api/rightsComfort/supervision.ts
@@ -8,6 +8,7 @@ export function getListData(query){
     })
 }
 
+
 //获取数据详情
 export function  getDetail(id){
     return request.get({
diff --git a/src/api/screen/subScreen/subOneSupervisionNotify.ts b/src/api/screen/subScreen/subOneSupervisionNotify.ts
index 16de757..5ef36b6 100644
--- a/src/api/screen/subScreen/subOneSupervisionNotify.ts
+++ b/src/api/screen/subScreen/subOneSupervisionNotify.ts
@@ -33,34 +33,9 @@ export function getSubOneSupervisionMap(departId, times) {
     });
 }
 
-export function getSubOneYellowBetDrug(departId, times) {
+export function getSubOneYellowBetDrug(departId, times,type) {
     return request.get({
-        url: `/datav/sub1/supervisonNotify/getSubOneYellowBetDrug?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
-    });
-}
-
-
-export function getSubOneGunController(departId, times) {
-    return request.get({
-        url: `/datav/sub1/supervisonNotify/getSubOneGunController?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
-    });
-}
-
-export function getSubOneCompanyProblem(departId, times) {
-    return request.get({
-        url: `/datav/sub1/supervisonNotify/getSubOneCompanyProblem?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
-    });
-}
-
-export function getSubOneHandleCase(departId, times) {
-    return request.get({
-        url: `/datav/sub1/supervisonNotify/getSubOneHandleCase?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
-    });
-}
-
-export function getSubOneCheckBeer(departId, times) {
-    return request.get({
-        url: `/datav/sub1/supervisonNotify/getSubOneCheckBeer?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}`
+        url: `/datav/sub1/supervisonNotify/getSubOneYellowBetDrug?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}&type=${type}`
     });
 }
 
diff --git a/src/api/superviseReport/superviseReport.ts b/src/api/superviseReport/superviseReport.ts
index cf6a089..9e671ac 100644
--- a/src/api/superviseReport/superviseReport.ts
+++ b/src/api/superviseReport/superviseReport.ts
@@ -9,6 +9,15 @@ export function getListData(query) {
         query
     });
 }
+
+
+//获取分县
+export function getSubListData(query){
+    return request.get({
+        url:'/supervise/report/subQueryPage',
+        query: query
+    })
+}
 /**
  * 获取附件
  * */
diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue
index 170e116..5965b60 100644
--- a/src/views/datav/SceneInsp.vue
+++ b/src/views/datav/SceneInsp.vue
@@ -21,7 +21,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        fxsjRankOverview.proTotal
+                                                    leftOverview.proTotal
                                                     }}
                                                 </div>
                                                 <div class="descriptions_label">
@@ -37,7 +37,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        fxsjRankOverview.processingNumber
+                                                    leftOverview.processingNumber
                                                     }}
                                                 </div>
                                                 <div class="descriptions_label">
@@ -53,7 +53,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        fxsjRankOverview.completedNumber
+                                                    leftOverview.completedNumber
                                                     }}
                                                 </div>
                                                 <div class="descriptions_label">
@@ -69,7 +69,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        fxsjRankOverview.completedRate
+                                                    leftOverview.completedRate
                                                     }}%
                                                 </div>
                                                 <div class="descriptions_label">
@@ -100,7 +100,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        jsdwRankOverview.proTotal
+                                                    leftOverview.proTotal
                                                     }}
                                                 </div>
                                                 <div class="descriptions_label">
@@ -116,7 +116,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        jsdwRankOverview.processingNumber
+                                                    leftOverview.processingNumber
                                                     }}
                                                 </div>
                                                 <div class="descriptions_label">
@@ -132,7 +132,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        jsdwRankOverview.completedNumber
+                                                    leftOverview.completedNumber
                                                     }}
                                                 </div>
                                                 <div class="descriptions_label">
@@ -148,7 +148,7 @@
                                                     class="descriptions_content"
                                                 >
                                                     {{
-                                                        jsdwRankOverview.completedRate
+                                                    leftOverview.completedRate
                                                     }}%
                                                 </div>
                                                 <div class="descriptions_label">
@@ -188,34 +188,34 @@
                             <datav-statistic
                                 :value="overview.problemNumber"
                                 title="通报问题数"
-                                style="width: 20%"
+                                style="width: 16.66%"
                             />
+                          <datav-statistic
+                              :value="overview.reportNumber"
+                              title="通报期数"
+                              style="width: 16.66%"
+                              @click="handleShow"
+                          />
                             <datav-statistic
                                 :value="overview.processingNumber"
                                 title="办理中"
-                                style="width: 20%"
+                                style="width: 16.66%"
                             />
                             <datav-statistic
                                 :value="overview.completedNumber"
                                 title="已办结"
-                                style="width: 20%"
+                                style="width: 16.66%"
                             />
                             <datav-statistic
                                 :value="overview.departNumber"
                                 title="问责单位数"
-                                style="width: 20%"
+                                style="width: 16.66%"
                             />
                             <datav-statistic
                                 :value="overview.personNumber"
                                 title="问责人次"
-                                style="width: 20%"
+                                style="width: 16.66%"
                             />
-<!--                            <datav-statistic-->
-<!--                                :value="overview.completedRate"-->
-<!--                                value-unit="%"-->
-<!--                                title="办结率"-->
-<!--                                style="width: 16.66%"-->
-<!--                            />-->
                         </div>
                         <v-charts
                             style="height: 450px"
@@ -286,7 +286,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    fxsjYellowBetOverview.proTotal
+                                                                    rightOverview.proTotal
                                                                 }}
                                                             </div>
                                                             <div
@@ -304,7 +304,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    fxsjYellowBetOverview.processingNumber
+                                                                rightOverview.processingNumber
                                                                 }}
                                                             </div>
                                                             <div
@@ -322,7 +322,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    fxsjYellowBetOverview.completedNumber
+                                                                rightOverview.completedNumber
                                                                 }}
                                                             </div>
                                                             <div
@@ -340,7 +340,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    fxsjYellowBetOverview.completedRate
+                                                                rightOverview.completedRate
                                                                 }}%
                                                             </div>
                                                             <div
@@ -376,7 +376,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    jsdwYellowBetOverview.proTotal
+                                                                rightOverview.proTotal
                                                                 }}
                                                             </div>
                                                             <div
@@ -394,7 +394,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    jsdwYellowBetOverview.processingNumber
+                                                                rightOverview.processingNumber
                                                                 }}
                                                             </div>
                                                             <div
@@ -412,7 +412,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    jsdwYellowBetOverview.completedNumber
+                                                                rightOverview.completedNumber
                                                                 }}
                                                             </div>
                                                             <div
@@ -430,7 +430,7 @@
                                                                 class="descriptions_content"
                                                             >
                                                                 {{
-                                                                    jsdwYellowBetOverview.completeRate
+                                                                rightOverview.completeRate
                                                                 }}%
                                                             </div>
                                                             <div
@@ -482,6 +482,162 @@
     </el-scrollbar>
 
     <file-preview :files="files" v-model:show="filePreviewShow" />
+
+    <el-dialog v-model="show" width="70vw" title="通报报告" >
+      <div class="table-container" v-loading="loading">
+        <el-table
+            :data="listData"
+            ref="tableRef"
+            style="width: 100%"
+        >
+          <el-table-column prop="reportName" label="督察报告名称"></el-table-column>
+          <el-table-column prop="crtTime" label="创建时间" >
+            <template #default="{row}">
+              {{ timeFormat(row.crtTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="superviseNumber" label="督察问题数">
+            <template #default="{row}">
+              <el-button type="primary" link @click="handleNegativeTable(row)">{{row.superviseNumber}}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex end mt-8">
+        <el-pagination
+            @size-change="getReportList"
+            @current-change="getReportList"
+            :page-sizes="[10, 20, 50]"
+            v-model:page-size="query.size"
+            v-model:current-page="query.current"
+            layout="total, sizes, prev, pager, next"
+            :total="total"
+        />
+      </div>
+    </el-dialog>
+
+  <!--    督察报告关联问题-->
+  <el-dialog :title="`督察报告关联问题`" v-model="negativeShow" width="90vw" >
+    <el-table :data="negativeTable" v-loading="loading">
+      <el-table-column
+          label="问题录入时间"
+          prop="crtTime"
+          width="150"
+          sortable="custom"
+      />
+      <el-table-column
+          label="问题发现时间"
+          prop="discoveryTime"
+          width="150"
+          sortable="custom"
+      />
+      <el-table-column
+          label="问题来源"
+          prop="problemSources"
+          width="110"
+          show-overflow-tooltip
+      />
+      <el-table-column
+          label="业务类别"
+          prop="businessTypeName"
+          width="110"
+      />
+      <el-table-column
+          label="问题内容"
+          prop="thingDesc"
+          show-overflow-tooltip
+      />
+      <el-table-column label="办理单位" show-overflow-tooltip>
+        <template #default="{ row }">
+                            <span
+                            >{{ row.handleSecondDepartName
+                              }}{{ row.handleThreeDepartName }}</span
+                            >
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="是否属实"
+          prop="checkStatusName"
+          width="100"
+          align="center"
+      />
+      <el-table-column
+          label="流程限时"
+          width="150"
+          align="center"
+          v-if="remainingTimeFlag"
+      >
+        <template #default="{ row }">
+          <countdown
+              :time="row.remainingDuration"
+              v-if="
+                                    row.remainingDuration &&
+                                    row.processingStatus !==
+                                        ProcessingStatus.COMPLETED
+                                "
+          />
+          <el-tag
+              v-else-if="row.handleTimeout"
+              type="danger"
+              effect="dark"
+          >办结超时
+            {{ formatTimeText(row.handleTimeout) }}</el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="办理状态" width="110">
+        <template #default="{ row }">
+          <el-tag
+              :type="
+                                    row.processingStatus ===
+                                    ProcessingStatus.COMPLETED
+                                        ? 'success'
+                                        : 'primary'
+                                "
+              v-if="row.processingStatus"
+          >{{
+              getDictLable(
+                  dict.processingStatus,
+                  row.processingStatus
+              )
+            }}</el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="当前处理对象"
+          prop="currentProcessingObject"
+          show-overflow-tooltip
+      >
+        <template #default="{ row }">
+                            <span
+                                v-if="
+                                    row.processingStatus ===
+                                    ProcessingStatus.COMPLETED
+                                "
+                            >无</span
+                            >
+          <span v-else>{{
+              row.currentProcessingObject
+            }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="flex end mt-8">
+      <el-pagination
+          @size-change="getNegativePageFun"
+          @current-change="getNegativePageFun"
+          :page-sizes="[10, 20, 50, 100]"
+          v-model:page-size="negativeQuery.size"
+          v-model:current-page="negativeQuery.current"
+          layout="total, sizes, prev, pager, next"
+          :total="negativeTotal"
+      >
+      </el-pagination>
+    </div>
+  </el-dialog>
+
+
 </template>
 
 <script setup>
@@ -504,15 +660,21 @@ import { mapOrgNameMapping } from "@/enums/orgMapping.js";
 
 import useCatchStore from "@/stores/modules/catch";
 import { onMounted } from "vue";
+import {getListData,getNegativePageByQuery} from "@/api/superviseReport/superviseReport";
+import {timeFormat,formatTimeText, getDictLable, getInvolveProblem} from "@/utils/util";
+import {ProcessingStatus} from "@/enums/flowEnums";
 
 const catchStore = useCatchStore();
-const dict = catchStore.getDicts(["specialSupervision"]);
-console.log('dict',dict)
+const dict = catchStore.getDicts(["specialSupervision","suspectProblem","processingStatus"]);
+const show =ref(false)
+
 const dictData = computed(()=>{
   return dict?.specialSupervision?.filter((s)=>s.dictLabel !== '枪支管理')
 })
 
 
+
+
 // region 所有变量
 const time = ref([
     moment().startOf("year").format("YYYY-MM-DD"),
@@ -534,12 +696,13 @@ const overview = ref({
     personNumber: 0,
     completedRate: 0,
 }); // 中央数据总览
+const leftOverview = ref({});
 const fxsjRankOverview = ref({}); // 日常督察总览分县市局
 const jsdwRankOverview = ref({}); // 日常督察总览局属单位
 const fxsjChangedRankList = ref([]); // 日常督察问题排行分县市局
 const jsdwChangedRankList = ref([]); // 日常督察问题排行局属单位
 const wtlxList = ref([]); // 问题涉及方面分布
-
+const rightOverview = ref({});
 const fxsjYellowBetOverview = ref({
     proTotal: 0,
     processingNumber: 0,
@@ -790,6 +953,7 @@ const proTrend = ref({
 // region  所有函数
 const getChangedRankData = async () => {
     const res = await getChangedRank(time.value);
+    leftOverview.value =res.overview;
     fxsjRankOverview.value = res.fxsjRankOverview;
     jsdwRankOverview.value = res.jsdwRankOverview;
     fxsjChangedRankList.value = res.fxsjChangedRankList;
@@ -846,6 +1010,7 @@ const getSupervisionTrendData = async () => {
 };
 const getYellowBetDrugData = async () => {
     const res = await getYellowBetDrug(time.value, zxdcProRankTab.value);
+    rightOverview.value = res.overView;
     fxsjYellowBetOverview.value = res.countyOverview;
     jsdwYellowBetOverview.value = res.bureauOverview;
     fxsjYellowBetRankList.value = res.countyRankList;
@@ -1114,6 +1279,64 @@ function handlePerviewFile(msg) {
   }
 }
 
+const handleShow =()=>{
+  show.value=true
+  getReportList()
+}
+
+
+const tableRef = ref(null)
+const query = ref({
+  current: 1,
+  size: 10,
+  departBranch:false
+})
+const listData = ref([]);
+const total = ref(0);
+const loading = ref(false);
+/**
+ * 获取表单数据
+ * */
+const getReportList =async ()=>{
+  loading.value=true
+  try{
+    const res = await  getListData(query.value);
+    listData.value=res.records;
+    total.value = res.total;
+    loading.value = false
+  }catch (e) {
+    loading.value = false
+  }
+}
+//督察问题
+const negativeShow = ref(false)
+const negativeTable = ref();
+const negativeQuery = ref({
+  current: 1,
+  size: 10,
+  departBranch:false
+})
+const negativeTotal = ref(0);
+const negativeLoging = ref(false);
+const handleNegativeTable =async (row)=>{
+  if(row.superviseNumber > 0){
+    try{
+      negativeLoging.value=true;
+      await getNegativePageFun(row);
+      negativeShow.value = true;
+    }catch (e){
+      console.log("督察问题获取失败")
+      negativeLoging.value=false;
+    }
+  }
+}
+const getNegativePageFun = async (row)=>{
+  negativeQuery.value.id =row.id;
+  const res = await getNegativePageByQuery(row);
+  negativeTable.value =res.records;
+  negativeTotal.value = res.total;
+  negativeLoging.value=false;
+}
 
 </script>
 
diff --git a/src/views/datav/subonedatav/SubOneSceneInsp.vue b/src/views/datav/subonedatav/SubOneSceneInsp.vue
index 7c72cd1..dc3f062 100644
--- a/src/views/datav/subonedatav/SubOneSceneInsp.vue
+++ b/src/views/datav/subonedatav/SubOneSceneInsp.vue
@@ -17,7 +17,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ fxsjRankOverview.proTotal }}
+                          {{ leftOverview.proTotal }}
                         </div>
                         <div class="descriptions_label">
                           问题数
@@ -27,7 +27,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ fxsjRankOverview.changing }}
+                          {{ leftOverview.changing }}
                         </div>
                         <div class="descriptions_label">
                           办理中
@@ -37,7 +37,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ fxsjRankOverview.changed }}
+                          {{ leftOverview.changed }}
                         </div>
                         <div class="descriptions_label">
                           已办结
@@ -47,7 +47,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ fxsjRankOverview.correctionRate }}%
+                          {{ leftOverview.correctionRate }}%
                         </div>
                         <div class="descriptions_label">
                           整改率
@@ -72,7 +72,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ jsdwRankOverview.proTotal }}
+                          {{ leftOverview.proTotal }}
                         </div>
                         <div class="descriptions_label">
                           问题数
@@ -82,7 +82,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ jsdwRankOverview.changing }}
+                          {{ leftOverview.changing }}
                         </div>
                         <div class="descriptions_label">
                           办理中
@@ -92,7 +92,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ jsdwRankOverview.changed }}
+                          {{ leftOverview.changed }}
                         </div>
                         <div class="descriptions_label">
                           已办结
@@ -102,7 +102,7 @@
                     <el-col :span="6">
                       <div class="descriptions_cell text-center">
                         <div class="descriptions_content">
-                          {{ jsdwRankOverview.correctionRate }}%
+                          {{ leftOverview.correctionRate }}%
                         </div>
                         <div class="descriptions_label">
                           整改率
@@ -139,10 +139,17 @@
           <el-col :span="12">
             <datav-date-picker v-model="time"/>
             <div class="flex gap-42">
+
               <datav-statistic
                   :value="overview.supervisionNotifyTotal"
                   title="通报问题数"
-                  style="width: 20%"
+                  style="width: 16.66%"
+              />
+              <datav-statistic
+                  :value="overview.reportNumber"
+                  title="通报期数"
+                  style="width: 16.66%"
+                  @click="handleShow"
               />
               <datav-statistic
                   :value="overview.supervisionNotifyChangingTotal"
@@ -152,17 +159,17 @@
               <datav-statistic
                   :value="overview.supervisionNotifyChangedTotal"
                   title="已办结"
-                  style="width: 20%"
+                  style="width: 16.66%"
               />
               <datav-statistic
                   :value="overview.supervisionNotifyOrgTotal"
                   title="问责单位数"
-                  style="width: 20%"
+                  style="width: 16.66%"
               />
               <datav-statistic
                   :value="overview.supervisionNotifyPreTotal"
                   title="问责人次"
-                  style="width: 20%"
+                  style="width: 16.66%"
               />
             </div>
             <v-charts
@@ -198,571 +205,126 @@
           <el-col :span="6">
             <datav-card>
               <datav-tabs v-model="subOneZxdcProRankTab" size="small" ref="subOneSceneInspZxdcProRankTabs">
-                <datav-tab-item label="黄赌毒" name="1">
-                  <datav-tabs type="bottom-button">
-                    <datav-tab-item label="派出所" name="1">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjYellowBetOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjYellowBetOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjYellowBetOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjYellowBetOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="fxsjYellowBetRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                            :label-width="110"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-                    <datav-tab-item label="大队" name="2">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwYellowBetOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwYellowBetOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwYellowBetOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwYellowBetOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="jsdwYellowBetRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                            :label-width="110"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-                  </datav-tabs>
-                </datav-tab-item>
-<!--                <datav-tab-item label="枪支管理" name="2">-->
-<!--                  <datav-tabs-->
-<!--                      type="bottom-button">-->
-<!--                    <datav-tab-item label="派出所" name="1">-->
-<!--                      <el-row class="mb-32">-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ fxsjGunControllerOverview.proTotal }}-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              问题数-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ fxsjGunControllerOverview.changing }}-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              办理中-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ fxsjGunControllerOverview.changed }}-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              已办结-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ fxsjGunControllerOverview.correctionRate }}%-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              整改率-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                      </el-row>-->
-<!--                      <el-scrollbar height="330px">-->
-<!--                        <datav-chart-bar-->
-<!--                            :data="fxsjGunControllerRankList"-->
-<!--                            size="large"-->
-<!--                            title="问题数排名"-->
-<!--                            sub-title="问题数"-->
-<!--                            :color="colors"-->
-<!--                        />-->
-<!--                      </el-scrollbar>-->
-<!--                    </datav-tab-item>-->
-<!--                    <datav-tab-item label="大队" name="2">-->
-<!--                      <el-row class="mb-32">-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ jsdwGunControllerOverview.proTotal }}-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              问题数-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ jsdwGunControllerOverview.changing }}-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              办理中-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ jsdwGunControllerOverview.changed }}-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              已办结-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                        <el-col :span="6">-->
-<!--                          <div class="descriptions_cell text-center">-->
-<!--                            <div class="descriptions_content">-->
-<!--                              {{ jsdwGunControllerOverview.correctionRate }}%-->
-<!--                            </div>-->
-<!--                            <div class="descriptions_label">-->
-<!--                              整改率-->
-<!--                            </div>-->
-<!--                          </div>-->
-<!--                        </el-col>-->
-<!--                      </el-row>-->
-<!--                      <el-scrollbar height="330px">-->
-<!--                        <datav-chart-bar-->
-<!--                            :data="jsdwGunControllerRankList"-->
-<!--                            size="large"-->
-<!--                            title="问题数排名"-->
-<!--                            sub-title="问题数"-->
-<!--                            :color="colors"-->
-<!--                        />-->
-<!--                      </el-scrollbar>-->
-<!--                    </datav-tab-item>-->
-
-<!--                  </datav-tabs>-->
-<!--                </datav-tab-item>-->
-                <datav-tab-item label="涉企问题" name="2">
-                  <datav-tabs
-                      type="bottom-button">
-                    <datav-tab-item label="派出所" name="1">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCompanyProblemOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCompanyProblemOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCompanyProblemOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCompanyProblemOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="fxsjCompanyProblemRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-                    <datav-tab-item label="大队" name="2">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCompanyProblemOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCompanyProblemOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCompanyProblemOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCompanyProblemOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="jsdwCompanyProblemRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-
-                  </datav-tabs>
-                </datav-tab-item>
-                <datav-tab-item label="执法办案" name="3">
-                  <datav-tabs
-                      type="bottom-button">
-                    <datav-tab-item label="派出所" name="1">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjHandleCaseOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjHandleCaseOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjHandleCaseOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjHandleCaseOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="fxsjHandleCaseRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-                    <datav-tab-item label="大队" name="2">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwHandleCaseOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwHandleCaseOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwHandleCaseOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwHandleCaseOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="jsdwHandleCaseRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-
-                  </datav-tabs>
-                </datav-tab-item>
-                <datav-tab-item label="工作日测酒" name="4">
-                  <datav-tabs
-                      type="bottom-button">
-                    <datav-tab-item label="派出所" name="1">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCheckBeerOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCheckBeerOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCheckBeerOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ fxsjCheckBeerOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="fxsjCheckBeerRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-                    <datav-tab-item label="大队" name="2">
-                      <el-row class="mb-32">
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCheckBeerOverview.proTotal }}
-                            </div>
-                            <div class="descriptions_label">
-                              问题数
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCheckBeerOverview.changing }}
-                            </div>
-                            <div class="descriptions_label">
-                              办理中
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCheckBeerOverview.changed }}
-                            </div>
-                            <div class="descriptions_label">
-                              已办结
-                            </div>
-                          </div>
-                        </el-col>
-                        <el-col :span="6">
-                          <div class="descriptions_cell text-center">
-                            <div class="descriptions_content">
-                              {{ jsdwCheckBeerOverview.correctionRate }}%
-                            </div>
-                            <div class="descriptions_label">
-                              整改率
-                            </div>
-                          </div>
-                        </el-col>
-                      </el-row>
-                      <el-scrollbar height="330px">
-                        <datav-chart-bar
-                            :data="jsdwCheckBeerRankList"
-                            size="large"
-                            title="问题数排名"
-                            sub-title="问题数"
-                            :color="colors"
-                        />
-                      </el-scrollbar>
-                    </datav-tab-item>
-
-                  </datav-tabs>
-                </datav-tab-item>
+                <template v-for="item in dictData" :key="item.dictValue">
+                  <datav-tab-item
+                     :label="item.dictLabel"
+                    :name="item.dictValue"
+                    >
+                    <datav-tabs type="bottom-button">
+                      <datav-tab-item label="派出所" name="1">
+                        <el-row class="mb-32">
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ fxsjYellowBetOverview.proTotal }}
+                              </div>
+                              <div class="descriptions_label">
+                                问题数
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ fxsjYellowBetOverview.changing }}
+                              </div>
+                              <div class="descriptions_label">
+                                办理中
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ fxsjYellowBetOverview.changed }}
+                              </div>
+                              <div class="descriptions_label">
+                                已办结
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ fxsjYellowBetOverview.correctionRate }}%
+                              </div>
+                              <div class="descriptions_label">
+                                整改率
+                              </div>
+                            </div>
+                          </el-col>
+                        </el-row>
+                        <el-scrollbar height="330px">
+                          <datav-chart-bar
+                              :data="fxsjYellowBetRankList"
+                              size="large"
+                              title="问题数排名"
+                              sub-title="问题数"
+                              :color="colors"
+                              :label-width="110"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                      <datav-tab-item label="大队" name="2">
+                        <el-row class="mb-32">
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ jsdwYellowBetOverview.proTotal }}
+                              </div>
+                              <div class="descriptions_label">
+                                问题数
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ jsdwYellowBetOverview.changing }}
+                              </div>
+                              <div class="descriptions_label">
+                                办理中
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ jsdwYellowBetOverview.changed }}
+                              </div>
+                              <div class="descriptions_label">
+                                已办结
+                              </div>
+                            </div>
+                          </el-col>
+                          <el-col :span="6">
+                            <div class="descriptions_cell text-center">
+                              <div class="descriptions_content">
+                                {{ jsdwYellowBetOverview.correctionRate }}%
+                              </div>
+                              <div class="descriptions_label">
+                                整改率
+                              </div>
+                            </div>
+                          </el-col>
+                        </el-row>
+                        <el-scrollbar height="330px">
+                          <datav-chart-bar
+                              :data="jsdwYellowBetRankList"
+                              size="large"
+                              title="问题数排名"
+                              sub-title="问题数"
+                              :color="colors"
+                              :label-width="110"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                    </datav-tabs>
+                  </datav-tab-item>
+                </template>
               </datav-tabs>
             </datav-card>
-
-
-            <datav-card title="督察工作动态">
+           <datav-card title="督察工作动态">
               <el-scrollbar height="310px" ref="subOneSceneScrollbar">
                 <datav-message
                     v-for="(msg, index) in messages"
@@ -781,6 +343,162 @@
     </div>
   </el-scrollbar>
   <negative-info-depart-dialog v-model="showDialog" :departId="tempDepartId"/>
+
+
+  <el-dialog v-model="show" width="70vw" title="通报报告" >
+    <div class="table-container" v-loading="loading">
+      <el-table
+          :data="listData"
+          ref="tableRef"
+          style="width: 100%"
+      >
+        <el-table-column prop="reportName" label="督察报告名称"></el-table-column>
+        <el-table-column prop="crtTime" label="创建时间" >
+          <template #default="{row}">
+            {{ timeFormat(row.crtTime) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="superviseNumber" label="督察问题数">
+          <template #default="{row}">
+            <el-button type="primary" link @click="handleNegativeTable(row)">{{row.superviseNumber}}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="flex end mt-8">
+      <el-pagination
+          @size-change="getReportList"
+          @current-change="getReportList"
+          :page-sizes="[10, 20, 50]"
+          v-model:page-size="query.size"
+          v-model:current-page="query.current"
+          layout="total, sizes, prev, pager, next"
+          :total="total"
+      />
+    </div>
+  </el-dialog>
+
+  <!--    督察报告关联问题-->
+  <el-dialog :title="`督察报告关联问题`" v-model="negativeShow" width="90vw" >
+    <el-table :data="negativeTable" v-loading="loading">
+      <el-table-column
+          label="问题录入时间"
+          prop="crtTime"
+          width="150"
+          sortable="custom"
+      />
+      <el-table-column
+          label="问题发现时间"
+          prop="discoveryTime"
+          width="150"
+          sortable="custom"
+      />
+      <el-table-column
+          label="问题来源"
+          prop="problemSources"
+          width="110"
+          show-overflow-tooltip
+      />
+      <el-table-column
+          label="业务类别"
+          prop="businessTypeName"
+          width="110"
+      />
+      <el-table-column
+          label="问题内容"
+          prop="thingDesc"
+          show-overflow-tooltip
+      />
+      <el-table-column label="办理单位" show-overflow-tooltip>
+        <template #default="{ row }">
+                            <span
+                            >{{ row.handleSecondDepartName
+                              }}{{ row.handleThreeDepartName }}</span
+                            >
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="是否属实"
+          prop="checkStatusName"
+          width="100"
+          align="center"
+      />
+      <el-table-column
+          label="流程限时"
+          width="150"
+          align="center"
+          v-if="remainingTimeFlag"
+      >
+        <template #default="{ row }">
+          <countdown
+              :time="row.remainingDuration"
+              v-if="
+                                    row.remainingDuration &&
+                                    row.processingStatus !==
+                                        ProcessingStatus.COMPLETED
+                                "
+          />
+          <el-tag
+              v-else-if="row.handleTimeout"
+              type="danger"
+              effect="dark"
+          >办结超时
+            {{ formatTimeText(row.handleTimeout) }}</el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="办理状态" width="110">
+        <template #default="{ row }">
+          <el-tag
+              :type="
+                                    row.processingStatus ===
+                                    ProcessingStatus.COMPLETED
+                                        ? 'success'
+                                        : 'primary'
+                                "
+              v-if="row.processingStatus"
+          >{{
+              getDictLable(
+                  dict.processingStatus,
+                  row.processingStatus
+              )
+            }}</el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="当前处理对象"
+          prop="currentProcessingObject"
+          show-overflow-tooltip
+      >
+        <template #default="{ row }">
+                            <span
+                                v-if="
+                                    row.processingStatus ===
+                                    ProcessingStatus.COMPLETED
+                                "
+                            >无</span
+                            >
+          <span v-else>{{
+              row.currentProcessingObject
+            }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="flex end mt-8">
+      <el-pagination
+          @size-change="getNegativePageFun"
+          @current-change="getNegativePageFun"
+          :page-sizes="[10, 20, 50, 100]"
+          v-model:page-size="negativeQuery.size"
+          v-model:current-page="negativeQuery.current"
+          layout="total, sizes, prev, pager, next"
+          :total="negativeTotal"
+      >
+      </el-pagination>
+    </div>
+  </el-dialog>
+
 </template>
 
 <script setup>
@@ -791,14 +509,19 @@ import moment from "moment";
 
 import {getSubOneStreetMap} from "@/api/screen/subScreen/subOneGlobal.ts";
 import {
-  getSubOneChangedRank, getSubOneCheckBeer, getSubOneCompanyProblem, getSubOneGunController, getSubOneHandleCase,
+  getSubOneChangedRank,
   getSubOneProblemTypeRate, getSubOneSupervisionMap, getSubOneSupervisionNotifyCount,
   getSubOneSupervisionTrend, getSubOneWorkDynamics, getSubOneYellowBetDrug
 } from "@/api/screen/subScreen/subOneSupervisionNotify.ts";
 import {workDynamicColorMapping} from "@/enums/workDynamicColorMapping.js";
 import SubOneHeader from "@/components/datav/subOne/subOneHeader.vue";
 import useUserStore from "@/stores/modules/user";
+import useCatchStore from "@/stores/modules/catch";
+import {getSubListData,getNegativePageByQuery} from "@/api/superviseReport/superviseReport";
+import {timeFormat,formatTimeText, getDictLable, getInvolveProblem} from "@/utils/util";
+import {ProcessingStatus} from "@/enums/flowEnums";
 const userStore = useUserStore();
+const show =ref(false)
 // region 所有变量
 const time = ref([
   moment().startOf("year").format("YYYY-MM-DD"),
@@ -806,7 +529,11 @@ const time = ref([
 ]);
 const route = useRoute();
 let currentDepartId = route.query.departId;
-
+const catchStore = useCatchStore();
+const dict = catchStore.getDicts(["specialSupervision"]);
+const dictData = computed(()=>{
+  return dict?.specialSupervision?.filter((s)=>s.dictLabel !== '枪支管理')
+})
 
 const currentYear = new Date().getFullYear();
 const years = ref([currentYear.toString(), (currentYear - 1).toString(), (currentYear - 2).toString()]); // 年份列表
@@ -820,6 +547,7 @@ const overview = ref({
   supervisionNotifyTotal: 0,
   supervisionNotifyOrgTotal: 0,
 });  // 中央数据总览
+const leftOverview = ref({})
 const fxsjRankOverview = ref({});  // 日常督察总览分县市局
 const jsdwRankOverview = ref({});  // 日常督察总览局属单位
 const fxsjChangedRankList = ref([]);  // 日常督察问题排行分县市局
@@ -841,66 +569,6 @@ const jsdwYellowBetOverview = ref({
 const fxsjYellowBetRankList = ref([])  // 黄赌毒问题排行分县市局
 const jsdwYellowBetRankList = ref([])  // 黄赌毒问题排行局属单位
 
-const fxsjGunControllerOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 枪支管理总览分县市局
-const jsdwGunControllerOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 枪支管理总览局属单位
-const fxsjGunControllerRankList = ref([])  //  枪支管理排行分县市局
-const jsdwGunControllerRankList = ref([])  //  枪支管理排行局属单位
-
-const fxsjCompanyProblemOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 涉企问题总览分县市局
-const jsdwCompanyProblemOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 涉企问题局属单位
-const fxsjCompanyProblemRankList = ref([])  //  涉企问题排行分县市局
-const jsdwCompanyProblemRankList = ref([])  //  涉企问题排行局属单位
-
-const fxsjHandleCaseOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 执法办案总览分县市局
-const jsdwHandleCaseOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 执法办案总览局属单位
-const fxsjHandleCaseRankList = ref([])  //  执法办案排行分县市局
-const jsdwHandleCaseRankList = ref([])  //  执法办案排行局属单位
-
-const fxsjCheckBeerOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 工作日测酒总览分县市局
-const jsdwCheckBeerOverview = ref({
-  proTotal: 0,
-  changing: 0,
-  changed: 0,
-  correctionRate: 0,
-})  // 工作日测酒总览局属单位
-const fxsjCheckBeerRankList = ref([])  //  工作日测酒排行分县市局
-const jsdwCheckBeerRankList = ref([])  //  工作日测酒排行局属单位
-
 const messages = ref([]);
 
 const subOneZxdcProRankTab = ref("1"); // 专项督察问题排行tab
@@ -921,6 +589,21 @@ let subOneSceneWorkDynamicsIntervalId;
 
 const tempDepartId = ref(0);  // 临时部门id
 const showDialog = ref(false);  // 负面信息弹窗显示
+const rightOverview =ref({})
+const getYellowBetDrugData = async (departId,times) => {
+  const res = await getSubOneYellowBetDrug(departId, times,subOneZxdcProRankTab.value)
+  rightOverview.value = res.overview;
+  fxsjYellowBetOverview.value = res.fxsjYellowBetOverview
+  jsdwYellowBetOverview.value = res.jsdwYellowBetOverview
+  fxsjYellowBetRankList.value = res.fxsjYellowBetRankList
+  jsdwYellowBetRankList.value = res.jsdwYellowBetRankList
+};
+
+watch(subOneZxdcProRankTab, () => {
+  getYellowBetDrugData(currentDepartId, time.value)
+})
+
+
 
 const colors = [
   {
@@ -1127,6 +810,7 @@ const getMapJSON = async (departId = currentDepartId) => {
 }
 const getSubOneChangedRankData = async (departId, times) => {
   const res = await getSubOneChangedRank(departId, times)
+  leftOverview.value =res.overview;
   fxsjRankOverview.value = res.fxsjRankOverview;
   jsdwRankOverview.value = res.jsdwRankOverview;
   fxsjChangedRankList.value = res.fxsjChangedRankList;
@@ -1148,6 +832,7 @@ const getSubOneSupervisionNotifyCountData = async (departId, times) => {
     supervisionNotifyChangedTotal: Number(res.overview.completedNumber),
     supervisionNotifyTotal: Number(res.overview.problemNumber),
     supervisionNotifyOrgTotal: Number(res.overview.departNumber),
+    reportNumber: Number(res.overview.reportNumber)
   });
 }
 const getSubOneSupervisionMapData = async (departId, times) => {
@@ -1184,34 +869,9 @@ const getSubOneYellowBetDrugData = async (departId, times) => {
   fxsjYellowBetRankList.value = res.fxsjYellowBetRankList
   jsdwYellowBetRankList.value = res.jsdwYellowBetRankList
 }
-const getSubOneGunControllerData = async (departId, times) => {
-  const res = await getSubOneGunController(departId, times)
-  fxsjGunControllerOverview.value = res.fxsjGunControllerOverview
-  jsdwGunControllerOverview.value = res.jsdwGunControllerOverview
-  fxsjGunControllerRankList.value = res.fxsjGunControllerRankList
-  jsdwGunControllerRankList.value = res.jsdwGunControllerRankList
-}
-const getSubOneCompanyProblemData = async (departId, times) => {
-  const res = await getSubOneCompanyProblem(departId, times)
-  fxsjCompanyProblemOverview.value = res.fxsjCompanyProblemOverview
-  jsdwCompanyProblemOverview.value = res.jsdwCompanyProblemOverview
-  fxsjCompanyProblemRankList.value = res.fxsjCompanyProblemRankList
-  jsdwCompanyProblemRankList.value = res.jsdwCompanyProblemRankList
-}
-const getSubOneHandleCaseData = async (departId, times) => {
-  const res = await getSubOneHandleCase(departId, times)
-  fxsjHandleCaseOverview.value = res.fxsjHandleCaseOverview
-  jsdwHandleCaseOverview.value = res.jsdwHandleCaseOverview
-  fxsjHandleCaseRankList.value = res.fxsjHandleCaseRankList
-  jsdwHandleCaseRankList.value = res.jsdwHandleCaseRankList
-}
-const getSubOneCheckBeerData = async (departId, times) => {
-  const res = await getSubOneCheckBeer(departId, times)
-  fxsjCheckBeerOverview.value = res.fxsjCheckBeerOverview
-  jsdwCheckBeerOverview.value = res.jsdwCheckBeerOverview
-  fxsjCheckBeerRankList.value = res.fxsjCheckBeerRankList
-  jsdwCheckBeerRankList.value = res.jsdwCheckBeerRankList
-}
+
+
+
 
 const getSubOneWorkDynamicsData = async (departId, times) => {
   const data = await getSubOneWorkDynamics(departId, times);
@@ -1219,18 +879,17 @@ const getSubOneWorkDynamicsData = async (departId, times) => {
   messages.value = colorNewsVoList;
 }
 const getData = async () => {
-  getMapJSON(currentDepartId);
-  getSubOneChangedRankData(currentDepartId, time.value);
-  getSubOneProblemTypeRateData(currentDepartId, time.value);
-  getSubOneSupervisionNotifyCountData(currentDepartId, time.value);
-  getSubOneSupervisionMapData(currentDepartId, time.value);
-  getSubOneSupervisionTrendData(currentDepartId, selectedYear.value);
-  getSubOneYellowBetDrugData(currentDepartId, time.value);
-  getSubOneGunControllerData(currentDepartId, time.value);
-  getSubOneCompanyProblemData(currentDepartId, time.value);
-  getSubOneHandleCaseData(currentDepartId, time.value);
-  getSubOneCheckBeerData(currentDepartId, time.value);
-  getSubOneWorkDynamicsData(currentDepartId, time.value);
+  await getMapJSON(currentDepartId);
+  await getSubOneChangedRankData(currentDepartId, time.value);
+  await getSubOneProblemTypeRateData(currentDepartId, time.value);
+  await getSubOneSupervisionNotifyCountData(currentDepartId, time.value);
+  await getSubOneSupervisionMapData(currentDepartId, time.value);
+  await getSubOneSupervisionTrendData(currentDepartId, selectedYear.value);
+  // await getSubOneYellowBetDrugData(currentDepartId, time.value);
+
+  await getYellowBetDrugData(currentDepartId, time.value)
+
+  await getSubOneWorkDynamicsData(currentDepartId, time.value);
 }
 
 // endregion
@@ -1290,9 +949,19 @@ const subOneSceneInspTrendAnimation = () => {
 subOneSceneInspTrendIntervalId = setInterval(subOneSceneInspTrendAnimation, 2000);
 // // 专项督察问题排行动画  直接切换大tab，里面不管了
 const subOneSceneInspZxdxRankAnimation = () => {
-  subOneZxdcProRankTab.value = (parseInt(subOneZxdcProRankTab.value) % 4 + 1).toString();
+   const dictItem = dictData.value.find(
+      (item) => (item.dictValue === subOneZxdcProRankTab.value)
+  );
+  if (dictItem) {
+    const index = dictData.value.indexOf(dictItem);
+    if (index === dictData.value.length - 1) {
+      subOneZxdcProRankTab.value = dictData[0].dictValue;
+    } else {
+      subOneZxdcProRankTab.value = dictData[index + 1].dictValue;
+    }
+  }
 };
-subOneSceneInspZxdxIntervalId = setInterval(subOneSceneInspZxdxRankAnimation, 3000);
+subOneSceneInspZxdxIntervalId = setInterval(subOneSceneInspZxdxRankAnimation, 5000);
 // 工作动态动画
 const subOneSceneWorkDynamicsAnimation = () => {
   const sceneScrollTemp = subOneSceneScrollbar?.value;
@@ -1412,6 +1081,66 @@ const subOneSceneWorkDynamicsAnimationStop = () => {
   });
 }
 
+const handleShow =()=>{
+  show.value=true
+  getReportList()
+}
+
+
+const tableRef = ref(null)
+const query = ref({
+  current: 1,
+  size: 10,
+  departBranch:false
+})
+const listData = ref([]);
+const total = ref(0);
+const loading = ref(false);
+/**
+ * 获取表单数据
+ * */
+const getReportList =async ()=>{
+  loading.value=true
+  try{
+    query.value.deptId=currentDepartId;
+    const res = await  getSubListData(query.value);
+    listData.value=res.records;
+    total.value = res.total;
+    loading.value = false
+  }catch (e) {
+    loading.value = false
+  }
+}
+//督察问题
+const negativeShow = ref(false)
+const negativeTable = ref();
+const negativeQuery = ref({
+  current: 1,
+  size: 10,
+  departBranch:false
+})
+const negativeTotal = ref(0);
+const negativeLoging = ref(false);
+const handleNegativeTable =async (row)=>{
+  if(row.superviseNumber > 0){
+    try{
+      negativeLoging.value=true;
+      await getNegativePageFun(row);
+      negativeShow.value = true;
+    }catch (e){
+      console.log("督察问题获取失败")
+      negativeLoging.value=false;
+    }
+  }
+}
+const getNegativePageFun = async (row)=>{
+  negativeQuery.value.id =row.id;
+  const res = await getNegativePageByQuery(row);
+  negativeTable.value =res.records;
+  negativeTotal.value = res.total;
+  negativeLoging.value=false;
+}
+
 // endregion
 </script>