From 69f37c5750443cf070a0a58f1f1ab471a37a3cfb Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Wed, 21 May 2025 16:32:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E7=A6=81=E9=97=AD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=B6=89=E5=8F=8A=E9=97=AE=E9=A2=98=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4=EF=BC=9B?=
 =?UTF-8?q?3=E3=80=81=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F=E6=B9=96?=
 =?UTF-8?q?=E5=8D=97=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/confinement.ts                |   10 +
 src/components/datav/tabs.vue              |    5 +-
 src/components/negative/action-history.vue |    2 +-
 src/components/negative/dialog.vue         |   13 +-
 src/components/negative/verify.vue         | 2705 ++++++++++----------
 src/views/datav/MailVisits.vue             |  105 +-
 6 files changed, 1497 insertions(+), 1343 deletions(-)

diff --git a/src/api/work/confinement.ts b/src/api/work/confinement.ts
index 096cba1..437d2d0 100644
--- a/src/api/work/confinement.ts
+++ b/src/api/work/confinement.ts
@@ -6,6 +6,16 @@ export const  getConfinementList = (query)=>{
         query
     })
 }
+
+//无权限判断的分页查询
+export  const getConfinementListAll =(query)=>{
+    return request.get({
+        url:'/confinement/listALl',
+        query
+    })
+}
+
+
 //新增
 export const InsertConfinement = (body) =>{
     return request.post({
diff --git a/src/components/datav/tabs.vue b/src/components/datav/tabs.vue
index b172030..e4ec978 100644
--- a/src/components/datav/tabs.vue
+++ b/src/components/datav/tabs.vue
@@ -114,6 +114,9 @@ function handleChangeActiveTab(item) {
         }
     }
 }
+.tabs-content{
+  min-width: 300px;
+}
 .tab-title {
     margin-bottom: 4px;
     cursor: pointer;
@@ -139,4 +142,4 @@ function handleChangeActiveTab(item) {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/negative/action-history.vue b/src/components/negative/action-history.vue
index 4812a47..df68cd9 100644
--- a/src/components/negative/action-history.vue
+++ b/src/components/negative/action-history.vue
@@ -102,4 +102,4 @@ function getConsumingTime(crtTime, index) {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/negative/dialog.vue b/src/components/negative/dialog.vue
index 159d714..69b64a7 100644
--- a/src/components/negative/dialog.vue
+++ b/src/components/negative/dialog.vue
@@ -136,8 +136,11 @@
                 </el-col>
                 <el-col :span="19" style="height: 100%">
                     <el-scrollbar max-height="100%" class="main-container">
+                        <!--提回-->
                         <negative-sign-return-description />
+<!--                      延期-->
                         <negative-apply-extension-description />
+<!--                      问题信息-->
                         <negative-description />
                         <div
                             class="row mt-10"
@@ -161,6 +164,7 @@
                                 verifyEditFlag
                             "
                         >
+<!--                          核查办理-->
                             <negative-verify
                                 ref="componentRef"
                                 @submit="handleSubmitExecute"
@@ -174,9 +178,11 @@
                                 ) > -1 && !verifyEditFlag
                             "
                         >
+<!--                          核查办理（查看）-->
                             <negative-verify-description />
                         </template>
                         <template v-if="approves.length">
+<!--                          审批意见-->
                             <negative-approve-description />
                         </template>
                         <div
@@ -208,15 +214,18 @@
                                     -1
                                 "
                             >
+<!--                              办理单位-->
                                 <negative-distribute ref="componentRef" />
                             </template>
                         </template>
+<!--                      会签-->
                         <negative-countersign-description />
                         <template
                             v-if="
                                 components.indexOf('negative-countersign') > -1
                             "
                         >
+<!--                          会签意见-->
                             <negative-countersign
                                 ref="componentRef"
                                 @submit="handleSubmitExecute"
@@ -250,6 +259,7 @@
                                 </div>
                             </div>
                         </div>
+<!--                      抽检-->
                         <el-form
                             class="mt-20"
                             :model="formData"
@@ -362,6 +372,7 @@
                 />
             </template>
             <template v-if="item.actionKey.includes('apply_extension')">
+<!--              申请延期-->
                 <negative-apply-extension
                     :ref="(el) => setActionItemRef(item.actionKey, el)"
                     @submit="handleSubmitExecute"
@@ -718,4 +729,4 @@ main {
 footer {
     padding: 10px 20px 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue
index 08dcd27..ce72d20 100644
--- a/src/components/negative/verify.vue
+++ b/src/components/negative/verify.vue
@@ -1,321 +1,322 @@
 <template>
-    <h5>核查办理</h5>
-    <el-form :label-width="146" :model="form" ref="formRef">
-        <el-row>
-            <el-col :span="12">
-                <el-form-item label="涉及案件/警情编号" prop="caseNumber">
-                    <el-input
-                        v-model="form.caseNumber"
-                        placeholder="请输入"
-                        style="width: 280px"
-                    />
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item
-                    label="涉及单位"
-                    prop="involveDepartId"
-                    :rules="{
+  <h5>核查办理</h5>
+  <el-form :label-width="146" :model="form" ref="formRef">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="涉及案件/警情编号" prop="caseNumber">
+          <el-input
+              v-model="form.caseNumber"
+              placeholder="请输入"
+              style="width: 280px"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item
+            label="涉及单位"
+            prop="involveDepartId"
+            :rules="{
                         required: true,
                         message: '请选择涉及单位',
                         trigger: ['blur'],
                     }"
-                >
-                    <div style="width: 280px">
-                        <depart-tree-select
-                            v-model="form.involveDepartId"
-                            :auth="false"
-                        />
-                    </div>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item
-                    label="核查情况"
-                    prop="checkStatus"
-                    :rules="{
+        >
+          <div style="width: 280px">
+            <depart-tree-select
+                v-model="form.involveDepartId"
+                :auth="false"
+            />
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item
+            label="核查情况"
+            prop="checkStatus"
+            :rules="{
                         required: true,
                         message: '请选择核查情况',
                         trigger: ['blur'],
                     }"
-                >
-                    <el-radio-group
-                        v-model="form.checkStatus"
-                        @change="(val) => handleChangeCheckStatus(val, item)"
-                    >
-                        <el-radio value="1">属实</el-radio>
-                        <el-radio value="2">基本属实</el-radio>
-                        <el-radio value="3">不属实</el-radio>
-                        <el-radio
-                            value="4"
-                            v-if="
+        >
+          <el-radio-group
+              v-model="form.checkStatus"
+              @change="(val) => handleChangeCheckStatus(val, item)"
+          >
+            <el-radio value="1">属实</el-radio>
+            <el-radio value="2">基本属实</el-radio>
+            <el-radio value="3">不属实</el-radio>
+            <el-radio
+                value="4"
+                v-if="
                                 negative.problemSourcesCode ===
                                 ProblemSources.XF12337
                             "
-                            >无法办理</el-radio
-                        >
-                    </el-radio-group>
-                </el-form-item>
-            </el-col>
+            >无法办理
+            </el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
 
-            <el-col :span="12">
-                <el-form-item
-                    label="是否整改"
-                    prop="isRectifyCode"
-                    :rules="{
+      <el-col :span="12">
+        <el-form-item
+            label="是否整改"
+            prop="isRectifyCode"
+            :rules="{
                         required: true,
                         message: '请选择是否整改',
                         trigger: ['blur'],
                     }"
-                    v-if="
+            v-if="
                         problemIsTrue && form.checkStatus !== InspectCase.UNABLE
                     "
-                >
-                    <el-radio-group
-                        v-model="form.isRectifyCode"
-                        @change="
+        >
+          <el-radio-group
+              v-model="form.isRectifyCode"
+              @change="
                             (val) =>
                                 (form.isRectifyName = dict.isRectify.filter(
                                     (item) => item.dictValue === val
                                 )[0].dictLabel)
                         "
-                    >
-                        <el-radio
-                            v-for="item in dict.isRectify"
-                            :key="item.dictCode"
-                            :value="item.dictValue"
-                            >{{ item.dictLabel }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col
-                :span="12"
-                v-if="
+          >
+            <el-radio
+                v-for="item in dict.isRectify"
+                :key="item.dictCode"
+                :value="item.dictValue"
+            >{{ item.dictLabel }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
+      <el-col
+          :span="12"
+          v-if="
                     negative.problemSourcesCode !== ProblemSources.JWDC &&
                     form.checkStatus !== InspectCase.UNABLE
                 "
-            >
-                <el-form-item
-                    label="涉及对象"
-                    prop="accountabilityTarget"
-                    :rules="{
+      >
+        <el-form-item
+            label="涉及对象"
+            prop="accountabilityTarget"
+            :rules="{
                         required: true,
                         message: '请选择追责对象',
                         trigger: ['blur'],
                     }"
-                >
-                    <el-radio-group v-model="form.accountabilityTarget">
-                        <el-radio
-                            v-for="item in dict.accountabilityTarget"
-                            :key="item.dictCode"
-                            :value="item.dictValue"
-                            >{{ item.dictLabel }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col
-                :span="12"
-                v-if="
+        >
+          <el-radio-group v-model="form.accountabilityTarget">
+            <el-radio
+                v-for="item in dict.accountabilityTarget"
+                :key="item.dictCode"
+                :value="item.dictValue"
+            >{{ item.dictLabel }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
+      <el-col
+          :span="12"
+          v-if="
                     problemIsTrue &&
                     form.isRectifyCode === IsRectify.NOT &&
                     form.checkStatus !== InspectCase.UNABLE
                 "
-            >
-                <el-form-item
-                    label="整改限制"
-                    prop="rectifyRestrictionDays"
-                    :rules="{
+      >
+        <el-form-item
+            label="整改限制"
+            prop="rectifyRestrictionDays"
+            :rules="{
                         required: true,
                         message: '请选择整改限制',
                         trigger: ['blur'],
                     }"
-                >
-                    <el-input-number v-model="form.rectifyRestrictionDays" />
-                    <span class="ml-8">天</span>
-                </el-form-item>
-            </el-col>
-        </el-row>
+        >
+          <el-input-number v-model="form.rectifyRestrictionDays"/>
+          <span class="ml-8">天</span>
+        </el-form-item>
+      </el-col>
+    </el-row>
 
-        <el-form-item
-            label="问题核查情况"
-            prop="checkStatusDesc"
-            :rules="{
+    <el-form-item
+        label="问题核查情况"
+        prop="checkStatusDesc"
+        :rules="{
                 required: true,
                 message: '请输入问题核查情况',
                 trigger: ['blur'],
             }"
-        >
-            <el-input
-                type="textarea"
-                placeholder="请输入问题核查情况"
-                v-model="form.checkStatusDesc"
-                :autosize="{ minRows: 4 }"
-            />
-        </el-form-item>
-        <el-form-item
-            label="未整改原因"
-            prop="unrectifyReason"
-            :rules="{
+    >
+      <el-input
+          type="textarea"
+          placeholder="请输入问题核查情况"
+          v-model="form.checkStatusDesc"
+          :autosize="{ minRows: 4 }"
+      />
+    </el-form-item>
+    <el-form-item
+        label="未整改原因"
+        prop="unrectifyReason"
+        :rules="{
                 required: true,
                 message: '请输入未整改原因',
                 trigger: ['blur'],
             }"
-            v-if="
+        v-if="
                 (form.isRectifyCode === '0' || form.isRectifyCode === '2') &&
                 form.checkStatus !== InspectCase.UNABLE
             "
-        >
-            <el-input
-                type="textarea"
-                placeholder="请输入未整改原因"
-                v-model="form.unrectifyReason"
-                :autosize="{ minRows: 4 }"
-            />
-        </el-form-item>
-        <el-form-item
-            label="问题整改情况"
-            prop="rectifyDesc"
-            v-if="problemIsTrue && form.isRectifyCode === InspectCase.TRUE"
-            :rules="{
+    >
+      <el-input
+          type="textarea"
+          placeholder="请输入未整改原因"
+          v-model="form.unrectifyReason"
+          :autosize="{ minRows: 4 }"
+      />
+    </el-form-item>
+    <el-form-item
+        label="问题整改情况"
+        prop="rectifyDesc"
+        v-if="problemIsTrue && form.isRectifyCode === InspectCase.TRUE"
+        :rules="{
                 required: true,
                 message: '请输入问题整改情况',
                 trigger: ['blur'],
             }"
-        >
-            <el-input
-                type="textarea"
-                placeholder="请输入问题整改情况"
-                v-model="form.rectifyDesc"
-                :autosize="{ minRows: 4 }"
-            />
-        </el-form-item>
-        
-        <template v-if="form.checkStatus !== InspectCase.UNABLE">
-            <div
-                v-if="
+    >
+      <el-input
+          type="textarea"
+          placeholder="请输入问题整改情况"
+          v-model="form.rectifyDesc"
+          :autosize="{ minRows: 4 }"
+      />
+    </el-form-item>
+
+    <template v-if="form.checkStatus !== InspectCase.UNABLE">
+      <div
+          v-if="
                     form.accountabilityTarget !==
                     AccountabilityTarget.DEPARTMENT
                 "
-            >
-                <el-form-item
-                    label-position="top"
-                    prop="blames"
-                    :rules="{
+      >
+        <el-form-item
+            label-position="top"
+            prop="blames"
+            :rules="{
                         required: true,
                         message: '请添加涉及人员',
                         trigger: ['change'],
                     }"
