From 323fcd25fe7fd2baaef2309c55b5582f5dc719c2 Mon Sep 17 00:00:00 2001
From: lcw <1878680531@qq.com>
Date: Thu, 5 Feb 2026 17:17:25 +0800
Subject: [PATCH] lcw

---
 src/components/aboutTable/Search.vue          |   7 +
 src/router/index.js                           |  28 +-
 .../appraisalManagement/components/Items.vue  | 265 ++++++++++++++++++
 .../components/addForm.vue                    |  95 +++++++
 .../appraisalManagement/index.vue             | 167 +++++++++++
 .../components/discussionDialog.vue           |  53 +++-
 .../backOfficeSystem/policeReport/index.vue   | 100 ++++---
 7 files changed, 660 insertions(+), 55 deletions(-)
 create mode 100644 src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/Items.vue
 create mode 100644 src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/addForm.vue
 create mode 100644 src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue

diff --git a/src/components/aboutTable/Search.vue b/src/components/aboutTable/Search.vue
index 7b18088..3cc4dc8 100644
--- a/src/components/aboutTable/Search.vue
+++ b/src/components/aboutTable/Search.vue
@@ -415,6 +415,13 @@ const reset = () => {
   emit("reset", true);
   emit("submit", searchObj);
 };
+
+// 暴露searchObj给父组件
+defineExpose({
+  searchObj,
+  submit,
+  reset
+});
 watchEffect(() => {
   loadingPage.value = true;
   let arr = JSON.parse(JSON.stringify(props.searchArr));
diff --git a/src/router/index.js b/src/router/index.js
index 6b84dd2..8125731 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -365,7 +365,7 @@ export const publicRoutes = [
           //   component: () => import("@/views/backOfficeSystem/HumanIntelligence/FollowLeads/index"),
           //   meta: { title: "转线索列表", icon: "article-create" },
           // },
-          
+
           // {
           //   path: "/CollectPoints",
           //   name: "CollectPoints",
@@ -375,7 +375,7 @@ export const publicRoutes = [
           //     icon: "article-create"
           //   }
           // },
-          
+
           {
             path: "/supplementReportList",
             name: "supplementReportList",
@@ -606,7 +606,7 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-          
+
           {
             path: "/mpvGroup",
             name: "mpvGroup",
@@ -616,7 +616,7 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-          
+
           {
             path: "/mpvCar",
             name: "mpvCar",
@@ -742,14 +742,15 @@ export const publicRoutes = [
             }
           },
           {
-            path: "/JobAppraisal",
-            name: "JobAppraisal",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index"),
+            path: "/appraisalManagement",
+            name: "appraisalManagement",
+            component: () => import("@/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index"),
             meta: {
-              title: "工作考核",
+              title: "考核管理",
               icon: "article-create"
             }
           },
+
           {
             path: "/FileData",
             name: "FileData",
@@ -1180,7 +1181,7 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-          
+
           {
             path: "/strategicResearch",
             name: "strategicResearch",
@@ -1190,6 +1191,15 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
+          {
+            path: "/JobAppraisal",
+            name: "JobAppraisal",
+            component: () => import("@/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index"),
+            meta: {
+              title: "工作考核",
+              icon: "article-create"
+            }
+          },
           // {
           //     path: "/ResearchHome",
           //     name: "ResearchHome",
diff --git a/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/Items.vue b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/Items.vue
new file mode 100644
index 0000000..e309bda
--- /dev/null
+++ b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/Items.vue
@@ -0,0 +1,265 @@
+<template>
+  <div class="items-container">
+    <el-card class="item-card">
+      <template #header>
+        <div class="card-header">
+          <span class="card-title">考核详情</span>
+        </div>
+      </template>
+      <div class="item-grid">
+        <!-- <div class="item-row">
+          <div class="item-col">
+            <span class="item-label">研判分数：</span>
+            <span class="item-value">{{ row.ypfs || 0 }}</span>
+          </div>
+          <div class="item-col">
+            <span class="item-label">采集分数：</span>
+            <span class="item-value">{{ row.cjfs || 0 }}</span>
+          </div>
+        </div> -->
+        <div class="item-section">
+          <h4>分数详情</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">研判分数：</span>
+              <span class="item-value">{{ row.ypfs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">采集分数：</span>
+              <span class="item-value">{{ row.cjfs || 0 }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="item-section">
+          <h4>七类人员</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.qlryZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.qlryQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.qlryFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.qlryQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.qlryFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>人像预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.rxyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.rxyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.rxyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.rxyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.rxyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>车辆预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.clyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.clyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.clyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.clyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.clyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>布控预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.bkyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.bkyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.bkyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.bkyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.bkyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="item-section">
+          <h4>政保预警</h4>
+          <div class="item-grid">
+            <div class="item-col">
+              <span class="item-label">总数：</span>
+              <span class="item-value">{{ row.zbyjZs || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收数：</span>
+              <span class="item-value">{{ row.zbyjQss || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈数：</span>
+              <span class="item-value">{{ row.zbyjFks || 0 }}</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">签收率：</span>
+              <span class="item-value">{{ (row.zbyjQsl || 0) * 100 }}%</span>
+            </div>
+            <div class="item-col">
+              <span class="item-label">反馈率：</span>
+              <span class="item-value">{{ (row.zbyjFkl || 0) * 100 }}%</span>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="item-row">
+          <div class="item-col">
+            <span class="item-label">更新时间：</span>
+            <span class="item-value">{{ row.gxsj || '-' }}</span>
+          </div>
+        </div> -->
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup>
+import { defineProps } from 'vue';
+
+const props = defineProps({
+  row: {
+    type: Object,
+    default: () => ({})
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.items-container {
+  width: 100%;
+  padding: 10px;
+  height: 40vh;
+  overflow: auto;
+}
+
+.item-card {
+  margin-bottom: 10px;
+  background-color: #f0f0f0;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .card-title {
+    color: #000;
+  }
+}
+
+.item-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  gap: 15px;
+  margin-bottom: 20px;
+}
+
+.item-section {
+  margin-bottom: 25px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #f0f0f0;
+
+  h4 {
+    margin-bottom: 15px;
+    color: #303133;
+    font-size: 14px;
+    font-weight: bold;
+  }
+}
+
+.item-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin-bottom: 15px;
+}
+
+.item-col {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.item-label {
+  color: #606266;
+  font-size: 13px;
+  white-space: nowrap;
+}
+
+.item-value {
+  color: #303133;
+  font-size: 13px;
+  font-weight: 500;
+}
+
+// 响应式调整
+@media (max-width: 768px) {
+  .item-grid {
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+  }
+
+  .item-row {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+  }
+}
+</style>
diff --git a/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/addForm.vue
new file mode 100644
index 0000000..2735387
--- /dev/null
+++ b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/components/addForm.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">工作考核{{ title }} </span>
+      <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" v-if="title !='详情'">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" :disabled="title =='详情'"></FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { IdCard } from "@/utils/validate.js";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "考核部门", prop: "ssbmdm", depMc: "ssbm", type: "department" },
+  { label: "考核开始日期", prop: "ksrq", type: "date" },
+  { label: "考核结束日期", prop: "jsrq", type: "date" },
+  { label: "考核描述", prop: "khzbms", type: "textarea", width: "100%" },
+
+
+]);
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  ssbmdm: [{ required: true, message: "请选择考核部门", trigger: "change" }],
+  ksrq: [{ required: true, message: "请选择考核开始日期", trigger: "change" }],
+  jsrq: [{ required: true, message: "请选择考核结束日期", trigger: "change" }],
+  khzbms: [{ required: true, message: "请输入考核描述", trigger: "blur" }],
+  // ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
+});
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "detail" ? "详情" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({ id }, `/mosty-gsxt/khgl/${id}`).then((res) => {
+    listQuery.value = res;
+  });
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let url = title.value == "新增" ? "/mosty-gsxt/khgl/addEntity" : "/mosty-gsxt/khgl/editEntity";
+    let params = { ...data };
+    console.log(params);
+    loading.value = true;
+    qcckPost(params, url).then(() => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      close();
+    }).catch(() => { loading.value = false; });
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+::v-deep .el-textarea__inner {
+  height: 38.5em !important;
+}
+</style>
diff --git a/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue
new file mode 100644
index 0000000..9fa7369
--- /dev/null
+++ b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue
@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <!-- 搜索 -->
+    <div ref="searchBox" class="mt10">
+      <Search :searchArr="searchConfiger" @submit="onSearch" />
+    </div>
+    <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+      <template #left>
+        <el-button size="small" type="primary" @click="addEdit('add', '')">
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
+      </template>
+    </PageTitle>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <!-- <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"> -->
+             <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        expand :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #expand="{ props }">
+          <div style="max-width: 100%">
+            <Items :row="props || {}" />
+          </div>
+        </template>
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+             <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }" />
+    </div>
+    <!-- 详情 -->
+    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag"
+      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM, D_GS_RLQB_JCQK }" />
+  </div>
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import DetailForm from "./components/addForm.vue";
+import Items from "./components/Items.vue";
+import { qcckGet, qcckPost, qcckDelete} from "@/api/qcckApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+const { proxy } = getCurrentInstance();
+const { D_GS_RLQB_JCQK, D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict("D_GS_RLQB_JCQK", "D_BZ_WHCD", "D_BZ_MZ", "D_BZ_XB", "D_BZ_ZZMM"); //获取字典数据
+const detailDiloag = ref();
+const searchBox = ref(); //搜索框
+const show = ref(false);
+const searchConfiger = ref([
+  { label: "所属部门", prop: "ssbmdm", placeholder: "请选择所属部门", showType: "department" },
+  { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "datetimerange" }
+]);
+
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 200,
+  tableColumn: [
+    // { label: "布控预警反馈率", prop: "bkyjFkl" },
+    // { label: "布控预警签收率", prop: "bkyjQsl"  },
+    // { label: "采集分数", prop: "cjfs" },
+    // { label: "车辆预警反馈率", prop: "clyjFkl" },
+    // { label: "车辆预警签收率", prop: "clyjQsl"},
+    // { label: "7类重点人员反馈率", prop: "qlryFkl" },
+    // { label: "7类重点人员签收率", prop: "qlryQsl" },
+    // { label: "人像预警反馈率", prop: "rxyjFkl" },
+    // { label: "人像预警签收率", prop: "rxyjQsl" },
+    // { label: "政保预警反馈率", prop: "zbyjFkl" },
+    // { label: "政保预警签收率", prop: "zbyjQsl" },
+    // { label: "采集分数", prop: "cjfs" },
+    // { label: "研判分数", prop: "ypfs" },
+    { label: "考核开始日期", prop: "ksrq" },
+    { label: "考核结束日期", prop: "jsrq" },
+    { label: "考核年份", prop: "khnf" },
+    { label: "所属部门", prop: "ssbm" },
+  ]
+});
+
+const queryFrom = ref({});
+
+onMounted(() => {
+  getList();
+  tabHeightFn();
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  qcckGet(data, "/mosty-gsxt/khgl/getPageList").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
+};
+
+// 删除
+const deleteRow = (id) => {
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckDelete({ ids:[id]}, "/mosty-gsxt/khgl/deleteEntity").then(() => {
+      proxy.$message({ type: "success", message: "删除成功" });
+      getList();
+    });
+  })
+};
+
+// 详情
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(() => {
+    detailDiloag.value.init(type, row);
+  });
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>
diff --git a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue
index 485e9d4..f3340ab 100644
--- a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <el-dialog :model-value="modelValue" :destroy-on-close="true" :title="title" @close="close" :close-on-click-modal="true">
+    <el-dialog :model-value="modelValue" :destroy-on-close="true" :title="title" @close="close"
+      :close-on-click-modal="true">
+      {{ getData }}
       <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
         <template #chryList>
           <el-input v-model="chryList" clearable placeholder="请选择参会人员" @click="isShowDialog = true"
@@ -24,6 +26,7 @@ import { ref, reactive, computed, getCurrentInstance } from 'vue'
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
 import { wshsAdd } from "@/api/huiShangyp/tacticalApi"
+import { qcckGet, qcckPost } from "@/api/qcckApi.js"
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   modelValue: {
@@ -58,9 +61,11 @@ const rules = reactive({
   ]
 })
 const getData = computed(() => {
+  console.log(props.dataList, "测试");
+
   return {
     glxsid: props.dataList.glzjjdbh || props.dataList.asjbh,
-    glxsmc: props.dataList.ajmc || props.dataList.bjrmc
+    glxsmc: props.dataList.ajmc ||props.dataList.bcjjnr|| props.dataList.bjrmc
   }
 })
 const listQuery = ref({})
@@ -80,17 +85,41 @@ const close = () => {
 const submit = () => {
   elform.value.submit((val) => {
     if (val) {
-      const promes = {
-        ...listQuery.value,
-        ...getData.value
+      let url
+
+      switch (props.lx) {
+        case '01':
+          const dadta = {
+            ...listQuery.value,
+            ...getData.value,
+            lylx: props.lx
+          }
+          url = '/mosty-gsxt/lzJcjPjdb/createwWshs'
+          qcckPost(dadta, url).then(res => {
+            proxy.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            emits('update:modelValue', false)
+          })
+          break;
+        default:
+          const promes = {
+            ...listQuery.value,
+            ...getData.value
+          }
+          wshsAdd(promes).then(res => {
+            proxy.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            emits('update:modelValue', false)
+          })
+          break;
       }
-      wshsAdd(promes).then(res => {
-   proxy.$message({
-          message: '添加成功',
-          type: 'success'
-        })
-         emits('update:modelValue', false)
-      })
+
+
+
 
     }
   })
diff --git a/src/views/backOfficeSystem/policeReport/index.vue b/src/views/backOfficeSystem/policeReport/index.vue
index 007292a..8fd6f0a 100644
--- a/src/views/backOfficeSystem/policeReport/index.vue
+++ b/src/views/backOfficeSystem/policeReport/index.vue
@@ -2,26 +2,21 @@
   <div>
     <!-- 搜索 -->
     <div ref="searchBox" class="mt10 mb10">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+      <Search :searchArr="searchConfiger" ref="ces"  @submit="onSearch" :key="pageData.keyCount"></Search>
     </div>
 
-    <PageTitle  :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+    <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
       <template #left>
         <el-button type="primary" size="small" @click="exportExl">导出</el-button>
+        <el-button type="primary" size="small" @click="getSlect">我的关注</el-button>
       </template>
     </PageTitle>
 
     <!-- 表格 -->
     <div class="tabBox heightBox">
-      <MyTable 
-        :tableData="pageData.tableData" 
-        :tableColumn="pageData.tableColumn" 
-        :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" 
-        :tableConfiger="pageData.tableConfiger" 
-        :controlsWidth="pageData.controlsWidth"
-        @chooseData="handleChooseData"
-      >
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+        @chooseData="handleChooseData">
         <!-- <template #jjlx="{ row }">
           <DictTag :tag="false" :value="row.jjlx" :options="D_BZ_JQBQ" />
         </template> -->
@@ -31,39 +26,36 @@
         <template #jqlbdm="{ row }">
           <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
         </template>
-        <template #ypzt="{ row }">
-            {{ row.ypzt === '01' ? '已研判' : '未研判' }}
+        <!-- <template #ypzt="{ row }">
+          {{ row.ypzt === '01' ? '已研判' : '未研判' }}
+        </template> -->
+              <template #hszt="{ row }">
+          {{ row.hszt === '01' ? '未会商' : '已会商' }}
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
+          <el-link type="warning" @click="CreateConsultationMeeting(row)">创建会商</el-link>
+                    <el-link :type=" row.sfgz=='0'?'success':'danger'" @click="Attention(row,row.sfgz=='0'?'关注':'取消关注')">{{ row.sfgz=='0'?'关注':'取消关注' }}</el-link>
           <el-link type="primary" @click="addEdit('edit', row)">详情</el-link>
           <!-- <el-link type="warning" @click="handleYP('研判', row)">研判</el-link>
           <el-link type="danger" @click="handleYP('深度研判', row)">深度研判</el-link> -->
         </template>
       </MyTable>
-      <Pages 
-        @changeNo="changeNo" 
-        @changeSize="changeSize" 
-        :tableHeight="pageData.tableHeight" 
-        :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }"
-      >
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight"
+        :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }">
       </Pages>
     </div>
     <!-- 编辑详情 -->
-    <EditAddForm  
-      v-if="show" 
-      ref="detailDiloag" 
-      :dic="{ JQLB,JQLX,JQXL,JQZL,D_BZ_JQLY,D_BZ_JQFL,JQLB_DP,D_BZ_JQBQ,D_GS_SSYJ }"
-      @updateDate="getList" 
-    />
+    <EditAddForm v-if="show" ref="detailDiloag"
+      :dic="{ JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ }" @updateDate="getList" />
     <!-- 研判弹窗 -->
     <YpDialog ref="ypDialog" @change="getList" />
     <DeepYpDialog ref="deepYpDialog" @change="getList" />
+     <DiscussionDialog v-model="showDialog" :dataList="dataList" :lx="lx" />
   </div>
 </template>
 
 <script setup>
-import { qcckGet } from '@/api/qcckApi.js'
 import { getMultiDictVal } from "@/utils/dict.js"
 import { exportExlByObj } from "@/utils/exportExcel.js"
 import YpDialog from "./components/ypDialog.vue";
@@ -75,8 +67,11 @@ import Search from "@/components/aboutTable/Search.vue";
 import EditAddForm from "./components/editAddForm.vue";
 import { lzJcjPjdbSelectPage } from '@/api/semanticAnalysis.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import DiscussionDialog from "@/views/backOfficeSystem/JudgmentHome/ResearchHome/components/discussionDialog.vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js"
+
 const { proxy } = getCurrentInstance();
-const { D_GS_BQ_DJ,JQLB,JQLX,JQXL,JQZL,D_BZ_JQLY,D_BZ_JQFL,JQLB_DP,D_BZ_JQBQ,D_GS_SSYJ } = proxy.$dict('D_GS_BQ_DJ',"JQLB",'JQLX','JQXL','JQZL','D_BZ_JQLY','D_BZ_JQFL','JQLB_DP','D_BZ_JQBQ','D_GS_SSYJ'); //获取字典数据
+const { D_GS_BQ_DJ, JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ } = proxy.$dict('D_GS_BQ_DJ', "JQLB", 'JQLX', 'JQXL', 'JQZL', 'D_BZ_JQLY', 'D_BZ_JQFL', 'JQLB_DP', 'D_BZ_JQBQ', 'D_GS_SSYJ'); //获取字典数据
 const ypDialog = ref();
 const deepYpDialog = ref();
 const detailDiloag = ref();
@@ -129,12 +124,12 @@ const pageData = reactive({
     { label: "报警时间", prop: "bjsj" },
     { label: "报警内容", prop: "bjnr", showOverflowTooltip: true },
     { label: "接警员姓名", prop: "jjyxm" },
-    { label: "警情级别", prop: "jqdjdm",showSolt:true },
+    { label: "警情级别", prop: "jqdjdm", showSolt: true },
     // { label: "警情标签", prop: "jjlx", showSolt: true },
-    { label: "警情类型", prop: "jqlbdm",showSolt:true },
+    { label: "警情类型", prop: "jqlbdm", showSolt: true },
     { label: "警情地址", prop: "jqdz" },
     { label: "补充接警内容", prop: "bcjjnr", showOverflowTooltip: true },
-    { label: "会商状态", prop: "ypzt",showSolt:true },
+    { label: "会商状态", prop: "hszt", showSolt: true },
 
   ]
 });
@@ -149,6 +144,13 @@ const onSearch = (val) => {
   pageData.pageConfiger.pageCurrent = 1;
   getList()
 }
+const ces=ref()
+// 点击关注
+const getSlect = () => {
+  listQuery.value = { ...ces.value.searchObj , sfgz: 1 };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList()
+}
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
@@ -167,7 +169,6 @@ const getList = () => {
     ...listQuery.value
   }
   lzJcjPjdbSelectPage(params).then(res => {
-    console.log(res);
     pageData.tableData = res.records || [];
     pageData.total = res.total;
   }).finally(() => {
@@ -184,9 +185,9 @@ const addEdit = (type, row) => {
 };
 
 const handleYP = (type, row) => {
-  if(type === '研判'){
+  if (type === '研判') {
     ypDialog.value.init(row);
-  }else{
+  } else {
     deepYpDialog.value.init(row);
   }
 }
@@ -216,11 +217,42 @@ const exportExl = () => {
       ...item,
       jqdjdm_name: getMultiDictVal(item.jqdjdm, D_GS_BQ_DJ),
       jqlbdm_name: getMultiDictVal(item.jqlbdm, JQLB),
-      ypzt_name: item.ypzt === '01' ? '已研判' : '未研判',
+      ypzt_name: item.hszt === '01' ? '未会商' : '已会商',
     }
   })
   exportExlByObj(titleObj, data, '警情管理')
 }
+// 创建会商
+const showDialog = ref(false)
+const dataList = ref({})
+const lx = ref('01')
+const CreateConsultationMeeting = (val) => {
+  dataList.value = val
+showDialog.value=true
+}
+// 是否关注
+const Attention = (val,str) => {
+proxy.$confirm(`是否${str}该警情？`, '提示', {
+  confirmButtonText: '确定',
+  cancelButtonText: '取消',
+  type: 'warning'
+}).then(() => {
+  // 关注警情
+qcckPost({
+  id: val.jjdbh,
+  sfgz: val.sfgz === '0' ? '1' : '0',
+},'/mosty-gsxt/lzJcjPjdb/jqgz').then(res => {
+    proxy.$message({
+      message: `${str}成功`,
+      type: 'success'
+    })
+    getList()
+})
+
+}).catch(() => {
+  // 取消关注
+});
+}
 
 
 // 表格高度计算