Merge remote-tracking branch 'origin/master'

src/api/work/alarm.ts

@@ -13,3 +13,11 @@ export function alarmNotificationReply(data) {
         body: data
     });
 }
+
+export function alarmNotificationCommit(data) {
+    return request.post({
+        url: `/alarm/notification/commit`,
+        body: data
+    });
+}
+

src/views/sensitivePerception/DepartNegative.vue

@@ -103,6 +103,12 @@
                             @click="handleShowProfile(row)"
                             >问题详情</el-button
                         >
+                      <el-button
+                          type="primary"
+                          link
+                          @click="handleShowNotification"
+                      >预警提醒</el-button
+                      >
                     </template>
                 </el-table-column>
             </el-table>
@@ -411,6 +417,63 @@
         </el-scrollbar>
     </el-dialog>
 
+  <el-dialog v-model="showNotification" title="创建提醒" width="600px">
+    <el-form label-width="148" :model="formData2" ref="formRef">
+      <el-form-item label="提醒类型">
+        <div class="flex gap">
+          <el-select
+              v-model="formData2.alarmTypeId"
+              style="min-width: 185px"
+          >
+            <el-option :value="1" label="预警问题"/>
+            <el-option :value="2" label="风险问题"/>
+            <el-option :value="3" label="提醒通知"/>
+          </el-select>
+        </div>
+      </el-form-item>
+        <el-form-item
+            style="width: 333px"
+            label="被通知单位"
+            prop="involveDepartId"
+            :rules="{
+                                message: '请选择问题涉及单位',
+                                trigger: ['blur'],
+                            }"
+        >
+          <depart-tree-select
+              v-model="formData2.involveDepartId"
+              :check-strictly="true"
+              @node-click="
+                                    (row) =>
+                                        (formData2.involveDepartName =
+                                            row.shortName)
+                                "
+          />
+        </el-form-item>
+      <el-form-item
+          label="提醒内容"
+      >
+        <el-input
+            type="textarea"
+            v-model="formData2.alarmContent"
+            :autosize="{ minRows: 12 }"
+            :rules="{
+                                message: '请填写提醒内容',
+                                trigger: ['blur'],
+                            }"
+            style="width: 280px"
+        />
+      </el-form-item>
+    </el-form>
+    <footer class="flex end">
+      <el-button @click="showNotification = false" size="large">取消</el-button>
+      <el-button type="primary" @click="handleNotification" size="large"
+      >提交
+      </el-button
+      >
+    </footer>
+  </el-dialog>
+
     <negative-dialog
         v-model="negativeShow"
         :id="activeNegativeId"
@@ -424,9 +487,12 @@ import {
     getDepartProfile,
     listNegativeMonthly,
 } from "@/api/sensitivePerception/profileDepart";
+import {alarmNotificationCommit, alarmNotificationReply} from "@/api/work/alarm"
 import { listNegative } from "@/api/work/negative";
 import { InspectCase } from "@/enums/dictEnums";
 import moment from "moment";