-                >
-                    <div
-                        v-for="(item, index) in form.blames.filter(
+        >
+          <div
+              v-for="(item, index) in form.blames.filter(
                             (obj) => obj.type === BlameType.PERSONAL
                         )"
-                        :key="index"
-                    >
-                        <div class="flex v-center">
-                            <h5>
-                                涉及人员{{
-                                    form.blames
-                                        .filter(
-                                            (blame) =>
-                                                blame.type ===
-                                                BlameType.PERSONAL
-                                        )
-                                        .indexOf(item) + 1
-                                }}
-                            </h5>
-                            <el-button
-                                type="danger"
-                                plain
-                                size="small"
-                                @click="handleRemoveBlame(item)"
-                                text
-                                class="ml-10"
-                                >删除
-                            </el-button>
-                        </div>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="涉及人员姓名"
-                                    :prop="`blames.${index}.blameEmpNo`"
-                                    :rules="{
+              :key="index"
+          >
+            <div class="flex v-center">
+              <h5>
+                涉及人员{{
+                  form.blames
+                      .filter(
+                          (blame) =>
+                              blame.type ===
+                              BlameType.PERSONAL
+                      )
+                      .indexOf(item) + 1
+                }}
+              </h5>
+              <el-button
+                  type="danger"
+                  plain
+                  size="small"
+                  @click="handleRemoveBlame(item)"
+                  text
+                  class="ml-10"
+              >删除
+              </el-button>
+            </div>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                    label="涉及人员姓名"
+                    :prop="`blames.${index}.blameEmpNo`"
+                    :rules="{
                                         required: true,
                                         message: '请选择涉及人员',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <police-select
-                                        :host-level="negative.hostLevel"
-                                        :depart-id="
+                >
+                  <police-select
+                      :host-level="negative.hostLevel"
+                      :depart-id="
                                             negative.hostLevel ===
                                             HostLevel.SECOND
                                                 ? negative.handleSecondDepartId
                                                 : negative.handleThreeDepartId
                                         "
-                                        v-model="item.blameEmpNo"
-                                        :disabldKeys="
+                      v-model="item.blameEmpNo"
+                      :disabldKeys="
                                             form.blames
                                                 .filter((obj) => obj.blameEmpNo)
                                                 .map((obj) => obj.blameEmpNo)
                                         "
-                                        @change="
+                      @change="
                                             (police) =>
                                                 handleChangePolice(police, item)
                                         "
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="警号"
-                                    :prop="`blames.${index}.blameEmpNo`"
-                                    :rules="{
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="警号"
+                    :prop="`blames.${index}.blameEmpNo`"
+                    :rules="{
                                         required: true,
                                         message: '请输入警号',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        placeholder="请输入警号"
-                                        v-model="item.blameEmpNo"
-                                        style="width: 240px"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="身份证号码"
-                                    :prop="`blames.${index}.blameIdCode`"
-                                    :rules="{
+                >
+                  <el-input
+                      placeholder="请输入警号"
+                      v-model="item.blameEmpNo"
+                      style="width: 240px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="身份证号码"
+                    :prop="`blames.${index}.blameIdCode`"
+                    :rules="{
                                         required: true,
                                         message: '请输入身份证号码',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        placeholder="请输入身份证号码"
-                                        v-model="item.blameIdCode"
-                                        style="width: 240px"
-                                    />
-                                </el-form-item>
-                            </el-col>
+                >
+                  <el-input
+                      placeholder="请输入身份证号码"
+                      v-model="item.blameIdCode"
+                      style="width: 240px"
+                  />
+                </el-form-item>
+              </el-col>
 
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="人员属性"
-                                    :prop="`blames.${index}.ivPersonTypeCode`"
-                                    :rules="{
+              <el-col :span="12">
+                <el-form-item
+                    label="人员属性"
+                    :prop="`blames.${index}.ivPersonTypeCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择人员属性',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-radio-group
-                                        v-model="item.ivPersonTypeCode"
-                                        @change="
+                >
+                  <el-radio-group
+                      v-model="item.ivPersonTypeCode"
+                      @change="
                                             (val) =>
                                                 (item.ivPersonType =
                                                     dict.personType.filter(
@@ -324,166 +325,166 @@
                                                             val
                                                     )[0].dictLabel)
                                         "
-                                    >
-                                        <el-radio
-                                            v-for="item in dict.personType"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            >{{ item.dictLabel }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-form-item
-                            :prop="`blames.${index}.problems`"
-                            :rules="{
+                  >
+                    <el-radio
+                        v-for="item in dict.personType"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                    >{{ item.dictLabel }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item
+                :prop="`blames.${index}.problems`"
+                :rules="{
                                 required: true,
                                 message: '请添加问题类型',
                                 trigger: ['blur'],
                             }"
-                            v-if="problemIsTrue"
-                            style="margin-bottom: 0"
-                        >
-                            <div
-                                v-for="(problem, j) in item.problems"
-                                :key="j"
-                                style="width: 98%"
-                            >
-                                <el-form-item
-                                    :label="`问题类型${j + 1}`"
-                                    :prop="`blames.${index}.problems.${j}.threeLevelCode`"
-                                    :rules="{
+                v-if="problemIsTrue"
+                style="margin-bottom: 0"
+            >
+              <div
+                  v-for="(problem, j) in item.problems"
+                  :key="j"
+                  style="width: 98%"
+              >
+                <el-form-item
+                    :label="`问题类型${j + 1}`"
+                    :prop="`blames.${index}.problems.${j}.threeLevelCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择问题类型',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <div
-                                        class="flex between"
-                                        style="width: 100%"
-                                    >
-                                        <div class="flex gap">
-                                            <problem-type-select
-                                                v-model="problem.threeLevelCode"
-                                                @change="
+                >
+                  <div
+                      class="flex between"
+                      style="width: 100%"
+                  >
+                    <div class="flex gap">
+                      <problem-type-select
+                          v-model="problem.threeLevelCode"
+                          @change="
                                                     (node) =>
                                                         handleChangeProblem(
                                                             node,
                                                             problem
                                                         )
                                                 "
-                                            />
-                                            <div style="width: 140px">
-                                                <el-form-item
-                                                    label-position="top"
-                                                    :prop="`blames.${index}.problems.${j}.threeLevelContentOther`"
-                                                    :rules="{
+                      />
+                      <div style="width: 140px">
+                        <el-form-item
+                            label-position="top"
+                            :prop="`blames.${index}.problems.${j}.threeLevelContentOther`"
+                            :rules="{
                                                         required: true,
                                                         message: '请输入',
                                                         trigger: ['blur'],
                                                     }"
-                                                    style="margin-bottom: 0"
-                                                    v-if="
+                            style="margin-bottom: 0"
+                            v-if="
                                                         problem.threeLevelContent ===
                                                         '其他'
                                                     "
-                                                >
-                                                    <el-input
-                                                        placeholder="其他类型详细描述"
-                                                        v-model="
+                        >
+                          <el-input
+                              placeholder="其他类型详细描述"
+                              v-model="
                                                             problem.threeLevelContentOther
                                                         "
-                                                    />
-                                                </el-form-item>
-                                            </div>
-                                            <div>
+                          />
+                        </el-form-item>
+                      </div>
+                      <div>
                                                 <span>{{
                                                     problem.oneLevelContent
                                                         ? problem.oneLevelContent +
-                                                          " / "
-                                                        : ""
-                                                }}</span>
-                                                <span>{{
-                                                    problem.twoLevelContent
-                                                        ? problem.twoLevelContent +
-                                                          " / "
+                                                        " / "
                                                         : ""
-                                                }}</span>
-                                                <span>{{
-                                                    problem.threeLevelContent
-                                                }}</span>
-                                            </div>
-                                        </div>
+                                                  }}</span>
+                        <span>{{
+                            problem.twoLevelContent
+                                ? problem.twoLevelContent +
+                                " / "
+                                : ""
+                          }}</span>
+                        <span>{{
+                            problem.threeLevelContent
+                          }}</span>
+                      </div>
+                    </div>
 
-                                        <div class="flex center v-center">
-                                            <el-button
-                                                type="danger"
-                                                plain
-                                                @click="
+                    <div class="flex center v-center">
+                      <el-button
+                          type="danger"
+                          plain
+                          @click="
                                                     item.problems.splice(j, 1)
                                                 "
-                                                v-if="j !== 0"
-                                                size="small"
-                                            >
-                                                <template #icon>
-                                                    <icon
-                                                        name="el-icon-Delete"
-                                                    />
-                                                </template>
-                                                删除问题
-                                            </el-button>
-                                            <el-button
-                                                @click="handleAddProblem(item)"
-                                                plain
-                                                type="primary"
-                                                v-if="j === 0"
-                                                size="small"
-                                            >
-                                                <template #icon>
-                                                    <icon name="el-icon-Plus" />
-                                                </template>
-                                                添加问题
-                                            </el-button>
-                                        </div>
-                                    </div>
-                                </el-form-item>
-                            </div>
-                            <div
-                                class="flex center"
-                                style="width: 100%"
-                                v-if="
+                          v-if="j !== 0"
+                          size="small"
+                      >
+                        <template #icon>
+                          <icon
+                              name="el-icon-Delete"
+                          />
+                        </template>
+                        删除问题
+                      </el-button>
+                      <el-button
+                          @click="handleAddProblem(item)"
+                          plain
+                          type="primary"
+                          v-if="j === 0"
+                          size="small"
+                      >
+                        <template #icon>
+                          <icon name="el-icon-Plus"/>
+                        </template>
+                        添加问题
+                      </el-button>
+                    </div>
+                  </div>
+                </el-form-item>
+              </div>
+              <div
+                  class="flex center"
+                  style="width: 100%"
+                  v-if="
                                     !item.problems || item.problems.length === 0
                                 "
-                            >
-                                <el-button
-                                    @click="handleAddProblem(item)"
-                                    plain
-                                    type="primary"
-                                    size="small"
-                                >
-                                    <template #icon>
-                                        <icon name="el-icon-Plus" />
-                                    </template>
-                                    添加问题
-                                </el-button>
-                            </div>
-                        </el-form-item>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="责任类别"
-                                    :prop="`blames.${index}.responsibilityTypeCode`"
-                                    :rules="{
+              >
+                <el-button
+                    @click="handleAddProblem(item)"
+                    plain
+                    type="primary"
+                    size="small"
+                >
+                  <template #icon>
+                    <icon name="el-icon-Plus"/>
+                  </template>
+                  添加问题
+                </el-button>
+              </div>
+            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                    label="责任类别"
+                    :prop="`blames.${index}.responsibilityTypeCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择责任类别',
                                         trigger: ['blur'],
                                     }"
