From 7744a422dacbd596618800919a1bfda97f6823f0 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Thu, 5 Nov 2026 18:39:55 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=AF=E6=95=99=E5=AF=BC=E5=91=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/negativeInfo/depart-dialog.vue |  6 ++++--
 src/views/datav/Lmgz.vue                      | 11 +++++++----
 src/views/system/Police.vue                   | 11 ++++++++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/components/negativeInfo/depart-dialog.vue b/src/components/negativeInfo/depart-dialog.vue
index c1eea35..ed23edd 100644
--- a/src/components/negativeInfo/depart-dialog.vue
+++ b/src/components/negativeInfo/depart-dialog.vue
@@ -33,8 +33,9 @@
           <section class="profile-panel">
             <h5>单位情况</h5>
             <dl class="profile-fields depart-fields">
-              <div><dt>所长</dt><dd>{{ departInfo.mainRole || "/" }}</dd></div>
-              <div><dt>副所长</dt><dd>{{ departInfo.deputyRole?.join("、") || "/" }}</dd></div>
+              <div><dt>{{ isBrigade ? "大队长" : "所长" }}</dt><dd>{{ departInfo.mainRole || "/" }}</dd></div>
+              <div><dt>教导员</dt><dd>{{ departInfo.instructorRoles?.join("、") || "/" }}</dd></div>
+              <div><dt>{{ isBrigade ? "副大队长" : "副所长" }}</dt><dd>{{ departInfo.deputyRole?.join("、") || "/" }}</dd></div>
               <div><dt>民警总人数</dt><dd>{{ departInfo.policeSize ?? 0 }}</dd></div>
               <div><dt>问题涉及民警数</dt><dd>{{ departInfo.negativePoliceSize ?? 0 }}</dd></div>
               <div><dt>协辅警人数</dt><dd>{{ departInfo.auxSize ?? 0 }}</dd></div>
@@ -151,6 +152,7 @@ import moment from "moment";
 
 const props = defineProps({
   modelValue: Boolean,
+  isBrigade: { type: Boolean, default: false },
   departId: {
     type: String,
   },
diff --git a/src/views/datav/Lmgz.vue b/src/views/datav/Lmgz.vue
index daa5d39..db97135 100644
--- a/src/views/datav/Lmgz.vue
+++ b/src/views/datav/Lmgz.vue
@@ -173,7 +173,7 @@
                   <datav-chart-bar-fixbug
                       :data="list3"
                       clickable
-                      @item-click="openDetail($event, 'depart')"
+                      @item-click="openDetail($event, 'depart', true)"
                       size="small"
                       :color="colors"
                   />
@@ -184,7 +184,7 @@
                   <datav-chart-bar-fixbug
                       :data="list3"
                       clickable
-                      @item-click="openDetail($event, 'depart')"
+                      @item-click="openDetail($event, 'depart', true)"
                       :max="11"
                       size="small"
                       :color="colors"
@@ -196,7 +196,7 @@
                   <datav-chart-bar-fixbug
                       :data="list3"
                       clickable
-                      @item-click="openDetail($event, 'depart')"
+                      @item-click="openDetail($event, 'depart', true)"
                       :max="11"
                       size="small"
                       :color="colors"
@@ -285,6 +285,7 @@
       <negativeInfo-depart-dialog
           v-model="departDetailOpen"
           :depart-id="detailId"
+          :is-brigade="detailIsBrigade"
           :initial-time="detailTime"
       />
       <negativeInfo-police-dialog
@@ -339,12 +340,13 @@ const list4 = ref([])
 const list5 = ref([])
 const list6 = ref([])
 const departDetailOpen = ref(false);
+const detailIsBrigade = ref(false);
 const policeDetailOpen = ref(false);
 const detailId = ref("");
 const detailTime = ref([]);
 const profileScope = ref({});
 
-function openDetail(item, type) {
+function openDetail(item, type, isBrigade = false) {
   if (!item.detailId) return;
   detailId.value = item.detailId;
   profileScope.value = item.profileScope || {};
@@ -353,6 +355,7 @@ function openDetail(item, type) {
     moment(time.value[1]).endOf("day").format("YYYY-MM-DD HH:mm:ss"),
   ];
   if (type === "depart") {
+    detailIsBrigade.value = isBrigade;
     departDetailOpen.value = true;
   } else {
     policeDetailOpen.value = true;
diff --git a/src/views/system/Police.vue b/src/views/system/Police.vue
index d0ec57a..8ce9372 100644
--- a/src/views/system/Police.vue
+++ b/src/views/system/Police.vue
@@ -648,6 +648,9 @@
                     <el-option value="副职">副职</el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="是否教导员" prop="instructor" v-if="form.personType === PersonType.POLICE">
+                <el-switch v-model="form.instructor" active-text="是" inactive-text="否" />
+            </el-form-item>
             <el-form-item label="业务条线" prop="policeRole">
                 <el-select
                     clearable
@@ -908,6 +911,7 @@ function handleSelectAllChange(value) {
 
 const mode = ref("add");
 const form = ref({
+    instructor: false,
     password: "123456",
 });
 const fomrRef = ref(null);
@@ -916,14 +920,14 @@ const show = ref(false);
 function handleAdd() {
     show.value = true;
     if (mode.value === "edit") {
-        form.value = {};
+        form.value = { instructor: false };
     }
     mode.value = "add";
 }
 
 function handleEdit(row) {
     show.value = true;
-    form.value = { ...row };
+    form.value = { ...row, instructor: row.instructor === true || row.instructor === 1 };
     mode.value = "edit";
 }
 
@@ -932,6 +936,7 @@ async function submit() {
     if (mode.value === "add") {
         await addPolice(form.value);
         form.value = {
+            instructor: false,
             password: "123456",
         };
     } else {
@@ -1036,4 +1041,4 @@ function handleUploadImgSuccess(result, file) {
     width: 98px;
     height: 126px;
 }
-</style>
\ No newline at end of file
+</style>