+import {ref} from "vue";
+import feedback from "~/utils/feedback";
 
 const query = ref({
     current: 1,
@@ -439,6 +505,13 @@ const query = ref({
 });
 const list = ref<any[]>([]);
 const total = ref(0);
+let showNotification = ref(false)
+let formData2 = ref({
+  alarmTypeId: 1,
+  involveDepartId: '',
+  involveDepartName: '',
+  alarmContent: ''
+})
 
 const mainLoading = ref(false);
 function getList() {
@@ -463,6 +536,30 @@ function reset() {
     getList();
 }
 
+const handleShowNotification = () => {
+  showNotification.value = true
+}
+
+const handleNotification = async () => {
+  if(formData2.value.involveDepartId == '') {
+    feedback.msgWarning("请选择被提醒单位");
+    return;
+  }
+  if(formData2.value.alarmContent == '') {
+    feedback.msgWarning("请填写提醒内容");
+    return;
+  }
+  let data = {
+    alarmTypeId: formData2.value.alarmTypeId,
+    notificationDepartCode: formData2.value.involveDepartId,
+    notificationDepartName: formData2.value.involveDepartName,
+    alarmContent: formData2.value.alarmContent
+  }
+  await alarmNotificationCommit(data);
+  showNotification.value = false;
+  feedback.msgSuccess("操作成功");
+}
+
 onMounted(() => {
     getList();
 });

src/views/sensitivePerception/PoliceNegative.vue

@@ -75,7 +75,8 @@
             <template #icon>
               <icon name="el-icon-Search"/>
             </template>
-                        查询</el-button
+            查询
+          </el-button
           >
           <el-button @click="reset">重置</el-button>
         </div>
@@ -136,7 +137,15 @@
                 type="primary"
                 link
                 @click="handleShowProfile(row)"
-                            >问题详情</el-button
+            >问题详情
+            </el-button
+            >
+            <el-button
+                type="primary"
+                link
+                @click="handleShowNotification"
+            >预警提醒
+            </el-button
             >
           </template>
         </el-table-column>
@@ -420,7 +429,8 @@
                   type="primary"
                   link
                   @click="handleAction(row)"
-                                >查看详情</el-button
+              >查看详情
+              </el-button
               >
             </template>
           </el-table-column>
@@ -442,6 +452,83 @@
     </el-scrollbar>
   </el-dialog>
 
+  <el-dialog v-model="showNotification" title="创建提醒" width="600px">
+    <el-form label-width="148" :model="formData2" ref="formRef">
+      <el-form-item label="提醒类型">
+        <div class="flex gap">
+          <el-select
+              v-model="formData2.alarmTypeId"
+              style="min-width: 185px"
+          >
+            <el-option :value="1" label="预警问题"/>
+            <el-option :value="2" label="风险问题"/>
+            <el-option :value="3" label="提醒通知"/>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item
+          style="width: 333px"
+          label="被通知单位"
+          prop="involveDepartId"
+          :rules="{
+                                message: '请选择问题涉及单位',
+                                trigger: ['blur'],
+                            }"
+      >
+        <depart-tree-select
+            v-model="formData2.involveDepartId"
+            :check-strictly="true"
+            @node-click=" (row) => changeDepart(row)"
+        />
+      </el-form-item>
+      <el-form-item
+          label="被提醒民警"
+          prop="blameEmpNo"
+          :rules="{
+                                    required: true,
+                                    message: '请选择提醒民警',
+                                    trigger: ['blur'],
+                                }"
+      >
+        <el-select
+            v-model="police"
+            value-key="idCode"
+            placeholder="请选择提醒民警"
+            @change="changePolice"
+            style="width: 240px"
+        >
+          <el-option
+              v-for="item in polices"
+              :key="item.idCode"
+              :label="item.name"
+              :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+          label="提醒内容"
+      >
+        <el-input
+            type="textarea"
+            v-model="formData2.alarmContent"
+            :autosize="{ minRows: 12 }"
+            :rules="{
+                                message: '请填写提醒内容',
+                                trigger: ['blur'],
+                            }"
+            style="width: 280px"
+        />
+      </el-form-item>
+    </el-form>
+    <footer class="flex end">
+      <el-button @click="showNotification = false" size="large">取消</el-button>
+      <el-button type="primary" @click="handleNotification" size="large"
+      >提交
+      </el-button
+      >
+    </footer>
+  </el-dialog>
+
   <negative-dialog
       v-model="negativeShow"
       :id="activeNegativeId"
@@ -456,13 +543,87 @@ import {
   listNegativeByPoliceIdCode,
   listNegativeMonthly,
 } from "@/api/sensitivePerception/profilePolice";
-import { InspectCase } from "@/enums/dictEnums";
+import {HostLevel, InspectCase} from "@/enums/dictEnums";
 import {getDictLable, getGenderFromIdCode} from "@/utils/util";
 import moment from "moment";
 
 import useCatchStore from "@/stores/modules/catch";
+import {ref} from "vue";
+import {alarmNotificationCommit} from "~/api/work/alarm";
+import feedback from "~/utils/feedback";
+import {listPoliceAll, listPoliceLeader} from "~/api/system/police";
+
 const catchStore = useCatchStore();
 const dict = catchStore.getDicts(["personType"]);