-                                    v-if="problemIsTrue"
-                                >
-                                    <el-radio-group
-                                        v-model="item.responsibilityTypeCode"
-                                        @change="
+                    v-if="problemIsTrue"
+                >
+                  <el-radio-group
+                      v-model="item.responsibilityTypeCode"
+                      @change="
                                             (val) =>
                                                 (item.responsibilityTypeName =
                                                     dict.responsibilityType.filter(
@@ -492,153 +493,154 @@
                                                             val
                                                     )[0].dictLabel)
                                         "
-                                    >
-                                        <el-radio
-                                            v-for="item in dict.responsibilityType"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            >{{ item.dictLabel }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12" v-if="problemIsTrue">
-                                <el-form-item
-                                    label="主观方面"
-                                    :prop="`blames.${index}.subjectiveAspectCode`"
-                                    :rules="{
+                  >
+                    <el-radio
+                        v-for="item in dict.responsibilityType"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                    >{{ item.dictLabel }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="problemIsTrue">
+                <el-form-item
+                    label="主观方面"
+                    :prop="`blames.${index}.subjectiveAspectCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择主观方面',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <div class="flex gap v-center">
-                                        <el-radio-group
-                                            v-model="item.subjectiveAspectCode"
-                                            @change="
+                >
+                  <div class="flex gap v-center">
+                    <el-radio-group
+                        v-model="item.subjectiveAspectCode"
+                        @change="
                                                 (val) =>
                                                     handleChangeSubjectiveAspect(
                                                         val,
                                                         item
                                                     )
                                             "
-                                        >
-                                            <el-radio
-                                                v-for="item in dict.subjectiveAspect"
-                                                :key="item.dictCode"
-                                                :value="item.dictValue"
-                                                >{{ item.dictLabel }}
-                                            </el-radio>
-                                        </el-radio-group>
-                                        <el-form-item
-                                            :prop="`blames.${index}.subjectiveAspectName`"
-                                            :rules="{
+                    >
+                      <el-radio
+                          v-for="item in dict.subjectiveAspect"
+                          :key="item.dictCode"
+                          :value="item.dictValue"
+                      >{{ item.dictLabel }}
+                      </el-radio>
+                    </el-radio-group>
+                    <el-form-item
+                        :prop="`blames.${index}.subjectiveAspectName`"
+                        :rules="{
                                                 required: true,
                                                 message: '其他主观方面不能为空',
                                                 trigger: ['blur'],
                                             }"
-                                            v-if="
+                        v-if="
                                                 item.subjectiveAspectCode ===
                                                 SubjectiveAspect.OTHER
                                             "
-                                            style="margin-bottom: 0"
-                                            class="ml-20"
-                                        >
-                                            <el-input
-                                                v-model="
+                        style="margin-bottom: 0"
+                        class="ml-20"
+                    >
+                      <el-input
+                          v-model="
                                                     item.subjectiveAspectName
                                                 "
-                                                placeholder="请输入其他主观方面"
-                                                style="width: 160px"
-                                            />
-                                        </el-form-item>
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12" v-if="problemIsTrue">
-                                <el-form-item
-                                    label="处理结果"
-                                    :prop="`blames.${index}.handleResultCode`"
-                                    :rules="{
+                          placeholder="请输入其他主观方面"
+                          style="width: 160px"
+                      />
+                    </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="problemIsTrue">
+                <el-form-item
+                    label="处理结果"
+                    :prop="`blames.${index}.handleResultCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择处理结果',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-select
-                                        v-model="item.handleResultCode"
-                                        style="width: 240px"
-                                        multiple
-                                        @change="
+                >
+                  <el-select
+                      v-model="item.handleResultCode"
+                      style="width: 240px"
+                      multiple
+                      @change="
                                             (val) =>
                                                 handleChangeResultCode(
                                                     item,
                                                     val
                                                 )
                                         "
-                                        clearable
-                                    >
-                                        <el-option
-                                            v-for="dictItem in dict.handleResult"
-                                            :key="dictItem.dictCode"
-                                            :value="dictItem.dictValue"
-                                            :label="dictItem.dictLabel"
-                                        />
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col
-                                :span="12"
-                                v-if="item.leadHandleResultCode?.includes('11')"
-                            >
-                                <el-form-item
-                                    label="其他处理结果"
-                                    :prop="`blames.${index}.leadHandleResultNameOther`"
-                                    :rules="{
+                      clearable
+                  >
+                    <el-option
+                        v-for="dictItem in dict.handleResult"
+                        :key="dictItem.dictCode"
+                        :value="dictItem.dictValue"
+                        :label="dictItem.dictLabel"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col
+                  :span="12"
+                  v-if="item.leadHandleResultCode?.includes('11')"
+              >
+                <el-form-item
+                    label="其他处理结果"
+                    :prop="`blames.${index}.leadHandleResultNameOther`"
+                    :rules="{
                                         required: true,
                                         message: '请选择处理结果',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        v-model="item.leadHandleResultNameOther"
-                                        placeholder="其他类型详细描述"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col
-                                :span="12"
-                                v-if="item.handleResultCode?.includes('11')"
-                            >
-                                <el-form-item
-                                    label="其他处理结果"
-                                    :prop="`blames.${index}.handleResultCode`"
-                                    :rules="{
+                >
+                  <el-input
+                      v-model="item.leadHandleResultNameOther"
+                      placeholder="其他类型详细描述"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col
+                  :span="12"
+                  v-if="item.handleResultCode?.includes('11')"
+              >
+                <el-form-item
+                    label="其他处理结果"
+                    :prop="`blames.${index}.handleResultCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择处理结果',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        v-model="item.handleResultNameOther"
-                                        placeholder="其他类型详细描述"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <template v-if="problemIsTrue">
-                                
-                                <el-col :span="12">
-                                    <el-form-item
-                                        label="维权容错"
-                                        :prop="`blames.${index}.protectRightsCode`"
-                                        v-if="
+                >
+                  <el-input
+                      v-model="item.handleResultNameOther"
+                      placeholder="其他类型详细描述"
+                  />
+                </el-form-item>
+              </el-col>
+              <template v-if="problemIsTrue">
+
+                <el-col :span="12">
+                  <el-form-item
+                      label="维权容错"
+                      :prop="`blames.${index}.protectRightsCode`"
+                      v-if="
                                             negative.problemSourcesCode !==
                                             ProblemSources.JWDC
                                         "
-                                    >
-                                        <el-radio-group
-                                            v-model="item.protectRightsCode"
-                                            @change="
+                  >
+                    <el-radio-group
+                        v-model="item.protectRightsCode"
+                        @change="
                                                 (val) =>
                                                     (item.protectRightsName =
                                                         dict.protectRights.filter(
@@ -647,30 +649,31 @@
                                                                 val
                                                         )[0].dictLabel)
                                             "
-                                        >
-                                            <el-radio
-                                                v-for="item in dict.protectRights"
-                                                :key="item.dictCode"
-                                                :value="item.dictValue"
-                                                >{{ item.dictLabel }}
-                                            </el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item
-                                        label="督察措施"
-                                        :prop="`blames[${index}].superviseMeasuresCode`"
-                                    >
-                                        <el-radio-group
-                                            v-model="item.superviseMeasuresCode"
-                                            clearabled
-                                        >
-                                            <el-radio
-                                                v-for="dictItem in dict.superviseMeasures"
-                                                :key="dictItem.dictCode"
-                                                :value="dictItem.dictValue"
-                                                @click.native.prevent="
+                    >
+                      <el-radio
+                          v-for="item in dict.protectRights"
+                          :key="item.dictCode"
+                          :value="item.dictValue"
+                      >{{ item.dictLabel }}
+                      </el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item
+                      label="督察措施"
+                      :prop="`blames[${index}].superviseMeasuresCode`"
+                  >
+                    <el-radio-group
+                        v-model="item.superviseMeasuresCode"
+                        clearabled
+                    >
+                      <el-radio
+                          v-for="dictItem in dict.superviseMeasures"
+                          :key="dictItem.dictCode"
+                          :value="dictItem.dictValue"
+                          @click.native.prevent="
                                                     () => {
                                                         if (
                                                             item.superviseMeasuresCode ===
@@ -688,82 +691,118 @@
                                                         }
                                                     }
                                                 "
-                                                >{{ dictItem.dictLabel }}
-                                            </el-radio>
-                                        </el-radio-group>
-                                    </el-form-item>
-                                </el-col>
-                            </template>
-                            
+                      >{{ dictItem.dictLabel }}
+                      </el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+              </template>
+            </el-row>
+            <el-row>
+              <el-col>
+                <el-form-item label="禁闭关联">
+                  <el-select v-model="item.confinementId" filterable popper-class="widthClass"  :filter-method="fileConfinement">
+                    <template #header>
+                        <el-row>
+                          <el-col :span="2">姓名</el-col>
+                          <el-col :span="2">警号</el-col>
+                          <el-col :span="3">部门</el-col>
+                          <el-col :span="8">事由</el-col>
+                          <el-col :span="4">禁闭时间</el-col>
                         </el-row>
-                    </div>
-                    <div class="flex center" style="width: 100%">
-                        <el-button
-                            type="primary"
-                            plain
-                            @click="handleAddPersonalBlame"
-                        >
-                            <template #icon>
-                                <icon name="el-icon-Plus" />
-                            </template>
-                            添加涉及人员
-                        </el-button>
-                    </div>
+                    </template>
+                    <el-option v-for="(val,key) in confinementOpens" :key="key" :label="val.matter" :value="val.id">
+                      <el-row>
+                        <el-col :span="2">{{ val.name }}</el-col>
+                        <el-col :span="2">{{ val.empNo }}</el-col>
+                        <el-col :span="3">
+                          <div class="flex gap-4">
+                            <span>{{ val.departShortName ||'/' }}</span>
+                          </div>
+                        </el-col>
+                        <el-col :span="8">
+                          <el-tooltip :content="val.matter" placement="top">
+                            <el-text truncated> {{val.matter}}</el-text>
+                          </el-tooltip>
+                        </el-col>
+                        <el-col :span="4">
+                          {{val.startTime + "-" +val.endTime}}
+                        </el-col>
+                      </el-row>
+                    </el-option>
+
+                  </el-select>
                 </el-form-item>
-                <el-divider />
-                <el-form-item
-                    label-position="top"
-                    prop="blameLeaders"
-                    :rules="{
+              </el-col>
+            </el-row>
+          </div>
+          <div class="flex center" style="width: 100%">
+            <el-button
+                type="primary"
+                plain
+                @click="handleAddPersonalBlame"
+            >
+              <template #icon>
+                <icon name="el-icon-Plus"/>
+              </template>
+              添加涉及人员
+            </el-button>
+          </div>
+        </el-form-item>
+        <el-divider/>
+        <el-form-item
+            label-position="top"
+            prop="blameLeaders"
+            :rules="{
                         required: true,
                         message: '请添加涉及领导',
                     }"
-                >
-                    <div
-                        v-for="(item, index) in form.blameLeaders"
-                        :key="index"
-                    >
-                        <div class="flex v-center">
-                            <h5>涉及领导{{ index + 1 }}</h5>
-                            <el-button
-                                type="danger"
-                                plain
-                                size="small"
-                                @click="handleRemoveBlameLeader(index)"
-                                text
-                                class="ml-10"
-                                >删除
-                            </el-button>
-                        </div>
+        >
+          <div
+              v-for="(item, index) in form.blameLeaders"
+              :key="index"
+          >
+            <div class="flex v-center">
+              <h5>涉及领导{{ index + 1 }}</h5>
+              <el-button
+                  type="danger"
+                  plain
+                  size="small"
+                  @click="handleRemoveBlameLeader(index)"
+                  text
+                  class="ml-10"
+              >删除
+              </el-button>
+            </div>
 
-                        <el-row style="background: #f9faff">
-                            <el-col :span="24">
-                                <el-form-item
-                                    label="关联涉及人员"
-                                    :prop="`blameLeaders.${index}.blameIdCodes`"
-                                    :rules="{
+            <el-row style="background: #f9faff">
+              <el-col :span="24">
+                <el-form-item
+                    label="关联涉及人员"
+                    :prop="`blameLeaders.${index}.blameIdCodes`"
+                    :rules="{
                                         required: true,
                                         message: '请选择涉及领导关联的涉及人员',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-checkbox