+let showNotification = ref(false)
+let formData2 = ref({
+  alarmTypeId: 1,
+  involveDepartId: '',
+  involveDepartName: '',
+  alarmContent: '',
+  blameName: '',
+  blameIdCode: '',
+  blameEmpNo: '',
+  blames: {},
+  level: -1
+})
+let police = ref({})
+let polices = ref([])
+
+const handleShowNotification = () => {
+  showNotification.value = true
+}
+
+const handleNotification = async () => {
+  if(formData2.value.involveDepartId == '') {
+    feedback.msgWarning("请选择被提醒单位");
+    return;
+  }
+  if(formData2.value.alarmContent == '') {
+    feedback.msgWarning("请填写提醒内容");
+    return;
+  }
+  if(formData2.value.policeIdCode == '') {
+    feedback.msgWarning("请选择被提醒民警");
+    return;
+  }
+  let data = {
+    alarmTypeId: formData2.value.alarmTypeId,
+    notificationDepartCode: formData2.value.involveDepartId,
+    notificationDepartName: formData2.value.involveDepartName,
+    alarmContent: formData2.value.alarmContent,
+    policeName: police.value.name,
+    policeIdCode: police.value.idCode,
+    policeNo: police.value.empNo
+  }
+  await alarmNotificationCommit(data);
+  showNotification.value = false;
+  feedback.msgSuccess("操作成功");
+}
+
+const changeDepart = (row) => {
+  formData2.value.involveDepartName = row.shortName;
+  formData2.value.level = row.level
+  police.value = {}
+  getPolices(row.id);
+}
+
+const changePolice  = (data) => {
+  police.value = {
+    idCode: data.idCode,
+    empNo: data.empNo,
+    name: data.name
+  }
+}
+
+function getPolices(departId) {
+  if(departId=='') {
+    return;
+  }
+  listPoliceLeader(departId).then(res => {
+    polices.value = res
+  })
+}
 
 const query = ref({
   current: 1,
@@ -476,6 +637,7 @@ const list = ref<any[]>([]);
 const total = ref(0);
 
 const mainLoading = ref(false);
+
 function getList() {
   mainLoading.value = true;
   listPoliceNegative(query.value).then((data) => {
@@ -615,6 +777,7 @@ const radarOption = ref({
 });
 
 const score = ref(0);
+
 async function getProfileData() {
   loading.value = true;
   negativeQuery.value.idCode = activeRow.value.idCode;
@@ -654,6 +817,7 @@ function getNegativeList() {
 
 const negativeShow = ref(false);
 const activeNegativeId = ref("");
+
 function handleAction(row) {
   negativeShow.value = true;
   activeNegativeId.value = row.id;
@@ -702,25 +866,31 @@ function getScoreLabel() {
 .col {
   --label-width: 60px;
 }
+
 .score-progress-body {
   text-align: center;
   font-size: 18px;
+
   .score-progress_score {
     font-size: 60px;
     line-height: 84px;
   }
+
   .score-progress_title {
     font-size: 26px;
     line-height: 22px;
   }
 }
+
 .score-theme {
   &[type="success"] {
     color: var(--success-color);
   }
+
   &[type="warning"] {
     color: #e87749;
   }
+
   &[type="danger"] {
     color: var(--danger-color);
   }

src/views/sensitivePerception/RiskClue.vue

@@ -50,7 +50,8 @@
                 <template #icon>
                   <icon name="el-icon-Search"/>
                 </template>
-                                查询</el-button
+                查询
+              </el-button
               >
               <el-button @click="reset">重置</el-button>
             </div>
@@ -88,16 +89,16 @@
                 <span style="white-space: pre-wrap;">{{ row.data }}</span>
               </template>
             </el-table-column>
-<!--                        <el-table-column label="操作" width="180">-->
+            <el-table-column label="操作" width="180">
-<!--                            <template #default="{ row }">-->
+              <template #default="{ row }">
-                                <!-- <el-button
+                <el-button
                     type="primary"
                     link
-                                    @click="handleShowDetail(row)"
+                    @click="handleShowNotification(row.id)"
-                                    >查看详情</el-button
+                >预警提醒
-                                > -->
+                </el-button>
-<!--                            </template>-->
+              </template>
-<!--                        </el-table-column>-->
+            </el-table-column>
           </el-table>
         </div>
         <div class="flex end mt-8">
@@ -116,11 +117,91 @@
         </div>
       </el-col>
     </el-row>
+
+    <el-dialog v-model="showNotification" title="创建提醒" width="600px">
+      <el-form label-width="148" :model="formData2" ref="formRef">
+        <el-form-item label="提醒类型">
+          <div class="flex gap">
+            <el-select
+                v-model="formData2.alarmTypeId"
+                style="min-width: 185px"
+            >
+              <el-option :value="1" label="预警问题"/>
+              <el-option :value="2" label="风险问题"/>
+              <el-option :value="3" label="提醒通知"/>
+            </el-select>
+          </div>
+        </el-form-item>
+        <el-form-item
+            style="width: 333px"
+            label="被通知单位"
+            prop="involveDepartId"
+            :rules="{
+                                message: '请选择问题涉及单位',
+                                trigger: ['blur'],
+                            }"
+        >
+          <depart-tree-select
+              v-model="formData2.involveDepartId"
+              :check-strictly="true"
+              @node-click=" (row) => changeDepart(row)"
+          />
+        </el-form-item>
+        <el-form-item
+            label="被提醒民警"
+            prop="blameEmpNo"
+            :rules="{
+                                    required: true,
+                                    message: '请选择提醒民警',
+                                    trigger: ['blur'],
+                                }"
+        >
+          <el-select
+              v-model="police"
+              value-key="idCode"
+              placeholder="请选择提醒民警"
+              @change="changePolice"
+              style="width: 240px"
+          >
+            <el-option
+                v-for="item in polices"
+                :key="item.idCode"
+                :label="item.name"
+                :value="item"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+            label="提醒内容"
+        >
+          <el-input
+              type="textarea"
+              v-model="formData2.alarmContent"
+              :autosize="{ minRows: 12 }"
+              :rules="{
+                                message: '请填写提醒内容',
+                                trigger: ['blur'],
+                            }"
+              style="width: 280px"
+          />
+        </el-form-item>
+      </el-form>
+      <footer class="flex end">
+        <el-button @click="showNotification = false" size="large">取消</el-button>
+        <el-button type="primary" @click="handleNotification" size="large"
+        >提交
+        </el-button
+        >
+      </footer>
+    </el-dialog>
   </div>
 </template>
 <script lang="ts" setup>
 import {listRiskClues} from "@/api/sensitivePerception/riskClue";
-
+import {listPoliceAll} from "~/api/system/police";
+import {ref} from "vue";
+import {alarmNotificationCommit} from "~/api/work/alarm";
+import feedback from "~/utils/feedback";
 const query = ref({});
 
 const list = ref([]);
@@ -141,6 +222,82 @@ watch(
 );
 
 const loading = ref(false)
+
+let showNotification = ref(false)
+let formData2 = ref({
+  alarmTypeId: 1,
+  involveDepartId: '',
+  involveDepartName: '',
+  alarmContent: '',
+  blameName: '',
+  blameIdCode: '',
+  blameEmpNo: '',
+  blames: {},
+  level: -1
+})
+let police = ref({})
+let polices = ref([])
+let currentClueId = ref(-1)
+
+const handleShowNotification = (id) => {
+  showNotification.value = true
+  currentClueId.value = id
+}
+
+const handleNotification = async () => {
+  if(formData2.value.involveDepartId == '') {
+    feedback.msgWarning("请选择被提醒单位");
+    return;
+  }
+  if(formData2.value.alarmContent == '') {
+    feedback.msgWarning("请填写提醒内容");
+    return;
+  }
+  if(formData2.value.policeIdCode == '') {
+    feedback.msgWarning("请选择被提醒民警");
+    return;
+  }
+  let data = {
+    alarmTypeId: formData2.value.alarmTypeId,
+    notificationDepartCode: formData2.value.involveDepartId,
+    notificationDepartName: formData2.value.involveDepartName,
+    alarmContent: formData2.value.alarmContent,
+    policeName: police.value.name,
+    policeIdCode: police.value.idCode,
+    policeNo: police.value.empNo
+  }
+  if(currentClueId.value != -1) {
+    data['clueId'] = currentClueId.value
+  }
+  await alarmNotificationCommit(data);
+  showNotification.value = false;
+  feedback.msgSuccess("操作成功");
+}
+
+const changeDepart = (row) => {
+  formData2.value.involveDepartName = row.shortName;
+  formData2.value.level = row.level
+  police.value = {}
+  getPolices(row.id);
+}
+
+const changePolice  = (data) => {
+  police.value = {
+    idCode: data.idCode,
+    empNo: data.empNo,
+    name: data.name
+  }
+}
+
+function getPolices(departId) {
+  if(departId=='') {
+    return;
+  }
+  listPoliceAll(departId).then(res => {
+    polices.value = res
+  })
+}
+
 function getList() {
   loading.value = true
   listRiskClues(query.value).then((data) => {

src/views/sensitivePerception/RiskPersonnel.vue

@@ -48,7 +48,8 @@
             <template #icon>
               <icon name="el-icon-Search"/>
             </template>
-                        查询</el-button
+            查询
+          </el-button
           >
           <el-button @click="reset">重置</el-button>
         </div>
@@ -80,7 +81,8 @@
               <el-tag
                   v-for="item in row.tags.split(',')"
                   :key="item"
-                                >{{ item }}</el-tag
+              >{{ item }}
+              </el-tag
               >
             </div>
           </template>
@@ -92,7 +94,8 @@
                   type="danger"
                   v-for="item in row.smallTags"
                   :key="item"
-                                >{{ item }}</el-tag
+              >{{ item }}
+              </el-tag
               >
             </div>
           </template>
@@ -109,8 +112,15 @@
                 type="primary"
                 link
                 @click="handleShowDesc(row)"
-                            >查看详情</el-button
+            >查看详情
+            </el-button
             >
+            <el-button
+                type="primary"
+                link
+                @click="handleShowNotification"
+            >预警提醒
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -192,18 +202,169 @@
       </div>
     </div>
   </el-dialog>
+  <el-dialog v-model="showNotification" title="创建提醒" width="600px">
+    <el-form label-width="148" :model="formData2" ref="formRef">
+      <el-form-item label="提醒类型">
+        <div class="flex gap">
+          <el-select
+              v-model="formData2.alarmTypeId"
+              style="min-width: 185px"
+          >
+            <el-option :value="1" label="预警问题"/>
+            <el-option :value="2" label="风险问题"/>
+            <el-option :value="3" label="提醒通知"/>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item
+          style="width: 333px"
+          label="被通知单位"
+          prop="involveDepartId"
+          :rules="{
+                                message: '请选择问题涉及单位',
+                                trigger: ['blur'],
+                            }"
+      >
+        <depart-tree-select
+            v-model="formData2.involveDepartId"
+            :check-strictly="true"
+            @node-click=" (row) => changeDepart(row)"
+        />
+      </el-form-item>
+      <el-form-item
+          label="被提醒民警"
+          prop="blameEmpNo"
+          :rules="{
+                                    required: true,
+                                    message: '请选择提醒民警',
+                                    trigger: ['blur'],
+                                }"
+      >
+        <el-select
+            v-model="police"
+            value-key="idCode"
+            placeholder="请选择提醒民警"
+            @change="changePolice"
+            style="width: 240px"
+        >
+          <el-option
+              v-for="item in polices"
+              :key="item.idCode"
+              :label="item.name"
+              :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+          label="提醒内容"
+      >
+        <el-input
+            type="textarea"
+            v-model="formData2.alarmContent"
+            :autosize="{ minRows: 12 }"
+            :rules="{
+                                message: '请填写提醒内容',
+                                trigger: ['blur'],
+                            }"
+            style="width: 280px"
+        />
+      </el-form-item>
+    </el-form>
+    <footer class="flex end">
+      <el-button @click="showNotification = false" size="large">取消</el-button>
+      <el-button type="primary" @click="handleNotification" size="large"
+      >提交
+      </el-button
+      >
+    </footer>
+  </el-dialog>
 </template>
 <script lang="ts" setup>
 import {
   listRiskPersonnel,
   getRiskPersonnel,
 } from "@/api/sensitivePerception/riskPersonnel";
+import {ref} from "vue";
+import {alarmNotificationCommit} from "~/api/work/alarm";
+import feedback from "~/utils/feedback";
+import {listPoliceAll} from "~/api/system/police";
+
 
 const query = ref({});
 const list = ref<any[]>([]);
 const total = ref(0);
 const show = ref(false);
 
+let showNotification = ref(false)
+let formData2 = ref({
+  alarmTypeId: 1,
+  involveDepartId: '',
+  involveDepartName: '',
+  alarmContent: '',
+  blameName: '',
+  blameIdCode: '',
+  blameEmpNo: '',
+  blames: {},
+  level: -1
+})
+let police = ref({})
+let polices = ref([])
+
+const handleShowNotification = () => {
+  showNotification.value = true
+}
+
+const handleNotification = async () => {
+  if(formData2.value.involveDepartId == '') {
+    feedback.msgWarning("请选择被提醒单位");
+    return;
+  }
+  if(formData2.value.alarmContent == '') {
+    feedback.msgWarning("请填写提醒内容");
+    return;
+  }
+  if(formData2.value.policeIdCode == '') {
+    feedback.msgWarning("请选择被提醒民警");
+    return;
+  }
+  let data = {
+    alarmTypeId: formData2.value.alarmTypeId,
+    notificationDepartCode: formData2.value.involveDepartId,
+    notificationDepartName: formData2.value.involveDepartName,
+    alarmContent: formData2.value.alarmContent,
+    policeName: police.value.name,
+    policeIdCode: police.value.idCode,
+    policeNo: police.value.empNo
+  }
+  await alarmNotificationCommit(data);
+  showNotification.value = false;
+  feedback.msgSuccess("操作成功");
+}
+
+const changeDepart = (row) => {
+  formData2.value.involveDepartName = row.shortName;
+  formData2.value.level = row.level
+  police.value = {}
+  getPolices(row.id);
+}
+
+const changePolice  = (data) => {
+  police.value = {
+    idCode: data.idCode,
+    empNo: data.empNo,
+    name: data.name
+  }
+}
+
+function getPolices(departId) {
+  if(departId=='') {
+    return;
+  }
+  listPoliceAll(departId).then(res => {
+    polices.value = res
+  })
+}
+
 function getList() {
   listRiskPersonnel(query.value).then((data) => {
     list.value = data.records;
@@ -224,6 +385,7 @@ const activeRow = ref({});
 const personal = ref({
   riskClueList: [],
 });
+
 async function handleShowDesc(row) {
   activeRow.value = row;
   const data = await getRiskPersonnel(row.id);

src/views/work/Alarm.vue

@@ -102,7 +102,13 @@
           <el-table-column
               label="被通知单位"
               prop="notificationDepartName"
-              width="150"
+              width="90"
+              show-overflow-tooltip
+          />
+          <el-table-column
+              label="被通知民警"
+              prop="policeName"
+              width="90"
           />
           <el-table-column
               label="提醒内容"
@@ -176,6 +182,15 @@
               style="width: 280px"
           />
         </el-form-item>
+        <el-form-item
+            label="被通知单位"
+        >
+          <el-input
+              v-model="formData.policeName"
+              disabled
+              style="width: 280px"
+          />
+        </el-form-item>
         <el-form-item
             label="提醒内容"
         >
@@ -245,6 +260,15 @@
               style="width: 280px"
           />
         </el-form-item>
+        <el-form-item
+            label="被通知单位"
+        >
+          <el-input
+              v-model="showData.policeName"
+              disabled
+              style="width: 280px"
+          />
+        </el-form-item>
         <el-form-item
             label="提醒内容"
         >