-                                        border
-                                        v-for="(obj, j) in form.blames.filter(
+                >
+                  <el-checkbox
+                      border
+                      v-for="(obj, j) in form.blames.filter(
                                             (obj) =>
                                                 obj.type ===
                                                     BlameType.PERSONAL &&
                                                 obj.blameIdCode
                                         )"
-                                        :key="obj.blameIdCode"
-                                        :label="obj.blameName"
-                                        :value="obj.blameIdCode"
-                                        :checked="
+                      :key="obj.blameIdCode"
+                      :label="obj.blameName"
+                      :value="obj.blameIdCode"
+                      :checked="
                                             item.blameIdCodes.includes(
                                                 obj.blameIdCode
                                             )
                                         "
-                                        @change="
+                      @change="
                                             (bool) =>
                                                 handleCheckboxChange(
                                                     item,
@@ -771,88 +810,88 @@
                                                     obj.blameIdCode
                                                 )
                                         "
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="涉及领导姓名"
-                                    :prop="`blameLeaders.${index}.leadName`"
-                                    :rules="{
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="涉及领导姓名"
+                    :prop="`blameLeaders.${index}.leadName`"
+                    :rules="{
                                         required: true,
                                         message: '请选择涉及领导',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <police-select
-                                        :host-level="negative.hostLevel"
-                                        :depart-id="
+                >
+                  <police-select
+                      :host-level="negative.hostLevel"
+                      :depart-id="
                                             negative.hostLevel ===
                                             HostLevel.SECOND
                                                 ? negative.handleSecondDepartId
                                                 : negative.handleThreeDepartId
                                         "
-                                        v-model="item.leadEmpNo"
-                                        @change="
+                      v-model="item.leadEmpNo"
+                      @change="
                                             (police) => {
                                                 item.leadName = police.name;
                                                 item.leadIdCode = police.idCode;
                                             }
                                         "
-                                        :isLeader="true"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="警号"
-                                    :prop="`blameLeaders.${index}.leadEmpNo`"
-                                    :rules="{
+                      :isLeader="true"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="警号"
+                    :prop="`blameLeaders.${index}.leadEmpNo`"
+                    :rules="{
                                         required: true,
                                         message: '请输入警号',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        placeholder="请输入警号"
-                                        v-model="item.leadEmpNo"
-                                        style="width: 240px"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="身份证号码"
-                                    :prop="`blameLeaders.${index}.leadIdCode`"
-                                    :rules="{
+                >
+                  <el-input
+                      placeholder="请输入警号"
+                      v-model="item.leadEmpNo"
+                      style="width: 240px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="身份证号码"
+                    :prop="`blameLeaders.${index}.leadIdCode`"
+                    :rules="{
                                         required: true,
                                         message: '请输入身份证号码',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        placeholder="请输入身份证号码"
-                                        style="width: 240px"
-                                        v-model="item.leadIdCode"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="责任类别"
-                                    :prop="`blameLeaders.${index}.leadResponsibilityTypeCode`"
-                                    :rules="{
+                >
+                  <el-input
+                      placeholder="请输入身份证号码"
+                      style="width: 240px"
+                      v-model="item.leadIdCode"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="责任类别"
+                    :prop="`blameLeaders.${index}.leadResponsibilityTypeCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择责任类别',
                                         trigger: ['blur'],
                                     }"
-                                    v-if="problemIsTrue"
-                                >
-                                    <el-radio-group
-                                        v-model="
+                    v-if="problemIsTrue"
+                >
+                  <el-radio-group
+                      v-model="
                                             item.leadResponsibilityTypeCode
                                         "
-                                        @change="
+                      @change="
                                             (val) =>
                                                 (item.leadResponsibilityTypeName =
                                                     dict.leadResponsibilityType.filter(
@@ -861,178 +900,217 @@
                                                             val
                                                     )[0].dictLabel)
                                         "
-                                    >
-                                        <el-radio
-                                            v-for="item in dict.leadResponsibilityType"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            >{{ item.dictLabel }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
+                  >
+                    <el-radio
+                        v-for="item in dict.leadResponsibilityType"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                    >{{ item.dictLabel }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
 
-                            
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="处理结果"
-                                    :prop="`blameLeaders.${index}.leadHandleResultCode`"
-                                    :rules="{
+
+              <el-col :span="12">
+                <el-form-item
+                    label="处理结果"
+                    :prop="`blameLeaders.${index}.leadHandleResultCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择处理结果',
                                         trigger: ['blur'],
                                     }"
-                                    v-if="problemIsTrue"
-                                >
-                                    <el-select
-                                        v-model="item.leadHandleResultCode"
-                                        style="width: 240px"
-                                        @change="
+                    v-if="problemIsTrue"
+                >
+                  <el-select
+                      v-model="item.leadHandleResultCode"
+                      style="width: 240px"
+                      @change="
                                             (val) =>
                                                 handleChangeLeadResultCode(
                                                     item,
                                                     val
                                                 )
                                         "
-                                        clearable
-                                        multiple
-                                    >
-                                        <el-option
-                                            v-for="item in dict.handleResult"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            :label="item.dictLabel"
-                                        />
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col
-                                :span="12"
-                                v-if="item.leadHandleResultCode?.includes('11')"
-                            >
-                                <el-form-item
-                                    label="其他处理结果"
-                                    :prop="`blames.${index}.leadHandleResultNameOther`"
-                                    :rules="{
+                      clearable
+                      multiple
+                  >
+                    <el-option
+                        v-for="item in dict.handleResult"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                        :label="item.dictLabel"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                  <el-form-item label="禁闭关联">
+                    <el-select
+                        filterable
+                        :filter-method="fileConfinement"
+                        :prop="`blameLeaders.${index}.leadonfinementId`"
+                         popper-class="widthClass" >
+                      <template #header>
+                        <el-row>
+                          <el-col :span="2">姓名</el-col>
+                          <el-col :span="2">警号</el-col>
+                          <el-col :span="3">部门</el-col>
+                          <el-col :span="8">事由</el-col>
+                          <el-col :span="4">禁闭时间</el-col>
+                        </el-row>
+                      </template>
+                      <el-option v-for="(val,key) in confinementOpens" :key="key" :label="val.matter" :value="val.id">
+                        <el-row>
+                          <el-col :span="2">{{ val.name }}</el-col>
+                          <el-col :span="2">{{ val.empNo }}</el-col>
+                          <el-col :span="3">
+                            <div class="flex gap-4">
+                              <span>{{ val.departShortName ||'/' }}</span>
+                            </div>
+                          </el-col>
+                          <el-col :span="8">
+                            <el-tooltip :content="val.matter" placement="top">
+                              <el-text truncated> {{val.matter}}</el-text>
+                            </el-tooltip>
+                          </el-col>
+                          <el-col :span="4">
+                            {{val.startTime + "-" +val.endTime}}
+                          </el-col>
+                        </el-row>
+                      </el-option>
+
+                    </el-select>
+                  </el-form-item>
+              </el-col>
+              <el-col
+                  :span="12"
+                  v-if="item.leadHandleResultCode?.includes('11')"
+              >
+                <el-form-item
+                    label="其他处理结果"
+                    :prop="`blames.${index}.leadHandleResultNameOther`"
+                    :rules="{
                                         required: true,
                                         message: '请选择处理结果',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        v-model="item.leadHandleResultNameOther"
-                                        placeholder="其他类型详细描述"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </div>
-                    <div
-                        class="flex center"
-                        style="width: 100%"
-                        v-if="
+                >
+                  <el-input
+                      v-model="item.leadHandleResultNameOther"
+                      placeholder="其他类型详细描述"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div
+              class="flex center"
+              style="width: 100%"
+              v-if="
                             form.accountabilityTarget !==
                             AccountabilityTarget.DEPARTMENT
                         "
-                    >
-                        <el-button
-                            type="primary"
-                            plain
-                            @click="handleAddBlameLeader"
-                        >
-                            <template #icon>
-                                <icon name="el-icon-Plus" />
-                            </template>
-                            添加涉及领导
-                        </el-button>
-                    </div>
-                </el-form-item>
-            </div>
-            <el-form-item
-                label-position="top"
-                v-if="
+          >
+            <el-button
+                type="primary"
+                plain
+                @click="handleAddBlameLeader"
+            >
+              <template #icon>
+                <icon name="el-icon-Plus"/>
+              </template>
+              添加涉及领导
+            </el-button>
+          </div>
+        </el-form-item>
+      </div>
+      <el-form-item
+          label-position="top"
+          v-if="
                     form.accountabilityTarget !== AccountabilityTarget.PERSONAL
                 "
-            >
-                <div v-for="(item, index) in form.blames" :key="index">
-                    <template v-if="item.type === BlameType.DEPARTMENT">
-                        <div class="flex between v-center">
-                            <h5>涉及单位</h5>
-                        </div>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="涉及班子成员"
-                                    :prop="`blames.${index}.blameEmpNo`"
-                                    :rules="{
+      >
+        <div v-for="(item, index) in form.blames" :key="index">
+          <template v-if="item.type === BlameType.DEPARTMENT">
+            <div class="flex between v-center">
+              <h5>涉及单位</h5>
+            </div>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                    label="涉及班子成员"
+                    :prop="`blames.${index}.blameEmpNo`"
+                    :rules="{
                                         required: true,
                                         message: '请选择涉及班子成员',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <police-select
-                                        :host-level="negative.hostLevel"
-                                        :depart-id="
+                >
+                  <police-select
+                      :host-level="negative.hostLevel"
+                      :depart-id="
                                             negative.hostLevel ===
                                             HostLevel.SECOND
                                                 ? negative.handleSecondDepartId
                                                 : negative.handleThreeDepartId
                                         "
-                                        v-model="item.blameEmpNo"
-                                        @change="
+                      v-model="item.blameEmpNo"
+                      @change="
                                             (police) => {
                                                 item.blameName = police.name;
                                                 item.blameIdCode =
                                                     police.idCode;
                                             }
                                         "
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="身份证号码"
-                                    :prop="`blames.${index}.blameIdCode`"
-                                    :rules="{
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="身份证号码"
+                    :prop="`blames.${index}.blameIdCode`"
+                    :rules="{
                                         required: true,
                                         message: '请输入身份证号码',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-input
-                                        placeholder="请输入身份证号码"
-                                        v-model="item.blameIdCode"
-                                        style="width: 240px"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="人员属性"
-                                    :prop="`blames.${index}.ivPersonTypeCode`"
-                                    :rules="{
+                >
+                  <el-input
+                      placeholder="请输入身份证号码"
+                      v-model="item.blameIdCode"
+                      style="width: 240px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="人员属性"
+                    :prop="`blames.${index}.ivPersonTypeCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择人员属性',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-radio-group
-                                        v-model="item.ivPersonTypeCode"
-                                    >
-                                        <el-radio :value="PersonType.POLICE"
-                                            >民警
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12" v-if="problemIsTrue">
-                                <el-form-item
-                                    label="督察措施"
-                                    :prop="`blames.${index}.superviseMeasuresCode`"
-                                >
-                                    <el-radio-group
-                                        v-model="item.superviseMeasuresCode"
-                                        @change="
+                >
+                  <el-radio-group
+                      v-model="item.ivPersonTypeCode"
+                  >
+                    <el-radio :value="PersonType.POLICE"
+                    >民警
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="problemIsTrue">
+                <el-form-item
+                    label="督察措施"
+                    :prop="`blames.${index}.superviseMeasuresCode`"
+                >
+                  <el-radio-group
+                      v-model="item.superviseMeasuresCode"
+                      @change="
                                             (val) =>
                                                 (item.superviseMeasuresName =
                                                     dict.superviseMeasures.filter(
@@ -1041,12 +1119,12 @@
                                                             val
                                                     )[0].dictLabel)
                                         "
-                                    >
-                                        <el-radio
-                                            v-for="dictItem in dict.superviseMeasures"
-                                            :key="dictItem.dictCode"
-                                            :value="dictItem.dictValue"
-                                            @click.native.prevent="
+                  >
+                    <el-radio
+                        v-for="dictItem in dict.superviseMeasures"
+                        :key="dictItem.dictCode"
+                        :value="dictItem.dictValue"
+                        @click.native.prevent="
                                                 () => {
                                                     if (
                                                         item.superviseMeasuresCode ===
@@ -1064,161 +1142,161 @@
                                                     }
                                                 }
                                             "
-                                            >{{ dictItem.dictLabel }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-form-item
-                            :prop="`blames.${index}.problems`"
-                            :rules="{
+                    >{{ dictItem.dictLabel }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item
+                :prop="`blames.${index}.problems`"
+                :rules="{
                                 required: true,
                                 message: '请添加问题类型',
                                 trigger: ['blur'],
                             }"
-                            v-if="problemIsTrue"
-                            style="margin-bottom: 0"
-                        >
-                            <div
-                                v-for="(problem, j) in item.problems"
-                                :key="j"
-                                style="width: 98%"
-                            >
-                                <el-form-item
-                                    :label="`问题类型${j + 1}`"
-                                    :prop="`blames.${index}.problems.${j}.threeLevelCode`"
-                                    :rules="{
+                v-if="problemIsTrue"
+                style="margin-bottom: 0"
+            >
+              <div
+                  v-for="(problem, j) in item.problems"
+                  :key="j"
+                  style="width: 98%"
+              >
+                <el-form-item
+                    :label="`问题类型${j + 1}`"
+                    :prop="`blames.${index}.problems.${j}.threeLevelCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择问题类型',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <div
-                                        class="flex between"
-                                        style="width: 100%"
-                                    >
-                                        <div class="flex gap">
-                                            <problem-type-select
-                                                v-model="problem.threeLevelCode"
-                                                @change="
+                >
+                  <div
+                      class="flex between"
+                      style="width: 100%"
+                  >
+                    <div class="flex gap">
+                      <problem-type-select
+                          v-model="problem.threeLevelCode"
+                          @change="
                                                     (node) =>
                                                         handleChangeProblem(
                                                             node,
                                                             problem
                                                         )
                                                 "
-                                            />
-                                            <div style="width: 140px">
-                                                <el-form-item
-                                                    label-position="top"
-                                                    :prop="`blames.${index}.problems.${j}.threeLevelContentOther`"
-                                                    :rules="{
+                      />
+                      <div style="width: 140px">
+                        <el-form-item
+                            label-position="top"
+                            :prop="`blames.${index}.problems.${j}.threeLevelContentOther`"
+                            :rules="{
                                                         required: true,
                                                         message: '请输入',
                                                         trigger: ['blur'],
                                                     }"
-                                                    style="margin-bottom: 0"
-                                                    v-if="
+                            style="margin-bottom: 0"
+                            v-if="
                                                         problem.threeLevelContent ===
                                                         '其他'
                                                     "
-                                                >
-                                                    <el-input
-                                                        placeholder="其他类型详细描述"
-                                                        v-model="
+                        >
+                          <el-input
+                              placeholder="其他类型详细描述"
+                              v-model="
                                                             problem.threeLevelContentOther
                                                         "
-                                                    />
-                                                </el-form-item>
-                                            </div>
-                                            <div>
+                          />
+                        </el-form-item>
+                      </div>
+                      <div>
                                                 <span>{{
                                                     problem.oneLevelContent
                                                         ? problem.oneLevelContent +
-                                                          " / "
+                                                        " / "
                                                         : ""
-                                                }}</span>
-                                                <span>{{
-                                                    problem.twoLevelContent
-                                                        ? problem.twoLevelContent +
-                                                          " / "
-                                                        : ""
-                                                }}</span>
-                                                <span>{{
-                                                    problem.threeLevelContent
-                                                }}</span>
-                                            </div>
-                                        </div>
+                                                  }}</span>
+                        <span>{{
+                            problem.twoLevelContent
+                                ? problem.twoLevelContent +
+                                " / "
+                                : ""
+                          }}</span>
+                        <span>{{
+                            problem.threeLevelContent
+                          }}</span>
+                      </div>
+                    </div>
 
-                                        <div class="flex center v-center">
-                                            <el-button
-                                                type="danger"
-                                                plain
-                                                @click="
+                    <div class="flex center v-center">
+                      <el-button
+                          type="danger"
+                          plain
+                          @click="
                                                     item.problems.splice(j, 1)
                                                 "
-                                                v-if="j !== 0"
-                                                size="small"
-                                            >
-                                                <template #icon>
-                                                    <icon
-                                                        name="el-icon-Delete"
-                                                    />
-                                                </template>
-                                                删除问题
-                                            </el-button>
-                                            <el-button
-                                                @click="handleAddProblem(item)"
-                                                plain
-                                                type="primary"
-                                                v-if="j === 0"
-                                                size="small"
-                                            >
-                                                <template #icon>
-                                                    <icon name="el-icon-Plus" />
-                                                </template>
-                                                添加问题
-                                            </el-button>
-                                        </div>
-                                    </div>
-                                    <div
-                                        class="flex center"
-                                        style="width: 100%"
-                                        v-if="
+                          v-if="j !== 0"
+                          size="small"
+                      >
+                        <template #icon>
+                          <icon
+                              name="el-icon-Delete"
+                          />
+                        </template>
+                        删除问题
+                      </el-button>
+                      <el-button
+                          @click="handleAddProblem(item)"
+                          plain
+                          type="primary"
+                          v-if="j === 0"
+                          size="small"
+                      >
+                        <template #icon>
+                          <icon name="el-icon-Plus"/>
+                        </template>
+                        添加问题
+                      </el-button>
+                    </div>
+                  </div>
+                  <div
+                      class="flex center"
+                      style="width: 100%"
+                      v-if="
                                             !item.problems ||
                                             item.problems.length === 0
                                         "
-                                    >
-                                        <el-button
-                                            @click="handleAddProblem(item)"
-                                            plain
-                                            type="primary"
-                                            size="small"
-                                        >
-                                            <template #icon>
-                                                <icon name="el-icon-Plus" />
-                                            </template>
-                                            添加问题
-                                        </el-button>
-                                    </div>
-                                </el-form-item>
-                            </div>
-                        </el-form-item>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="主观方面"
-                                    :prop="`blames.${index}.subjectiveAspectCode`"
-                                    :rules="{
+                  >
+                    <el-button
+                        @click="handleAddProblem(item)"
+                        plain
+                        type="primary"
+                        size="small"
+                    >
+                      <template #icon>
+                        <icon name="el-icon-Plus"/>
+                      </template>
+                      添加问题
+                    </el-button>
+                  </div>
+                </el-form-item>
+              </div>
+            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                    label="主观方面"
+                    :prop="`blames.${index}.subjectiveAspectCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择主观方面',
                                         trigger: ['blur'],
                                     }"
-                                >
-                                    <el-radio-group
-                                        v-model="item.subjectiveAspectCode"
-                                        @change="
+                >
+                  <el-radio-group
+                      v-model="item.subjectiveAspectCode"
+                      @change="
                                             (val) =>
                                                 (item.subjectiveAspectName =
                                                     dict.subjectiveAspect.filter(
@@ -1227,31 +1305,31 @@
                                                             val
                                                     )[0].dictLabel)
                                         "
-                                    >
-                                        <el-radio
-                                            v-for="item in dict.subjectiveAspect"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            >{{ item.dictLabel }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
+                  >
+                    <el-radio
+                        v-for="item in dict.subjectiveAspect"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                    >{{ item.dictLabel }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
 
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="责任类别"
-                                    :prop="`blames.${index}.responsibilityTypeCode`"
-                                    :rules="{
+              <el-col :span="12">
+                <el-form-item
+                    label="责任类别"
+                    :prop="`blames.${index}.responsibilityTypeCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择责任类别',
                                         trigger: ['blur'],
                                     }"
-                                    v-if="problemIsTrue"
-                                >
-                                    <el-radio-group
-                                        v-model="item.responsibilityTypeCode"
-                                        @change="
+                    v-if="problemIsTrue"
+                >
+                  <el-radio-group
+                      v-model="item.responsibilityTypeCode"
+                      @change="
                                             (val) =>
                                                 (item.responsibilityTypeName =
                                                     dict.responsibilityType.filter(
@@ -1260,590 +1338,635 @@
                                                             val
                                                     )[0].dictLabel)
                                         "
-                                    >
-                                        <el-radio
-                                            v-for="item in dict.responsibilityType"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            >{{ item.dictLabel }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label="处理结果"
-                                    :prop="`blames.${index}.handleResultCode`"
-                                    :rules="{
+                  >
+                    <el-radio
+                        v-for="item in dict.responsibilityType"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                    >{{ item.dictLabel }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                    label="处理结果"
+                    :prop="`blames.${index}.handleResultCode`"
+                    :rules="{
                                         required: true,
                                         message: '请选择处理结果',
                                         trigger: ['blur'],
                                     }"
-                                    v-if="problemIsTrue"
-                                >
-                                    <el-select
-                                        v-model="item.handleResultCode"
-                                        style="width: 240px"
-                                        @change="
+                    v-if="problemIsTrue"
+                >
+                  <el-select
+                      v-model="item.handleResultCode"
+                      style="width: 240px"
+                      @change="
                                             (val) =>
                                                 handleChangeDepartResultCode(
                                                     item,
                                                     val
                                                 )
                                         "
-                                        clearable
-                                        multiple
-                                    >
-                                        <el-option
-                                            v-for="item in dict.departHandleResult"
-                                            :key="item.dictCode"
-                                            :value="item.dictValue"
-                                            :label="item.dictLabel"
-                                        />
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </template>
-                </div>
-            </el-form-item>
-        </template>
-        <div
-            v-if="
+                      clearable
+                      multiple
+                  >
+                    <el-option
+                        v-for="item in dict.departHandleResult"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                        :label="item.dictLabel"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </template>
+        </div>
+      </el-form-item>
+    </template>
+    <div
+        v-if="
                 negative.problemSourcesCode === ProblemSources.GJXFPT ||
                 negative.problemSourcesCode === ProblemSources.GABXF ||
                 negative.problemSourcesCode === ProblemSources.JZXX ||
                 negative.problemSourcesCode === ProblemSources.XF12337
             "
-        >
-            <el-divider />
-            <h5>信访办理</h5>
-            <el-form-item
-                prop="handlePolices"
-                label="经办人"
-                :rules="{
+    >
+      <el-divider/>
+      <h5>信访办理</h5>
+      <el-form-item
+          prop="handlePolices"
+          label="经办人"
+          :rules="{
                     required: true,
                     validator: validateHandlePolices,
                 }"
-            >
-                <div
-                        class="mb-8 flex gap v-center"
-                        v-for="(item, index) in form.handlePolices"
-                        :key="index"
-                        style="width: 100%"
-                    >
-                        <police-select
-                            :depart-id="negative.handleSecondDepartId"
-                            v-model="item.empNo"
-                            @change="
+      >
+        <div
+            class="mb-8 flex gap v-center"
+            v-for="(item, index) in form.handlePolices"
+            :key="index"
+            style="width: 100%"
+        >
+          <police-select
+              :depart-id="negative.handleSecondDepartId"
+              v-model="item.empNo"
+              @change="
                                 (police) => {
                                     item.name = police.name;
                                     item.idCode = police.idCode;
                                     item.mobile = police.mobile;
                                 }
                             "
-                        />
-                        <span class="ml-20 text-right" style="width: 80px">联系电话：</span>
-                        <el-input
-                            placeholder="联系方式"
-                            v-model="item.mobile"
-                            style="width: 240px"
-                        />
-                        <el-button
-                            plain
-                            type="primary"
-                            v-if="index === 0"
-                            @click="form.handlePolices.push({})"
-                        >
-                            <template #icon>
-                                <icon name="el-icon-Plus" />
-                            </template>
-                            添加经办人
-                        </el-button>
-                        <el-button
-                            plain
-                            type="danger"
-                            v-else
-                            @click="form.handlePolices.splice(index, 1)"
-                        >
-                            <template #icon>
-                                <icon name="el-icon-Delete" />
-                            </template>
-                            删除经办人
-                        </el-button>
-                    </div>
-            </el-form-item>
-            <el-form-item
-                prop="visitingLeaderName"
-                label="接访领导"
-                :rules="{
+          />
+          <span class="ml-20 text-right" style="width: 80px">联系电话：</span>
+          <el-input
+              placeholder="联系方式"
+              v-model="item.mobile"
+              style="width: 240px"
+          />
+          <el-button
+              plain
+              type="primary"
+              v-if="index === 0"
+              @click="form.handlePolices.push({})"
+          >
+            <template #icon>
+              <icon name="el-icon-Plus"/>
+            </template>
+            添加经办人
+          </el-button>
+          <el-button
+              plain
+              type="danger"
+              v-else
+              @click="form.handlePolices.splice(index, 1)"
+          >
+            <template #icon>
+              <icon name="el-icon-Delete"/>
+            </template>
+            删除经办人
+          </el-button>
+        </div>
+      </el-form-item>
+      <el-form-item
+          prop="visitingLeaderName"
+          label="接访领导"
+          :rules="{
                     required: true,
                     message: '请选择接访领导',
                     trigger: ['blur'],
                 }"
-                v-if="
+          v-if="
                     negative.problemSourcesCode === ProblemSources.GJXFPT ||
                     negative.problemSourcesCode === ProblemSources.GABXF
                 "
-            >
-                <div class="flex gap" style="width: 100%">
-                    <police-select
-                        :host-level="negative.hostLevel"
-                        :depart-id="
+      >
+        <div class="flex gap" style="width: 100%">
+          <police-select
+              :host-level="negative.hostLevel"
+              :depart-id="
                             negative.hostLevel ===
                             HostLevel.SECOND
                                 ? negative.handleSecondDepartId
                                 : negative.handleThreeDepartId
                         "
-                        v-model="form.visitingLeaderEmpNo"
-                        @change="(police) => form.visitingLeaderName = police.name"
-                        :isLeader="true"
-                    />
-                    <span class="ml-20 text-right" style="width: 80px">警号：</span>
-                    <el-input v-model="form.visitingLeaderEmpNo" placeholder="接访领导警号" style="width: 240px" />
-                </div>
-            </el-form-item>
-            <el-form-item
-                label="化解情况"
-                prop="resolveSituation"
-                v-if="
+              v-model="form.visitingLeaderEmpNo"
+              @change="(police) => form.visitingLeaderName = police.name"
+              :isLeader="true"
+          />
+          <span class="ml-20 text-right" style="width: 80px">警号：</span>
+          <el-input v-model="form.visitingLeaderEmpNo" placeholder="接访领导警号" style="width: 240px"/>
+        </div>
+      </el-form-item>
+      <el-form-item
+          label="化解情况"
+          prop="resolveSituation"
+          v-if="
                     negative.problemSourcesCode === ProblemSources.GJXFPT ||
                     negative.problemSourcesCode === ProblemSources.GABXF
                 "
-                :rules="{
+          :rules="{
                     required: true,
                     message: '请选择信访化解情况',
                     trigger: ['blur'],
                 }"
-            >
-                <el-select
-                    v-model="form.resolveSituation"
-                    clearable
-                    style="width: 240px"
-                    placeholder="请选择信访化解情况"
-                >
-                    <el-option
-                        v-for="item in dict.resolveSituation"
-                        :key="item.id"
-                        :label="item.dictLabel"
-                        :value="item.dictValue"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item
-                prop="resolveStatus"
-                label="当前状态"
-                :rules="{
+      >
+        <el-select
+            v-model="form.resolveSituation"
+            clearable
+            style="width: 240px"
+            placeholder="请选择信访化解情况"
+        >
+          <el-option
+              v-for="item in dict.resolveSituation"
+              :key="item.id"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+          prop="resolveStatus"
+          label="当前状态"
+          :rules="{
                     required: true,
                     message: '请选择信访当前状态',
                     trigger: ['blur'],
                 }"
-                v-if="
+          v-if="
                     negative.problemSourcesCode === ProblemSources.GJXFPT ||
                     negative.problemSourcesCode === ProblemSources.GABXF
                 "
-            >
-                <el-select
-                    v-model="form.resolveStatus"
-                    clearable
-                    style="width: 240px"
-                    placeholder="请选择信访化当前状态"
-                >
-                    <el-option
-                        v-for="item in dict.resolveStatus"
-                        :key="item.id"
-                        :label="item.dictLabel"
-                        :value="item.dictValue"
-                    />
-                </el-select>
-            </el-form-item>
-        </div>
+      >
+        <el-select
+            v-model="form.resolveStatus"
+            clearable
+            style="width: 240px"
+            placeholder="请选择信访化当前状态"
+        >
+          <el-option
+              v-for="item in dict.resolveStatus"
+              :key="item.id"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+    </div>
 
-        <el-form-item
-            prop="files"
-            label-position="top"
-            :rules="{
+    <el-form-item
+        prop="files"
+        label-position="top"
+        :rules="{
                 required: true,
                 message: '请上传佐证材料',
             }"
-        >
-            <template #label>
-                <h5 class="inline-block mb-0" style="text-align: left">
-                    佐证材料
-                </h5>
-            </template>
-            <div v-if="negative.problemSourcesCode === ProblemSources.JWDC">
-                请提供以下佐证材料：
-                <p>
-                    １、《处理反馈表》（必提供）
-                    <a
-                        class="link"
-                        :href="`${BASE_PATH}/templates/《处理反馈表》.doc`"
-                        target="__blank"
-                        >下载链接</a
-                    >
-                </p>
-                <p>
-                    ２、如申请容错免责，请提供《容错免责申请表》
-                    <a
-                        class="link"
-                        :href="`${BASE_PATH}/templates/《警务评议容错免责申请表》.docx`"
-                        target="__blank"
-                        >下载链接</a
-                    >
-                </p>
-                <p>
-                    ３、针对群众不满意的原因，请提交无过错的音视频、微信或短信截图等证明材料；
-                </p>
-                <p>
-                    ４、针对110、122接处警情况，请提供处警开始、结束及处置过程中的视频截图；
-                </p>
-                <p>５、自动回访结果不满意时，请提供所队的回访录音；</p>
-                <p>６、单位或个人所开展的其他相关工作证明材料。</p>
-            </div>
-            <div
-                v-if="negative.problemSourcesCode === ProblemSources.JDGL"
-            ></div>
-            <div style="width: 100%" class="mb-10 mt-10">
-                <file-upload-group
-                    v-model:files="form.files"
-                    :problemSourcesCode="negative.problemSourcesCode"
-                />
-            </div>
-            <file-list v-model:files="form.files" :removeEnable="true" />
-        </el-form-item>
-    </el-form>
+    >
+      <template #label>
+        <h5 class="inline-block mb-0" style="text-align: left">
+          佐证材料
+        </h5>
+      </template>
+      <div v-if="negative.problemSourcesCode === ProblemSources.JWDC">
+        请提供以下佐证材料：
+        <p>
+          １、《处理反馈表》（必提供）
+          <a
+              class="link"
+              :href="`${BASE_PATH}/templates/《处理反馈表》.doc`"
+              target="__blank"
+          >下载链接</a
+          >
+        </p>
+        <p>
+          ２、如申请容错免责，请提供《容错免责申请表》
+          <a
+              class="link"
+              :href="`${BASE_PATH}/templates/《警务评议容错免责申请表》.docx`"
+              target="__blank"
+          >下载链接</a
+          >
+        </p>
+        <p>
+          ３、针对群众不满意的原因，请提交无过错的音视频、微信或短信截图等证明材料；
+        </p>
+        <p>
+          ４、针对110、122接处警情况，请提供处警开始、结束及处置过程中的视频截图；
+        </p>
+        <p>５、自动回访结果不满意时，请提供所队的回访录音；</p>
+        <p>６、单位或个人所开展的其他相关工作证明材料。</p>
+      </div>
+      <div
+          v-if="negative.problemSourcesCode === ProblemSources.JDGL"
+      ></div>
+      <div style="width: 100%" class="mb-10 mt-10">
+        <file-upload-group
+            v-model:files="form.files"
+            :problemSourcesCode="negative.problemSourcesCode"
+        />
+      </div>
+      <file-list v-model:files="form.files" :removeEnable="true"/>
+    </el-form-item>
+  </el-form>
 </template>
 <script lang="ts" setup>
-import { BASE_PATH } from "@/api/request";
+import {BASE_PATH} from "@/api/request";
 import {
-    InspectCase,
-    IsRectify,
-    AccountabilityTarget,
-    BlameType,
-    AssistCase,
-    ProblemSources,
-    PersonType,
-    HostLevel,
-    SubjectiveAspect,
+  InspectCase,
+  IsRectify,
+  AccountabilityTarget,
+  BlameType,
+  AssistCase,
+  ProblemSources,
+  PersonType,
+  HostLevel,
+  SubjectiveAspect,
 } from "@/enums/dictEnums";
 import useCatchStore from "@/stores/modules/catch";
 import feedback from "@/utils/feedback";
-
+import {
+  getConfinementListAll
+} from "@/api/work/confinement";
+//获取数据
 const catchSotre = useCatchStore();
 const dict = catchSotre.getDicts([
-    "inspectCase",
-    "isRectify",
-    "personType",
-    "superviseMeasures",
-    "subjectiveAspect",
-    "responsibilityType",
-    "handleResult",
-    "departHandleResult",
-    "protectRights",
-    "accountabilityTarget",
-    "leadResponsibilityType",
-    "resolveSituation",
-    "resolveStatus"
+  "inspectCase",
+  "isRectify",
+  "personType",
+  "superviseMeasures",
+  "subjectiveAspect",
+  "responsibilityType",
+  "handleResult",
+  "departHandleResult",
+  "protectRights",
+  "accountabilityTarget",
+  "leadResponsibilityType",
+  "resolveSituation",
+  "resolveStatus"
 ]);
 
 const negative = inject("negative");
 const form = ref({
-    handlePolices: [{}],
+  handlePolices: [{}],
 });
+//禁闭信息数组
+let confinementList = ref([])
+let confinementOpens = ref([])
+/**
+ * 禁闭信息入参
+ * */
+let confinementQuery = ref({
+  current: 1,
+  size: 10000,
+  departBranch: false
+})
+/**
+ * 获取禁闭信息
+ * */
+const getConfinementData = async () => {
+  const res = await getConfinementListAll(confinementQuery.value);
+  confinementList.value = res.records
+  confinementOpens.value=res.records
+}
+/**
+ * 下拉搜索过滤数据(姓名，警号)
+ * @param query 输入参数
+ *
+ * */
+const fileConfinement = (query)=>{
+  if(query){
+    confinementOpens.value =  confinementList.value.filter(s => s.name.includes(query) || s.empNo.includes(query))
+  }else{
+    confinementOpens.value=confinementList.value
+  }
+
+}
+
 
 const problemIsTrue = computed(() => {
-    return form.value.checkStatus !== InspectCase.FALSE;
+  return form.value.checkStatus !== InspectCase.FALSE;
 });
 
+
+
+getConfinementData();
 getFormData();
 
 watch(negative, () => {
-    getFormData();
+  getFormData();
 });
 
 function getFormData() {
-    form.value = {
-        involveDepartId: negative.value.involveDepartId,
-        caseNumber: negative.value.caseNumber,
-        checkStatus: negative.value.checkStatus,
-        checkStatusName: negative.value.checkStatusName,
-        isRectifyName: negative.value.isRectifyName,
-        isRectifyCode: negative.value.isRectifyCode,
-        checkStatusDesc: negative.value.checkStatusDesc,
-        rectifyDesc: negative.value.rectifyDesc,
-        rectifyRestrictionDays: negative.value.rectifyRestrictionDays,
-        accountabilityTarget: negative.value.accountabilityTarget,
-        unrectifyReason: negative.value.unrectifyReason,
-        blames: negative.value.blames,
-        blameLeaders: negative.value.blameLeaders,
-        files: negative.value.files || [],
-        handlePolices:
-            !negative.value.handlePolices ||
-            negative.value.handlePolices.length === 0
-                ? [{}]
-                : negative.value.handlePolices,
-        // 化解情况
-        resolveSituation: negative.value.resolveSituation,
-        resolveStatus: negative.value.resolveStatus,
-        visitingLeaderName: negative.value.visitingLeaderName,
-        visitingLeaderEmpNo: negative.value.visitingLeaderEmpNo
-    };
-    if (negative.value.accountabilityTarget != undefined) {
-        form.value.accountabilityTarget = negative.value.accountabilityTarget;
-        return;
-    }
-    if (negative.value.problemSourcesCode === ProblemSources.JWDC) {
-        form.value.accountabilityTarget = AccountabilityTarget.PERSONAL;
-    }
-    console.log(form.value);
+  form.value = {
+    involveDepartId: negative.value.involveDepartId,
+    caseNumber: negative.value.caseNumber,
+    checkStatus: negative.value.checkStatus,
+    checkStatusName: negative.value.checkStatusName,
+    isRectifyName: negative.value.isRectifyName,
+    isRectifyCode: negative.value.isRectifyCode,
+    checkStatusDesc: negative.value.checkStatusDesc,
+    rectifyDesc: negative.value.rectifyDesc,
+    rectifyRestrictionDays: negative.value.rectifyRestrictionDays,
+    accountabilityTarget: negative.value.accountabilityTarget,
+    unrectifyReason: negative.value.unrectifyReason,
+    blames: negative.value.blames,
+    blameLeaders: negative.value.blameLeaders,
+    files: negative.value.files || [],
+    handlePolices:
+        !negative.value.handlePolices ||
+        negative.value.handlePolices.length === 0
+            ? [{}]
+            : negative.value.handlePolices,
+    // 化解情况
+    resolveSituation: negative.value.resolveSituation,
+    resolveStatus: negative.value.resolveStatus,
+    visitingLeaderName: negative.value.visitingLeaderName,
+    visitingLeaderEmpNo: negative.value.visitingLeaderEmpNo
+  };
+  if (negative.value.accountabilityTarget != undefined) {
+    form.value.accountabilityTarget = negative.value.accountabilityTarget;
+    return;
+  }
+  if (negative.value.problemSourcesCode === ProblemSources.JWDC) {
+    form.value.accountabilityTarget = AccountabilityTarget.PERSONAL;
+  }
+  console.log(form.value);
 }
 
 function handleAddBlame(type) {
-    form.value.blames.push({
-        type,
-        problems:
-            negative.value.problems.length === 0
-                ? [{}]
-                : negative.value.problems,
-    });
+  form.value.blames.push({
+    type,
+    problems:
+        negative.value.problems.length === 0
+            ? [{}]
+            : negative.value.problems,
+  });
 }
 
 function handleAddDepartBlame() {
-    handleAddBlame(BlameType.DEPARTMENT);
+  handleAddBlame(BlameType.DEPARTMENT);
 }
 
 function handleAddPersonalBlame() {
-    handleAddBlame(BlameType.PERSONAL);
-    if (form.value.blameLeaders.length == 0) {
-        handleAddBlameLeader();
-    }
+  handleAddBlame(BlameType.PERSONAL);
+  if (form.value.blameLeaders.length == 0) {
+    handleAddBlameLeader();
+  }
 }
 
 function handleRemoveBlame(item) {
-    form.value.blames.splice(form.value.blames.indexOf(item), 1);
+  form.value.blames.splice(form.value.blames.indexOf(item), 1);
 }
 
 function handleAddProblem(blame) {
-    if (!blame.problems) {
-        blame.problems = [];
-    }
-    blame.problems.push({});
+  if (!blame.problems) {
+    blame.problems = [];
+  }
+  blame.problems.push({});
 }
 
 function handleAddBlameLeader() {
-    form.value.blameLeaders.push({
-        blameIdCodes: [],
-    });
+  form.value.blameLeaders.push({
+    blameIdCodes: [],
+  });
 }
 
 function handleRemoveBlameLeader(index) {
-    form.value.blameLeaders.splice(index, 1);
+  form.value.blameLeaders.splice(index, 1);
 }
 
 // 更改追责对象
 watch(
     () => form.value.accountabilityTarget,
     (val) => {
-        if (val === AccountabilityTarget.PERSONAL) {
-            if (
-                form.value.blames.filter(
-                    (item) => item.type === BlameType.PERSONAL
-                ).length === 0
-            ) {
-                handleAddPersonalBlame();
-            }
-            form.value.blames.forEach((item) => {
-                if (item.type === BlameType.DEPARTMENT) {
-                    handleRemoveBlame(item);
-                }
-            });
+      if (val === AccountabilityTarget.PERSONAL) {
+        if (
+            form.value.blames.filter(
+                (item) => item.type === BlameType.PERSONAL
+            ).length === 0
+        ) {
+          handleAddPersonalBlame();
         }
-        if (val === AccountabilityTarget.DEPARTMENT) {
-            form.value.blames.forEach((item) => {
-                if (item.type === BlameType.PERSONAL) {
-                    handleRemoveBlame(item);
-                }
-            });
-            if (
-                form.value.blames.filter(
-                    (item) => item.type === BlameType.DEPARTMENT
-                ).length === 0
-            ) {
-                handleAddDepartBlame();
-            }
-            form.value.blameLeaders = [];
+        form.value.blames.forEach((item) => {
+          if (item.type === BlameType.DEPARTMENT) {
+            handleRemoveBlame(item);
+          }
+        });
+      }
+      if (val === AccountabilityTarget.DEPARTMENT) {
+        form.value.blames.forEach((item) => {
+          if (item.type === BlameType.PERSONAL) {
+            handleRemoveBlame(item);
+          }
+        });
+        if (
+            form.value.blames.filter(
+                (item) => item.type === BlameType.DEPARTMENT
+            ).length === 0
+        ) {
+          handleAddDepartBlame();
+        }
+        form.value.blameLeaders = [];
+      }
+      if (val === AccountabilityTarget.PERSONAL_AND_DEPARTMENT) {
+        if (
+            form.value.blames.filter(
+                (item) => item.type === BlameType.PERSONAL
+            ).length === 0
+        ) {
+          handleAddPersonalBlame();
         }
-        if (val === AccountabilityTarget.PERSONAL_AND_DEPARTMENT) {
-            if (
-                form.value.blames.filter(
-                    (item) => item.type === BlameType.PERSONAL
-                ).length === 0
-            ) {
-                handleAddPersonalBlame();
-            }
-            if (
-                form.value.blames.filter(
-                    (item) => item.type === BlameType.DEPARTMENT
-                ).length === 0
-            ) {
-                handleAddDepartBlame();
-            }
+        if (
+            form.value.blames.filter(
+                (item) => item.type === BlameType.DEPARTMENT
+            ).length === 0
+        ) {
+          handleAddDepartBlame();
         }
+      }
     }
 );
 
 function handleChangeCheckStatus(val, item) {
-    if (val === "4") {
-        form.value.checkStatusName = "无法办理";
-        return;
-    }
-    form.value.checkStatusName = dict.inspectCase.filter(
-        (item) => item.dictValue === val
-    )[0].dictLabel;
+  if (val === "4") {
+    form.value.checkStatusName = "无法办理";
+    return;
+  }
+  form.value.checkStatusName = dict.inspectCase.filter(
+      (item) => item.dictValue === val
+  )[0].dictLabel;
 }
 
 function handleChangePolice(police, item) {
-    console.log(police);
-    item.blameName = police.name;
-    item.blameIdCode = police.idCode;
-    item.ivPersonTypeCode = police.personType;
+  console.log(police);
+  item.blameName = police.name;
+  item.blameIdCode = police.idCode;
+  item.ivPersonTypeCode = police.personType;
 }
 
 function handleChangeSubjectiveAspect(val, item) {
-    if (val === SubjectiveAspect.OTHER) {
-        item.subjectiveAspectName = "";
-        return;
-    }
-    item.subjectiveAspectName = dict.subjectiveAspect.filter(
-        (item) => item.dictValue === val
-    )[0].dictLabel;
+  if (val === SubjectiveAspect.OTHER) {
+    item.subjectiveAspectName = "";
+    return;
+  }
+  item.subjectiveAspectName = dict.subjectiveAspect.filter(
+      (item) => item.dictValue === val
+  )[0].dictLabel;
 }
 
 function handleChangeProblem(node, problem) {
-    if (node.level === 3) {
-        problem.threeLevelContent = node.label;
-        problem.oneLevelCode = node.parent.parent.key;
-        problem.oneLevelContent = node.parent.parent.label;
-        problem.twoLevelCode = node.parent.key;
-        problem.twoLevelContent = node.parent.label;
-    }
+  if (node.level === 3) {
+    problem.threeLevelContent = node.label;
+    problem.oneLevelCode = node.parent.parent.key;
+    problem.oneLevelContent = node.parent.parent.label;
+    problem.twoLevelCode = node.parent.key;
+    problem.twoLevelContent = node.parent.label;
+  }
 }
 
 function handleCheckboxChange(blameLeader, bool, val) {
-    if (bool) {
-        blameLeader.blameIdCodes.push(val);
-    } else {
-        blameLeader.blameIdCodes.splice(
-            blameLeader.blameIdCodes.indexOf(val),
-            1
-        );
-    }
+  if (bool) {
+    blameLeader.blameIdCodes.push(val);
+  } else {
+    blameLeader.blameIdCodes.splice(
+        blameLeader.blameIdCodes.indexOf(val),
+        1
+    );
+  }
 }
 
 function handleChangeResultCode(item) {
-    if (item.handleResultCode && item.handleResultCode.length > 0) {
-        item.handleResultName = dict.handleResult
-            .filter((obj) => item.handleResultCode.includes(obj.dictValue))
-            .map((obj) => obj.dictLabel)
-            .join("、");
-    } else {
-        item.handleResultName = "";
-    }
+  if (item.handleResultCode && item.handleResultCode.length > 0) {
+    item.handleResultName = dict.handleResult
+        .filter((obj) => item.handleResultCode.includes(obj.dictValue))
+        .map((obj) => obj.dictLabel)
+        .join("、");
+  } else {
+    item.handleResultName = "";
+  }
 }
 
 function handleChangeLeadResultCode(item) {
-    if (item.leadHandleResultCode && item.leadHandleResultCode.length > 0) {
-        item.leadHandleResultName = dict.handleResult
-            .filter((obj) => item.leadHandleResultCode.includes(obj.dictValue))
-            .map((obj) => obj.dictLabel)
-            .join("、");
-    } else {
-        item.leadHandleResultName = "";
-    }
+  if (item.leadHandleResultCode && item.leadHandleResultCode.length > 0) {
+    item.leadHandleResultName = dict.handleResult
+        .filter((obj) => item.leadHandleResultCode.includes(obj.dictValue))
+        .map((obj) => obj.dictLabel)
+        .join("、");
+  } else {
+    item.leadHandleResultName = "";
+  }
 }
 
 function handleChangeDepartResultCode(item) {
-    if (item.handleResultCode && item.handleResultCode.length > 0) {
-        item.handleResultName = dict.departHandleResult
-            .filter((obj) => item.handleResultCode.includes(obj.dictValue))
-            .map((obj) => obj.dictLabel)
-            .join("、");
-    } else {
-        item.handleResultName = "";
-    }
+  if (item.handleResultCode && item.handleResultCode.length > 0) {
+    item.handleResultName = dict.departHandleResult
+        .filter((obj) => item.handleResultCode.includes(obj.dictValue))
+        .map((obj) => obj.dictLabel)
+        .join("、");
+  } else {
+    item.handleResultName = "";
+  }
 }
 
 function validateHandlePolices(rule, value, cb) {
-    console.log(value);
-    if (value.length === 0) {
-        cb(new Error("请选择经办人"));
-    } else if (!value[0].name) {
-        cb(new Error("请选择经办人"));
-    } else if (!value[0].mobile) {
-        cb(new Error("请输入经办人联系方式"));
-    } else {
-        cb()
-    }
+  console.log(value);
+  if (value.length === 0) {
+    cb(new Error("请选择经办人"));
+  } else if (!value[0].name) {
+    cb(new Error("请选择经办人"));
+  } else if (!value[0].mobile) {
+    cb(new Error("请输入经办人联系方式"));
+  } else {
+    cb()
+  }
 }
 
 const formRef = ref(null);
 
 async function validate() {
-    debugger;
-    // 解决核查办理 当涉及对象是涉及个人时，有一条涉及单位的数据，导致问题无法提交的问题。
-    if (form.value.accountabilityTarget === AccountabilityTarget.PERSONAL) {
-        form.value.blames = form.value.blames.filter(
-            (item) => item.type === BlameType.PERSONAL
-        );
-    }
-    await formRef.value.validate();
-    if (form.value.accountabilityTarget !== AccountabilityTarget.DEPARTMENT) {
-        let arr = [];
-        form.value.blameLeaders.forEach((item) => {
-            arr = arr.concat(item.blameIdCodes);
-        });
-        const blame = form.value.blames.filter(
-            (item) =>
-                item.type === BlameType.PERSONAL &&
-                !arr.includes(item.blameIdCode)
-        );
-        if (blame.length) {
-            throw new Error(
-                `涉及人员【${blame
-                    .map((item) => item.blameName)
-                    .join("、")}】未关联领导`
-            );
-        }
+  debugger;
+  // 解决核查办理 当涉及对象是涉及个人时，有一条涉及单位的数据，导致问题无法提交的问题。
+  if (form.value.accountabilityTarget === AccountabilityTarget.PERSONAL) {
+    form.value.blames = form.value.blames.filter(
+        (item) => item.type === BlameType.PERSONAL
+    );
+  }
+  await formRef.value.validate();
+  if (form.value.accountabilityTarget !== AccountabilityTarget.DEPARTMENT) {
+    let arr = [];
+    form.value.blameLeaders.forEach((item) => {
+      arr = arr.concat(item.blameIdCodes);
+    });
+    const blame = form.value.blames.filter(
+        (item) =>
+            item.type === BlameType.PERSONAL &&
+            !arr.includes(item.blameIdCode)
+    );
+    if (blame.length) {
+      throw new Error(
+          `涉及人员【${blame
+              .map((item) => item.blameName)
+              .join("、")}】未关联领导`
+      );
     }
+  }
 
-    return form.value;
+  return form.value;
 }
 
 function getData() {
-    return form.value;
+  return form.value;
 }
 
 defineExpose({
-    validate,
-    getData,
+  validate,
+  getData,
 });
 </script>
+<style>
+.widthClass{
+  min-width: 50% !important;
+}
+</style>
 <style lang="scss" scoped>
+
 .el-form-item .el-form-item {
-    margin-bottom: 18px;
+  margin-bottom: 18px;
 }
 
 :deep() {
-    .el-form-item--label-right .el-form-item__label {
-        text-align: right;
-        line-height: 32px;
-        margin-bottom: 0;
-    }
+  .el-form-item--label-right .el-form-item__label {
+    text-align: right;
+    line-height: 32px;
+    margin-bottom: 0;
+  }
 }
 
 p {
-    margin: 0;
-    line-height: 1.4;
+  margin: 0;
+  line-height: 1.4;
 }
 </style>
diff --git a/src/views/datav/MailVisits.vue b/src/views/datav/MailVisits.vue
index 79744e9..b99c67b 100644
--- a/src/views/datav/MailVisits.vue
+++ b/src/views/datav/MailVisits.vue
@@ -7,7 +7,7 @@
           <el-col :span="6">
             <datav-card title="初访重访情况">
               <el-row class="mb-32">
-                <el-col :span="8">
+                <el-col :span="12">
                   <div class="descriptions_cell text-center">
                     <div class="descriptions_content">
                       {{ currentLeftOverview.firstMail }}
@@ -17,7 +17,7 @@
                     </div>
                   </div>
                 </el-col>
-                <el-col :span="8">
+                <el-col :span="12">
                   <div class="descriptions_cell text-center">
                     <div class="descriptions_content">
                       {{ currentLeftOverview.repeatMail }}
@@ -27,16 +27,7 @@
                     </div>
                   </div>
                 </el-col>
-                <el-col :span="8">
-                  <div class="descriptions_cell text-center">
-                    <div class="descriptions_content">
-                      {{ currentLeftOverview.leaderMail }}
-                    </div>
-                    <div class="descriptions_label">
-                      领导接访数
-                    </div>
-                  </div>
-                </el-col>
+
               </el-row>
               <datav-card>
                 <datav-tabs v-model="activeTab" ref="firstAndRepeat">
@@ -44,6 +35,7 @@
                     <datav-tabs
                         v-model="fxsjFirstAndRepeatTab"
                         type="bottom-button"
+
                     >
                       <datav-tab-item label="初信初访" name="1">
                         <el-scrollbar height="300px">
@@ -52,6 +44,7 @@
                               size="large"
                               :max="11"
                               :color="colors"
+
                           />
                         </el-scrollbar>
                       </datav-tab-item>
@@ -65,16 +58,7 @@
                           />
                         </el-scrollbar>
                       </datav-tab-item>
-                      <datav-tab-item label="领导接访" name="3">
-                        <el-scrollbar height="300px">
-                          <datav-chart-bar
-                              :data="fxsjLeaderViewMailList"
-                              :max="11"
-                              size="large"
-                              :color="leaderViewColors"
-                          />
-                        </el-scrollbar>
-                      </datav-tab-item>
+
                     </datav-tabs>
                   </datav-tab-item>
                   <datav-tab-item label="局属单位" name="2">
@@ -99,16 +83,7 @@
                           />
                         </el-scrollbar>
                       </datav-tab-item>
-                      <datav-tab-item label="领导接访" name="3">
-                        <el-scrollbar height="300px">
-                          <datav-chart-bar
-                              :data="bwzdLeaderViewMailList"
-                              :max="11"
-                              size="large"
-                              :color="leaderViewColors"
-                          />
-                        </el-scrollbar>
-                      </datav-tab-item>
+
                     </datav-tabs>
                   </datav-tab-item>
                 </datav-tabs>
@@ -227,8 +202,7 @@
           <el-col :span="6">
             <datav-card title="群众集访情况">
               <el-row class="mb-32">
-
-                <el-col >
+                <el-col :span="12">
                   <div class="descriptions_cell text-center">
                     <div class="descriptions_content">
                       {{ currentRightOverview.mass }}
@@ -238,7 +212,18 @@
                     </div>
                   </div>
                 </el-col>
+                <el-col :span="12">
+                  <div class="descriptions_cell text-center">
+                    <div class="descriptions_content">
+                      {{ currentLeftOverview.leaderMail }}
+                    </div>
+                    <div class="descriptions_label">
+                      领导接访数
+                    </div>
+                  </div>
+                </el-col>
               </el-row>
+
               <datav-card>
                 <datav-tabs v-model="activeTabRight" ref="entanglement">
                   <datav-tab-item label="分县市局" name="1">
@@ -246,8 +231,17 @@
                         type="bottom-button"
                         v-model="fxsjEntanglementTab"
                     >
-
-                      <datav-tab-item label="群体集访" name="3">
+                      <datav-tab-item label="领导接访" name="1">
+                        <el-scrollbar height="300px">
+                          <datav-chart-bar
+                              :data="fxsjLeaderViewMailList"
+                              :max="11"
+                              size="large"
+                              :color="leaderViewColors"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                      <datav-tab-item label="群体集访" name="2">
                         <el-scrollbar height="300px">
                           <datav-chart-bar
                               :data="fxsjMassMailList"
@@ -262,9 +256,19 @@
                   <datav-tab-item label="局属单位" name="2">
                     <datav-tabs
                         type="bottom-button"
-                    >
 
-                      <datav-tab-item label="群体集访" name="3">
+                    >
+                      <datav-tab-item label="领导接访" name="1">
+                        <el-scrollbar height="300px">
+                          <datav-chart-bar
+                              :data="bwzdLeaderViewMailList"
+                              :max="11"
+                              size="large"
+                              :color="leaderViewColors"
+                          />
+                        </el-scrollbar>
+                      </datav-tab-item>
+                      <datav-tab-item label="群体集访" name="2">
                         <el-scrollbar height="300px">
                           <datav-chart-bar
                               :data="bwzdMassMailList"
@@ -441,20 +445,19 @@ const option = ref({
     trigger: 'item',
     position: 'bottom',
     formatter: function (params) {
-      console.log(params)
+
       const dataItem = mailMapIconList.value.find(item => item.name.includes(params.name.substring(0, 2)));
-      //
       if (dataItem) {
         return `
         <div class="tooltip">
-          <div class="tooltip-title">${dataItem.originalName}</div>
+          <div class="tooltip-title">${dataItem.originalName} </div>
           <div class="tooltip-content">
             <ul class="tooltip-ul" >
               <li>信访总件数 <span>${dataItem.total}</span></li>
-              <li>国家信访 <span>${dataItem.countryTotal}</span></li>
-              <li>公安部信访 <span>${dataItem.policeTotal}</span></li>
-              <li>局长信箱 <span>${dataItem.commissionerTotal}</span></li>
-              <li>12337信访 <span>${dataItem.numTotal}</span></li>
+              <li>国家信访 <span> ${dataItem.countryTotal }</span></li>
+              <li>公安部信访 <span>  ${dataItem.policeTotal }</span></li>
+              <li>局长信箱 <span>  ${dataItem.commissionerTotal }</span></li>
+              <li>12337信访 <span>${dataItem.numTotal }</span></li>
             </ul>
           </div>
         </div>`;
@@ -840,9 +843,11 @@ const getAllMailCountData = async (timeValue = time.value) => {
 
 
 const getMailMapIconData = async (timeValue = time.value) => {
+  console.log('-------执行')
   const res = await getMailMapIcon(timeValue);
   const mappedData = mapOrgNameMapping(res.mailMapIconList, "total");
   mailMapIconList.value = mappedData;
+  console.log('-------执行2')
   console.log(mailMapIconList)
   const total = mappedData.reduce((sum, item) => sum + Number(item.value), 0);
   const avg = total / mappedData.length; // 计算平均值
@@ -921,7 +926,7 @@ const currentRightOverview = computed(() => {
 
 // region 动画
 const fxsjFirstAndRepeatAnimation = () => {
-  fxsjFirstAndRepeatTab.value = (parseInt(fxsjFirstAndRepeatTab.value) % 3 + 1).toString();
+  fxsjFirstAndRepeatTab.value = (parseInt(fxsjFirstAndRepeatTab.value) % 2 + 1).toString();
 };
 fxsjFirstAndRepeatIntervalId = setInterval(fxsjFirstAndRepeatAnimation, 3000);
 // 业务类型占比环形图
@@ -966,7 +971,7 @@ const mailTrendAnimation = () => {
 mailTrendIntervalId = setInterval(mailTrendAnimation, 2000);
 // 缠访集访情况动画
 const fxsjEntanglementAnimation = () => {
-  fxsjEntanglementTab.value = (parseInt(fxsjEntanglementTab.value) % 3 + 1).toString();
+  fxsjEntanglementTab.value = (parseInt(fxsjEntanglementTab.value) % 2 + 1).toString();
 };
 fxsjEntanglementIntervalId = setInterval(fxsjEntanglementAnimation, 3000);
 // // 问题涉及方面分布环形图
@@ -1116,6 +1121,8 @@ function open(path) {
   }
 
   .tooltip-content ul li {
+    display: flex;
+    justify-content: space-around;
     height: 26px;
     color: #597AE9;
     font-weight: 400;
@@ -1123,11 +1130,11 @@ function open(path) {
   }
 
   .tooltip-ul span {
+    display: inline-block;
     float: right;
-    width: 55px;
     color: #fff;
     font-size: 14px;
-    text-align: center; /* 水平居中 */
+    //text-align: center; /* 水平居中 */
   }
 
 }