Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

更新预警
2025-12-18 10:23:25 +08:00 · 2025-12-18 10:22:42 +08:00
18 changed files with 1118 additions and 471 deletions
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/components/czjy.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/components/czjy.vue
@ -0,0 +1,48 @@
+<template>
+    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="closeHndle">
+        <el-form :model="form" ref="formRef" :rules="rules" label-width="120px" >
+            <el-form-item label="处置建议" prop="jynr">
+                <el-input v-model="form.jynr" placeholder="请输入处置建议" type="textarea"></el-input>
+            </el-form-item>
+                <div class="flex just-center">
+                    <el-button type="primary" @click="okSubmit">确定</el-button>
+                    <el-button @click="closeHndle">返回</el-button>
+                </div>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+import { qcckPost } from "@/api/qcckApi.js";
+import { ref , defineExpose} from 'vue'
+const emit = defineEmits(['okSubmit'])
+const visible = ref(false)
+const formRef = ref()
+const form = ref({})
+
+const rules = ref({
+  jynr: [
+    { required: true, message: '请输入处置建议', trigger: 'blur' }
+  ]
+})
+const init = (row) => {
+  visible.value = true;
+  form.value.yjid = row.id;
+}
+const closeHndle = () => {
+  visible.value = false;
+  form.value = {};
+}
+const okSubmit = async () => {
+  await formRef.value.validate((valid) => {
+    if (!valid)  return;
+    qcckPost(form.value,'/mosty-gsxt/yjxx/czjy/insert').then((res) => {
+        emit('okSubmit', {...form.value})
+        closeHndle()
+    })
+  })
+}
+defineExpose({
+  init
+})
+</script>
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue
@ -38,11 +38,12 @@
        </template>
        <template #controls="{ row }">
          <el-link type="warning" @click="pushAssess(row)">全息档案</el-link>
-          <el-link type="primary" @click="showDetail(row)">转合成</el-link>
-          <el-link type="danger" @click="delDictItem(row.id)">转会商</el-link>
-          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01'">签收</el-link>
-          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02'">反馈</el-link>
-          <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link>
+          <el-link type="primary" @click="handleCzjy(row)" v-if="roleCode">处置建议</el-link>
+          <!-- <el-link type="primary" @click="showDetail(row)">转合成</el-link>
+          <el-link type="danger" @click="delDictItem(row.id)">转会商</el-link> -->
+          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01' && permission_sfqs ">签收</el-link>
+          <el-link type="success" @click="handleQsFk(row, '反馈')" v-if="row.czzt == '02' && permission_sfqs">反馈</el-link>
+          <!-- <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link> -->
          <el-link type="primary" @click="openAddModel(row)">详情</el-link>
        </template>
      </MyTable>
@ -62,9 +63,15 @@
  </Information>
  <!-- 详情 -->
  <AddFrom ref="addModelRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_GS_SSYJ }"></AddFrom>
+
+<!-- 处置建议 -->
+  <Czjy ref="czjyRef" @okSubmit="getList"></Czjy>
+
 </template>

 <script setup>
+import Czjy from './components/czjy.vue'
+import { getItem, setItem } from '@/utils/storage'
 import * as XLSX from "xlsx";
 import Detail from './components/detail.vue'
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
@ -84,8 +91,9 @@ import AddFrom from './components/addFrom.vue'
 import { holographicProfileJump } from "@/utils/tools.js"
 import { getMultiDictVal } from "@/utils/dict.js"
 import { exportExlByObj } from "@/utils/exportExcel.js"
-
-
+const czjyRef = ref()
+const permission_sfqs = ref(false)
+const roleCode = ref(false)
 const { proxy } = getCurrentInstance();
 const { D_GS_SSYJ, D_GSXT_YJXX_CZZT } = proxy.$dict("D_GS_SSYJ", "D_GSXT_YJXX_CZZT"); //获取字典数据

@ -132,7 +140,7 @@ const pageData = reactive({
  tableColumn: [
    { label: "姓名", prop: "xm" },
    { label: "身份证号", prop: "sfzh", width: 200 },
-    { label: "电话", prop: "dh", width: 150 },
+    // { label: "电话", prop: "dh", width: 150 },
    { label: "行为大类", prop: "xldlmc" },
    { label: "行为子类", prop: "xwzlmc", showOverflowTooltip: true },
    { label: "行为描述", prop: "xwms", showOverflowTooltip: true },
@ -140,7 +148,8 @@ const pageData = reactive({
    { label: "行为颜色", prop: "bqys", showSolt: true },
    { label: "行为分值", prop: "xwfz", },
    { label: "处置状态", prop: "czzt", showSolt: true },
-    { label: "所属县局", prop: "ssbm" },
+    { label: "所属县局", prop: "ssxgaj" },
+    { label: "处置单位", prop: "ssbm" },
  ]
 });

@ -162,12 +171,25 @@ watch(() => bqLbData.value.bqXl, (res) => {
  },)
 }, { deep: true })
 onMounted(() => {
+  let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : ''
+  permission_sfqs.value = str.startsWith('2'||'3') ? false : true;
+
+  let rols = getItem('roleList') ? getItem('roleList'):[]
+  let obj = rols.find(item => {
+    return  ['JS_666666','JS_777777','JS_888888'].includes(item.roleCode)
+  })
+  roleCode.value = obj ? true : false;
+
  tabHeightFn();
  getList()
  gettbGsxtBqglSelectList('02')

 });

+const handleCzjy = (row) => {
+  czjyRef.value.init( row)
+}
+
 // 搜索
 const onSearch = (val) => {
  queryFrom.value = { ...val }
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items
@ -0,0 +1,106 @@
+<template>
+  <div class="warning-item">
+    <div class="second-row">
+      <div class="info-item">预警人姓名：<span>{{ row.xm }}</span></div>
+      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
+      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">行为大类：<span>{{ row.xldlmc }}</span></div>
+      <div class="info-item">行为子类：<span>{{ row.xwzlmc }}</span></div>
+      <div class="info-item">行为次数：<span>{{ row.xwcs }}次</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">
+        标签颜色：
+        <DictTag :value="row.bqys" :tag="false" :color="bqYs(row.bqys)"
+          :options="Array.isArray(props.dict.D_GS_SSYJ) ? props.dict.D_GS_SSYJ : []" />
+      </div>
+      <div class=" info-item">预警时间：<span>{{ row.yjsj }}</span>
+      </div>
+      <div class="info-item">行为分值：<span>{{ row.xwfz }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">
+        处置状态：
+
+        <DictTag v-model:value="row.czzt"
+          :options="Array.isArray(props.dict.D_GSXT_YJXX_CZZT) ? props.dict.D_GSXT_YJXX_CZZT : []" />
+      </div>
+      <div class="info-item">所属部门：<span>{{ row.ssbm }}</span></div>
+      <div class="info-item">所属县局：<span>{{ row.ssxgaj }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">所属市局：<span>{{ row.sssgaj }}</span></div>
+      <div class="info-item">接警员姓名：<span>{{ row.jjyxm }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item full-width">行为描述：<span>{{ row.xwms }}</span></div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+
+const bqYs = (val) => {
+  if (val == '01') { // 红
+    return '#ff0202'
+  } else if (val == '02') { // 橙
+    return '#ff8c00'
+  } else if (val == '03') { // 黄
+    return '#c2c203' // 原亮黄色：ffff00
+  } else if (val == '04') { // 蓝
+    return '#0000ff'
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border: 1px solid #e8e8e8;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+.second-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin-bottom: 10px;
+}
+
+.info-item {
+  flex: 0 0 calc(33.33% - 20px);
+  box-sizing: border-box;
+  display: flex;
+  padding: 5px 0;
+  color: #333;
+
+  span {
+    font-weight: 500;
+    color: #606266;
+  }
+}
+
+// 全宽字段
+.full-width {
+  flex: 0 0 100% !important;
+}
+</style>
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/item/items.vue
@ -1,46 +1,42 @@
 <template>
-  <div class="warning-item">
-    <div class="second-row">
-      <div class="info-item">预警人姓名：<span>{{ row.xm }}</span></div>
-      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
-      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">行为大类：<span>{{ row.xldlmc }}</span></div>
-      <div class="info-item">行为子类：<span>{{ row.xwzlmc }}</span></div>
-      <div class="info-item">行为次数：<span>{{ row.xwcs }}次</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        标签颜色：
-        <DictTag :value="row.bqys" :tag="false" :color="bqYs(row.bqys)"
-          :options="Array.isArray(props.dict.D_GS_SSYJ) ? props.dict.D_GS_SSYJ : []" />
-      </div>
-      <div class=" info-item">预警时间：<span>{{ row.yjsj }}</span>
-      </div>
-      <div class="info-item">行为分值：<span>{{ row.xwfz }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">
-        处置状态：
+  <div class="warning-item" >

-        <DictTag v-model:value="row.czzt"
-          :options="Array.isArray(props.dict.D_GSXT_YJXX_CZZT) ? props.dict.D_GSXT_YJXX_CZZT : []" />
+    <el-divider content-position="left">处置建议</el-divider>
+    <div class="item-row" v-for="(it,idx) in list" :key="idx">
+      <div class="info-item">
+        <span class="text">预警人姓名：{{ it.jryXm }}</span>
+        <span class="text">建议时间：{{ it.jysj }}</span>
+        <span class="text">所属部门：{{ it.ssbm }}</span>
      </div>
-      <div class="info-item">所属部门：<span>{{ row.ssbm }}</span></div>
-      <div class="info-item">所属县局：<span>{{ row.ssxgaj }}</span></div>
+      <div class="info-item">建议内容：<span>{{ it.jynr || '暂无' }}</span></div>
    </div>
-    <div class="second-row">
-      <div class="info-item">所属市局：<span>{{ row.sssgaj }}</span></div>
-      <div class="info-item">接警员姓名：<span>{{ row.jjyxm }}</span></div>
+    <div>
+      <el-empty v-if="list.length === 0" description="暂无数据" />
    </div>
-    <div class="second-row">
-      <div class="info-item full-width">行为描述：<span>{{ row.xwms }}</span></div>
+
+    <el-divider content-position="left">反馈内容</el-divider>
+    <div class="item-row" v-for="(it,idx) in Fklist" :key="idx">
+      <div class="info-item">
+        <span class="text">处置地址：{{ it.czdz }}</span>
+        <span class="text">处置时间：{{ it.czsj }}</span>
+      </div>
+      <div class="info-item">
+        <span class="text">常控不尿检理由：<span>{{ it.ckbnjly || '暂无' }}</span></span>
+        <span class="text">常控处置反馈补充信息：<span>{{ it.ckczbcxx || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估：<span>{{ it.cklxzcpg || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估依据：<span>{{ it.cklxzcpgyj || '暂无' }}</span></span>
+      </div>
    </div>
+    <div>
+      <el-empty v-if="Fklist.length === 0" description="暂无数据" />
+    </div>
+    
  </div>
 </template>
-
 <script setup>
+import { ref, computed, onMounted } from 'vue'
+import { qcckPost,qcckGet } from "@/api/qcckApi.js";
+
 const props = defineProps({
  /** 表格行数据 */
  row: {
@ -55,52 +51,39 @@ const props = defineProps({
    })
  },
 })
-
-const bqYs = (val) => {
-  if (val == '01') { // 红
-    return '#ff0202'
-  } else if (val == '02') { // 橙
-    return '#ff8c00'
-  } else if (val == '03') { // 黄
-    return '#c2c203' // 原亮黄色：ffff00
-  } else if (val == '04') { // 蓝
-    return '#0000ff'
-  }
-}
-
+const list = ref([])
+const Fklist = ref([])
+onMounted(() => {
+  qcckPost({yjid: props.row.id},'/mosty-gsxt/yjxx/czjy/getPageList').then((res) => {
+    list.value = res.records || []
+  })
+  qcckGet({},'/mosty-gsxt/yjzxXwyj/'+ props.row.id).then((res) => {
+    Fklist.value = res.fkList || []
+  })
+})
+// console.log('row😃: ', props.row);
 </script>
-
 <style lang="scss" scoped>
 .warning-item {
  width: 100%;
  padding: 15px;
-  border: 1px solid #e8e8e8;
  border-radius: 8px;
  background-color: #fafafa;
 }
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
  margin-bottom: 10px;
 }
-
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
  }
 }

-// 全宽字段
-.full-width {
-  flex: 0 0 100% !important;
-}
 </style>
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/components/czjy.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/components/czjy.vue
@ -0,0 +1,49 @@
+<template>
+    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="closeHndle">
+        <el-form :model="form" ref="formRef" :rules="rules" label-width="120px" >
+            <el-form-item label="处置建议" prop="jynr">
+                <el-input v-model="form.jynr" placeholder="请输入处置建议" type="textarea"></el-input>
+            </el-form-item>
+                <div class="flex just-center">
+                    <el-button type="primary" @click="okSubmit">确定</el-button>
+                    <el-button @click="closeHndle">返回</el-button>
+                </div>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+import { qcckPost } from "@/api/qcckApi.js";
+import { ref , defineExpose} from 'vue'
+const emit = defineEmits(['okSubmit'])
+const visible = ref(false)
+const formRef = ref()
+const form = ref({})
+const rules = ref({
+  jynr: [
+    { required: true, message: '请输入处置建议', trigger: 'blur' }
+  ]
+})
+const init = (row) => {
+  visible.value = true;
+  form.value.yjid = row.id;
+}
+
+const closeHndle = () => {
+  visible.value = false;
+  form.value = {};
+}
+
+const okSubmit = async () => {
+  await formRef.value.validate((valid) => {
+    if (!valid)  return;
+    qcckPost(form.value,'/mosty-gsxt/yjxx/czjy/insert').then((res) => {
+        emit('okSubmit', {...form.value})
+        closeHndle()
+    })
+  })
+}
+defineExpose({
+  init
+})
+</script>
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue
@ -38,11 +38,12 @@
        </template>
        <template #controls="{ row }">
          <el-link type="warning" @click="pushAssess(row)">全息档案</el-link>
-          <el-link type="primary" @click="showDetail(row)">转合成</el-link>
-          <el-link type="danger" @click="delDictItem(row.id)">转会商</el-link>
-          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01'">签收</el-link>
-          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02'">反馈</el-link>
-          <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link>
+          <el-link type="primary" @click="handleCzjy(row)" v-if="roleCode">处置建议</el-link>
+          <!-- <el-link type="primary" @click="showDetail(row)">转合成</el-link>
+          <el-link type="danger" @click="delDictItem(row.id)">转会商</el-link> -->
+          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01' && permission_sfqs">签收</el-link>
+          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02'&& permission_sfqs">反馈</el-link>
+          <!-- <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link> -->
          <el-link type="primary" @click="openAddModel(row)">详情</el-link>
        </template>
      </MyTable>
@ -60,9 +61,13 @@
      :tacitly="tacitly" />
  </Information>
  <AddFrom ref="addModelRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_GS_SSYJ }" />
+  <!-- 处置建议 -->
+  <Czjy ref="czjyRef" @okSubmit="getList"></Czjy>
 </template>

 <script setup>
+import Czjy from './components/czjy.vue'
+import { getItem, setItem } from '@/utils/storage'
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import Searchs from "@/components/aboutTable/Search.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
@ -80,8 +85,10 @@ import Detail from './components/detail.vue'
 import { exportExlByObj } from "@/utils/exportExcel.js"
 import { getMultiDictVal } from "@/utils/dict.js"
 import emitter from "@/utils/eventBus.js";
-
+const permission_sfqs = ref(false)
+const roleCode = ref(false)
 const searchBox = ref();
+const czjyRef = ref()
 const { proxy } = getCurrentInstance();
 const { D_GSXT_YJXX_CZZT, D_GS_SSYJ, D_BZ_YJJB } = proxy.$dict("D_GSXT_YJXX_CZZT", "D_GS_SSYJ", "D_BZ_YJJB");

@ -119,24 +126,40 @@ const pageData = reactive({
  tableColumn: [
    { label: "姓名", prop: "xm" },
    { label: "身份证号", prop: "sfzh" },
-    { label: "电话", prop: "dh" },
-    { label: "组合大类", prop: "sfdlmc" },
-    { label: "组合小类", prop: "sfzlmc" },
+    // { label: "电话", prop: "dh" },
+     { label: "预警标签", prop: "yjbqmc" },
+    // { label: "组合大类", prop: "sfdlmc" },
+    // { label: "组合小类", prop: "sfzlmc" },
    { label: "组合次数", prop: "sfcs", showSolt: true },
    { label: "标签颜色", prop: "bqys", showSolt: true },
    { label: "预警时间", prop: "yjsj" },
    { label: "预警分值", prop: "sffz" },
    { label: "处置状态", prop: "czzt", showSolt: true },
-    { label: "所属县局", prop: "ssbm" },
+    { label: "所属县局", prop: "ssxgaj" },
+    { label: "处置单位", prop: "ssbm" },
  ]
 });

 onMounted(() => {
+  let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : ''
+  permission_sfqs.value = str.startsWith('2'||'3') ? false : true;
+
+  let rols = getItem('roleList') ? getItem('roleList'):[]
+  let obj = rols.find(item => {
+    return  ['JS_666666','JS_777777','JS_888888'].includes(item.roleCode)
+  })
+  roleCode.value = obj ? true : false;
+
  tabHeightFn();
  getList();
  gettbGsxtBqglSelectList()
 });

+
+const handleCzjy = (row) => {
+  czjyRef.value.init( row)
+}
+
 const onSearch = (val) => {
  queryFrom.value = { ...val };
  pageData.pageConfiger.pageCurrent = 1;
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items
@ -0,0 +1,74 @@
+<template>
+  <div class="warning-item">
+    <div class="second-row">
+      <div class="info-item">姓名：<span>{{ row.xm }}</span></div>
+      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
+      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">组合大类：<span>{{ row.sfdlmc }}</span></div>
+      <div class="info-item">组合小类：<span>{{ row.sfzlmc }}</span></div>
+      <div class="info-item">组合次数：<span>{{ row.sfcs }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">
+        标签颜色：<DictTag v-model:value="row.bqys" :options="props.dict.D_GS_SSYJ" />
+      </div>
+      <div class="info-item">预警时间：<span>{{ row.yjsj }}</span></div>
+      <div class="info-item">预警分值：<span>{{ row.sffz }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item">
+        处置状态：<DictTag v-model:value="row.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
+      </div>
+      <div class="info-item">所属县局：<span>{{ row.ssbm }}</span></div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+</script>
+
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border: 1px solid #e8e8e8;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+.second-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin-bottom: 10px;
+}
+
+.info-item {
+  flex: 0 0 calc(33.33% - 20px);
+  box-sizing: border-box;
+  display: flex;
+  padding: 5px 0;
+  color: #333;
+
+  span {
+    font-weight: 500;
+    color: #606266;
+  }
+}
+</style>
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/item/items.vue
@ -1,32 +1,42 @@
 <template>
-  <div class="warning-item">
-    <div class="second-row">
-      <div class="info-item">姓名：<span>{{ row.xm }}</span></div>
-      <div class="info-item">身份证号：<span>{{ row.sfzh }}</span></div>
-      <div class="info-item">电话：<span>{{ row.dh }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item">组合大类：<span>{{ row.sfdlmc }}</span></div>
-      <div class="info-item">组合小类：<span>{{ row.sfzlmc }}</span></div>
-      <div class="info-item">组合次数：<span>{{ row.sfcs }}</span></div>
-    </div>
-    <div class="second-row">
+  <div class="warning-item" >
+
+    <el-divider content-position="left">处置建议</el-divider>
+    <div class="item-row" v-for="(it,idx) in list" :key="idx">
      <div class="info-item">
-        标签颜色：<DictTag v-model:value="row.bqys" :options="props.dict.D_GS_SSYJ" />
+        <span class="text">预警人姓名：{{ it.jryXm }}</span>
+        <span class="text">建议时间：{{ it.jysj }}</span>
+        <span class="text">所属部门：{{ it.ssbm }}</span>
      </div>
-      <div class="info-item">预警时间：<span>{{ row.yjsj }}</span></div>
-      <div class="info-item">预警分值：<span>{{ row.sffz }}</span></div>
+      <div class="info-item">建议内容：<span>{{ it.jynr || '暂无' }}</span></div>
    </div>
-    <div class="second-row">
+    <div>
+      <el-empty v-if="list.length === 0" description="暂无数据" />
+    </div>
+
+    <el-divider content-position="left">反馈内容</el-divider>
+    <div class="item-row" v-for="(it,idx) in Fklist" :key="idx">
      <div class="info-item">
-        处置状态：<DictTag v-model:value="row.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
+        <span class="text">处置地址：{{ it.czdz }}</span>
+        <span class="text">处置时间：{{ it.czsj }}</span>
+      </div>
+      <div class="info-item">
+        <span class="text">常控不尿检理由：<span>{{ it.ckbnjly || '暂无' }}</span></span>
+        <span class="text">常控处置反馈补充信息：<span>{{ it.ckczbcxx || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估：<span>{{ it.cklxzcpg || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估依据：<span>{{ it.cklxzcpgyj || '暂无' }}</span></span>
      </div>
-      <div class="info-item">所属县局：<span>{{ row.ssbm }}</span></div>
    </div>
+    <div>
+      <el-empty v-if="Fklist.length === 0" description="暂无数据" />
+    </div>
+    
  </div>
 </template>
-
 <script setup>
+import { ref, computed, onMounted } from 'vue'
+import { qcckPost,qcckGet } from "@/api/qcckApi.js";
+
 const props = defineProps({
  /** 表格行数据 */
  row: {
@ -41,34 +51,39 @@ const props = defineProps({
    })
  },
 })
+const list = ref([])
+const Fklist = ref([])
+onMounted(() => {
+  qcckPost({yjid: props.row.id},'/mosty-gsxt/yjxx/czjy/getPageList').then((res) => {
+    list.value = res.records || []
+  })
+  qcckGet({},'/mosty-gsxt/yjzxZhyj/'+ props.row.id).then((res) => {
+    Fklist.value = res.fkList || []
+  })
+})
+// console.log('row😃: ', props.row);
 </script>
-
 <style lang="scss" scoped>
 .warning-item {
  width: 100%;
  padding: 15px;
-  border: 1px solid #e8e8e8;
  border-radius: 8px;
  background-color: #fafafa;
 }
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
  margin-bottom: 10px;
 }
-
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
  }
 }
+
 </style>
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/components/czjy.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/components/czjy.vue
@ -1,12 +1,12 @@
 <template>
-    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="visible = false">
+    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="closeHndle">
        <el-form :model="form" ref="formRef" :rules="rules" label-width="120px" >
            <el-form-item label="处置建议" prop="jynr">
                <el-input v-model="form.jynr" placeholder="请输入处置建议" type="textarea"></el-input>
            </el-form-item>
                <div class="flex just-center">
                    <el-button type="primary" @click="okSubmit">确定</el-button>
-                    <el-button @click="visible = false">返回</el-button>
+                    <el-button @click="closeHndle">返回</el-button>
                </div>
        </el-form>
    </el-dialog>
@ -29,12 +29,17 @@ const init = (row) => {
  form.value.yjid = row.id;
 }

+const closeHndle = () => {
+  visible.value = false;
+  form.value = {};
+}
+
 const okSubmit = async () => {
  await formRef.value.validate((valid) => {
    if (!valid)  return;
    qcckPost(form.value,'/mosty-gsxt/yjxx/czjy/insert').then((res) => {
-        visible.value = false;
-        emit('okSubmit', form.value)
+        emit('okSubmit', {...form.value})
+        closeHndle()
    })
  })
 }
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue
@ -54,7 +54,7 @@
          <!-- <el-link type="primary" @click="showDetail(row)">转合成</el-link>
          <el-link type="danger" @click="handleQsFk(row)">转会商</el-link> -->
          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01' && permission_sfqs">签收</el-link>
-          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02' && permission_fkqs">反馈</el-link>
+          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02' && permission_sfqs">反馈</el-link>
          <!-- <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link> -->
          <el-link type="primary" @click="openAddFrom(row)">详情</el-link>
        </template>
@ -138,7 +138,7 @@ const pageData = reactive({
  tableColumn: [
    { label: "姓名", prop: "xm" },
    { label: "身份证号", prop: "sfzh" },
-    { label: "电话", prop: "dh" },
+    // { label: "电话", prop: "dh" },
    { label: "预警标签", prop: "yjbqmc" },
    // { label: "组合大类", prop: "sfdlmc" },
    // { label: "组合小类", prop: "sfzlmc" },
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/czjy.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/czjy.vue
@ -0,0 +1,49 @@
+<template>
+    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="closeHndle">
+        <el-form :model="form" ref="formRef" :rules="rules" label-width="120px" >
+            <el-form-item label="处置建议" prop="jynr">
+                <el-input v-model="form.jynr" placeholder="请输入处置建议" type="textarea"></el-input>
+            </el-form-item>
+                <div class="flex just-center">
+                    <el-button type="primary" @click="okSubmit">确定</el-button>
+                    <el-button @click="closeHndle">返回</el-button>
+                </div>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+import { qcckPost } from "@/api/qcckApi.js";
+import { ref , defineExpose} from 'vue'
+const emit = defineEmits(['okSubmit'])
+const visible = ref(false)
+const formRef = ref()
+const form = ref({})
+const rules = ref({
+  jynr: [
+    { required: true, message: '请输入处置建议', trigger: 'blur' }
+  ]
+})
+const init = (row) => {
+  visible.value = true;
+  form.value.yjid = row.id;
+}
+
+const closeHndle = () => {
+  visible.value = false;
+  form.value = {};
+}
+
+const okSubmit = async () => {
+  await formRef.value.validate((valid) => {
+    if (!valid)  return;
+    qcckPost(form.value,'/mosty-gsxt/yjxx/czjy/insert').then((res) => {
+        emit('okSubmit', {...form.value})
+        closeHndle()
+    })
+  })
+}
+defineExpose({
+  init
+})
+</script>
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/localWarning.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/components/localWarning.vue
@ -7,7 +7,7 @@
        :expand="true" @chooseData="handleChooseData">
        <template #expand="{ props }">
          <div class="expand-content" style="max-width: 100%">
-            <Items :data="props" :dict="dict" />
+            <Items :row="props" :dict="dict" />
          </div>
        </template>
        <template #yjTp="{ row }">
@ -43,11 +43,12 @@
        <!-- 操作 -->
        <template #controls="{ row }">
          <el-link type="warning" @click="pushAssess(row)">全息档案</el-link>
-          <el-link type="primary" @click="showDetail(row)">转合成</el-link>
+          <el-link type="primary" @click="handleCzjy(row)" v-if="roleCode">处置建议</el-link>
+          <!-- <el-link type="primary" @click="showDetail(row)">转合成</el-link> -->
          <!-- <el-link type="danger" @click="delDictItem(row.id)">转会商</el-link> -->
-          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01'">签收</el-link>
-          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02'">反馈</el-link>
-          <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link>
+          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01' && permission_sfqs">签收</el-link>
+          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02' && permission_sfqs">反馈</el-link>
+          <!-- <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link> -->
          <el-link type="primary" @click="openAddFrom(row)">详情</el-link>
        </template>
        <!-- <el-button type="success" @click="showFeedback(item, '签收')" v-if="item.czzt == '01'">签收</el-button>
@ -68,9 +69,13 @@
      :tacitly="tacitly" />
  </Information>
  <!-- <AddFrom ref="addFrom" /> -->
+   <!-- 处置建议 -->
+  <Czjy ref="czjyRef" @okSubmit="getList"></Czjy>
 </template>

 <script setup>
+import Czjy from './czjy.vue'
+import { getItem, setItem } from '@/utils/storage'
 import Items from '../item/items.vue'
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@ -107,6 +112,11 @@ const props = defineProps({
    default: '预警信息'
  }
 });
+
+const permission_sfqs = ref(false)
+const roleCode = ref(false)
+const czjyRef = ref()
+
 const pageData = reactive({
  tableData: [], //表格数据
  keyCount: 0,
@ -146,6 +156,15 @@ const selectRows = ref([])


 onMounted(() => {
+  let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : ''
+  permission_sfqs.value = str.startsWith('2'||'3') ? false : true;
+
+  let rols = getItem('roleList') ? getItem('roleList'):[]
+  let obj = rols.find(item => {
+    return  ['JS_666666','JS_777777','JS_888888'].includes(item.roleCode)
+  })
+  roleCode.value = obj ? true : false;
+
  // tabHeightFn();
  getList()
 });
@ -208,6 +227,11 @@ const handleQsFk = (val, type) => {
  }

 }
+
+const handleCzjy = (row) => {
+  czjyRef.value.init(row)
+}
+
 // 发送指令
 const showDialog = ref(false)
 const itemData = ref()
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items
@ -0,0 +1,197 @@
+<template>
+  <div class="warning-item">
+    <!-- 第一行：图片、姓名、年龄、性别 -->
+    <div class="first-row">
+      <div class="avatar-container">
+        <template v-if="!data.yjTp || data.yjTp.includes('baidu')">
+          <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
+          <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
+        </template>
+        <el-image v-else style="width: 60px; height:70px" :src="data.yjTp" :preview-src-list="[data.yjTp]"
+          show-progress>
+          <template #error>
+            <div class="image-slot error">
+              <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
+              <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
+            </div>
+          </template>
+        </el-image>
+      </div>
+      <div class="basic-info">
+        <div class="info-items  name">姓名：<span>{{ data.yjRyxm }}</span></div>
+        <div class="info-items gender">性别：<span>       {{ IdCard(data.yjRysfzh, 3) }}</span></div>
+        <div class="info-items age">年龄：<span>       {{ IdCard(data.yjRysfzh, 2) }}</span></div>
+      </div>
+    </div>
+
+    <!-- 第二行：其他所有字段 -->
+    <div class="second-row">
+      <div class="info-item title">预警标题：<span>{{ data.yjBt }}</span></div>
+      <div class="info-item level">
+        预警级别：
+         <DictTag :color="bqYs(data.yjJb)" :tag="false" v-model:value="data.yjJb" :options="props.dict.D_BZ_YJJB" />
+        <!-- <span :class="getLevelClass(data.yjJb)">{{ data.yjJb || data.yjLx }}</span> -->
+      </div>
+      <div class="info-item similarity">相似度：<span>{{ data.xsd }}%</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item time">预警时间：<span>{{ data.yjSj }}</span></div>
+      <div class="info-item location">预警地点：<span>{{ data.yjDz }}</span></div>
+      <div class="info-item count">预警次数：<span>{{ data.yjCs }}次</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item status">
+        处置状态： <DictTag v-model:value="data.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
+
+      </div>
+      <div class="info-item phone">布控手机：<span>{{ data.yjRysjh }}</span></div>
+      <div class="info-item car">布控车牌号：<span>{{ data.yjClcph }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item idcard">布控身份证：<span>{{ data.yjRysfzh }}</span></div>
+      <div class="info-item tag">预警标签：<span>{{ data.yjbqmc }}</span></div>
+      <div class="info-item department">管辖部门：<span>{{ data.ssbm }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item county">管辖县局：<span>{{ data.ssxgaj }}</span></div>
+      <div class="info-item city">管辖市局：<span>{{ data.sssgaj }}</span></div>
+      <div class="info-item officer">接警员：<span>{{ data.jjyxm }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item content full-width">预警内容：<span>{{ data.yjNr }}</span></div>
+    </div>
+  </div>
+</template>
+<script setup>
+import { ref, computed } from 'vue'
+import { bqYs } from '@/utils/tools'
+import { IdCard } from '@/utils/validate.js'
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => { }
+  },
+  dict: {
+    type: Object,
+    default: () => { }
+  },
+})
+
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border: 1px solid #e8e8e8;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+.first-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.avatar-container {
+  margin-right: 20px;
+}
+
+.basic-info {
+  display: flex;
+  gap: 30px;
+  align-items: center;
+}
+
+.second-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin-bottom: 10px;
+}
+.info-items {
+  box-sizing: border-box;
+  display: flex;
+  // justify-content: space-between;
+  padding: 5px 0;
+  color: #333;
+
+  span {
+    font-weight: 500;
+    color: #606266;
+  }
+}
+.info-item {
+  flex: 0 0 calc(33.33% - 20px);
+  box-sizing: border-box;
+  display: flex;
+  // justify-content: space-between;
+  padding: 5px 0;
+  color: #333;
+
+  span {
+    font-weight: 500;
+    color: #606266;
+  }
+}
+
+// 特殊字段样式
+.name span {
+  color: #1890ff;
+  font-weight: bold;
+}
+
+// 预警级别颜色
+.level-high span {
+  color: #f56c6c;
+  font-weight: bold;
+}
+
+.level-medium span {
+  color: #e6a23c;
+  font-weight: bold;
+}
+
+.level-low span {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+// 处置状态颜色
+.status-completed span {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.status-processing span {
+  color: #409eff;
+  font-weight: bold;
+}
+
+.status-pending span {
+  color: #e6a23c;
+  font-weight: bold;
+}
+
+// 全宽字段
+.full-width {
+  flex: 0 0 100% !important;
+}
+
+// 内容字段特殊样式
+.content {
+  flex-direction: column;
+  align-items: flex-start;
+
+  span {
+    margin-top: 5px;
+    padding: 8px 12px;
+    background-color: #f0f9eb;
+    border-radius: 4px;
+    width: 100%;
+    box-sizing: border-box;
+  }
+}
+</style>
--- a/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/portraitWarning/item/items.vue
@ -1,197 +1,88 @@
 <template>
-  <div class="warning-item">
-    <!-- 第一行：图片、姓名、年龄、性别 -->
-    <div class="first-row">
-      <div class="avatar-container">
-        <template v-if="!data.yjTp || data.yjTp.includes('baidu')">
-          <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
-          <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
-        </template>
-        <el-image v-else style="width: 60px; height:70px" :src="data.yjTp" :preview-src-list="[data.yjTp]"
-          show-progress>
-          <template #error>
-            <div class="image-slot error">
-              <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
-              <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
-            </div>
-          </template>
-        </el-image>
-      </div>
-      <div class="basic-info">
-        <div class="info-items  name">姓名：<span>{{ data.yjRyxm }}</span></div>
-        <div class="info-items gender">性别：<span>       {{ IdCard(data.yjRysfzh, 3) }}</span></div>
-        <div class="info-items age">年龄：<span>       {{ IdCard(data.yjRysfzh, 2) }}</span></div>
+  <div class="warning-item" >
+
+    <el-divider content-position="left">处置建议</el-divider>
+    <div class="item-row" v-for="(it,idx) in list" :key="idx">
+      <div class="info-item">
+        <span class="text">预警人姓名：{{ it.jryXm }}</span>
+        <span class="text">建议时间：{{ it.jysj }}</span>
+        <span class="text">所属部门：{{ it.ssbm }}</span>
      </div>
+      <div class="info-item">建议内容：<span>{{ it.jynr || '暂无' }}</span></div>
+    </div>
+    <div>
+      <el-empty v-if="list.length === 0" description="暂无数据" />
    </div>

-    <!-- 第二行：其他所有字段 -->
-    <div class="second-row">
-      <div class="info-item title">预警标题：<span>{{ data.yjBt }}</span></div>
-      <div class="info-item level">
-        预警级别：
-         <DictTag :color="bqYs(data.yjJb)" :tag="false" v-model:value="data.yjJb" :options="props.dict.D_BZ_YJJB" />
-        <!-- <span :class="getLevelClass(data.yjJb)">{{ data.yjJb || data.yjLx }}</span> -->
+    <el-divider content-position="left">反馈内容</el-divider>
+    <div class="item-row" v-for="(it,idx) in Fklist" :key="idx">
+      <div class="info-item">
+        <span class="text">处置地址：{{ it.czdz }}</span>
+        <span class="text">处置时间：{{ it.czsj }}</span>
      </div>
-      <div class="info-item similarity">相似度：<span>{{ data.xsd }}%</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item time">预警时间：<span>{{ data.yjSj }}</span></div>
-      <div class="info-item location">预警地点：<span>{{ data.yjDz }}</span></div>
-      <div class="info-item count">预警次数：<span>{{ data.yjCs }}次</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item status">
-        处置状态： <DictTag v-model:value="data.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
-
+      <div class="info-item">
+        <span class="text">常控不尿检理由：<span>{{ it.ckbnjly || '暂无' }}</span></span>
+        <span class="text">常控处置反馈补充信息：<span>{{ it.ckczbcxx || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估：<span>{{ it.cklxzcpg || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估依据：<span>{{ it.cklxzcpgyj || '暂无' }}</span></span>
      </div>
-      <div class="info-item phone">布控手机：<span>{{ data.yjRysjh }}</span></div>
-      <div class="info-item car">布控车牌号：<span>{{ data.yjClcph }}</span></div>
    </div>
-    <div class="second-row">
-      <div class="info-item idcard">布控身份证：<span>{{ data.yjRysfzh }}</span></div>
-      <div class="info-item tag">预警标签：<span>{{ data.yjbqmc }}</span></div>
-      <div class="info-item department">管辖部门：<span>{{ data.ssbm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item county">管辖县局：<span>{{ data.ssxgaj }}</span></div>
-      <div class="info-item city">管辖市局：<span>{{ data.sssgaj }}</span></div>
-      <div class="info-item officer">接警员：<span>{{ data.jjyxm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item content full-width">预警内容：<span>{{ data.yjNr }}</span></div>
+    <div>
+      <el-empty v-if="Fklist.length === 0" description="暂无数据" />
    </div>
+    
  </div>
 </template>
 <script setup>
-import { ref, computed } from 'vue'
-import { bqYs } from '@/utils/tools'
-import { IdCard } from '@/utils/validate.js'
+import { ref, onMounted,defineProps } from 'vue'
+import { qcckPost,qcckGet } from "@/api/qcckApi.js";
 const props = defineProps({
-  data: {
+  /** 表格行数据 */
+  row: {
    type: Object,
-    default: () => { }
+    default: () => ({})
  },
  dict: {
    type: Object,
-    default: () => { }
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
  },
 })
-
+const list = ref([])
+const Fklist = ref([])
+onMounted(() => {
+  if(!props.row.id) return;
+  qcckPost({yjid: props.row.id},'/mosty-gsxt/yjxx/czjy/getPageList').then((res) => {
+    list.value = res.records || []
+  })
+  qcckGet({},'/mosty-gsxt/tbYjxx/getInfo/'+ props.row.id).then((res) => {
+    Fklist.value = res.fkList || []
+  })
+})
 </script>
 <style lang="scss" scoped>
 .warning-item {
  width: 100%;
  padding: 15px;
-  border: 1px solid #e8e8e8;
  border-radius: 8px;
  background-color: #fafafa;
 }
-
-.first-row {
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-  padding-bottom: 15px;
-  border-bottom: 1px solid #e0e0e0;
-}
-
-.avatar-container {
-  margin-right: 20px;
-}
-
-.basic-info {
-  display: flex;
-  gap: 30px;
-  align-items: center;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
  margin-bottom: 10px;
 }
-.info-items {
-  box-sizing: border-box;
-  display: flex;
-  // justify-content: space-between;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  // justify-content: space-between;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
  }
 }

-// 特殊字段样式
-.name span {
-  color: #1890ff;
-  font-weight: bold;
-}
-
-// 预警级别颜色
-.level-high span {
-  color: #f56c6c;
-  font-weight: bold;
-}
-
-.level-medium span {
-  color: #e6a23c;
-  font-weight: bold;
-}
-
-.level-low span {
-  color: #67c23a;
-  font-weight: bold;
-}
-
-// 处置状态颜色
-.status-completed span {
-  color: #67c23a;
-  font-weight: bold;
-}
-
-.status-processing span {
-  color: #409eff;
-  font-weight: bold;
-}
-
-.status-pending span {
-  color: #e6a23c;
-  font-weight: bold;
-}
-
-// 全宽字段
-.full-width {
-  flex: 0 0 100% !important;
-}
-
-// 内容字段特殊样式
-.content {
-  flex-direction: column;
-  align-items: flex-start;
-
-  span {
-    margin-top: 5px;
-    padding: 8px 12px;
-    background-color: #f0f9eb;
-    border-radius: 4px;
-    width: 100%;
-    box-sizing: border-box;
-  }
-}
 </style>
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/czjy.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/czjy.vue
@ -0,0 +1,49 @@
+<template>
+    <el-dialog title="处置建议" v-model="visible" width="50%" v-if="visible" @close="closeHndle">
+        <el-form :model="form" ref="formRef" :rules="rules" label-width="120px" >
+            <el-form-item label="处置建议" prop="jynr">
+                <el-input v-model="form.jynr" placeholder="请输入处置建议" type="textarea"></el-input>
+            </el-form-item>
+                <div class="flex just-center">
+                    <el-button type="primary" @click="okSubmit">确定</el-button>
+                    <el-button @click="closeHndle">返回</el-button>
+                </div>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script setup>
+import { qcckPost } from "@/api/qcckApi.js";
+import { ref , defineExpose} from 'vue'
+const emit = defineEmits(['okSubmit'])
+const visible = ref(false)
+const formRef = ref()
+const form = ref({})
+const rules = ref({
+  jynr: [
+    { required: true, message: '请输入处置建议', trigger: 'blur' }
+  ]
+})
+const init = (row) => {
+  visible.value = true;
+  form.value.yjid = row.id;
+}
+
+const closeHndle = () => {
+  visible.value = false;
+  form.value = {};
+}
+
+const okSubmit = async () => {
+  await formRef.value.validate((valid) => {
+    if (!valid)  return;
+    qcckPost(form.value,'/mosty-gsxt/yjxx/czjy/insert').then((res) => {
+        emit('okSubmit', {...form.value})
+        closeHndle()
+    })
+  })
+}
+defineExpose({
+  init
+})
+</script>
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue
@ -7,7 +7,7 @@
        :expand="true" @chooseData="handleChooseData">
        <template #expand="{ props }">
          <div class="expand-content" style="max-width: 100%">
-            <Items :data="props" :dict="dict" />
+            <Items :row="props" :dict="dict" />
          </div>
        </template>
        <template #yjTp="{ row }">
@ -43,11 +43,12 @@
        <!-- 操作 -->
        <template #controls="{ row }">
          <el-link type="warning" @click="pushAssess(row)">全息档案</el-link>
-          <el-link type="primary" @click="showDetail(row)">转合成</el-link>
+          <el-link type="primary" @click="handleCzjy(row)" v-if="roleCode">处置建议</el-link>
+          <!-- <el-link type="primary" @click="showDetail(row)">转合成</el-link> -->
          <!-- <el-link type="danger" @click="delDictItem(row.id)">转会商</el-link> -->
-          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01'">签收</el-link>
-          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02'">反馈</el-link>
-          <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link>
+          <el-link type="success" @click="handleQsFk(row, '签收')" v-if="row.czzt == '01' && permission_sfqs">签收</el-link>
+          <el-link type="success" @click="handleQsFk(row, '反馈')" v-else-if="row.czzt == '02' && permission_sfqs">反馈</el-link>
+          <!-- <el-link type="success" @click="handleQsFk(row, '查看反馈')" v-else>查看反馈</el-link> -->
          <el-link type="primary" @click="openAddFrom(row)">详情</el-link>
        </template>
        <!-- <el-button type="success" @click="showFeedback(item, '签收')" v-if="item.czzt == '01'">签收</el-button>
@ -68,9 +69,13 @@
      :tacitly="tacitly" />
  </Information>
  <!-- <AddFrom ref="addFrom" /> -->
+    <!-- 处置建议 -->
+  <Czjy ref="czjyRef" @okSubmit="getList"></Czjy>
 </template>

 <script setup>
+import Czjy from './czjy.vue'
+import { getItem, setItem } from '@/utils/storage'
 import Items from '../item/items.vue'
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@ -102,6 +107,10 @@ const props = defineProps({
    default: false
  }
 });
+const permission_sfqs = ref(false)
+const roleCode = ref(false)
+const czjyRef = ref()
+
 const pageData = reactive({
  tableData: [], //表格数据
  keyCount: 0,
@ -142,6 +151,14 @@ const selectRows = ref([])


 onMounted(() => {
+  let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : ''
+  permission_sfqs.value = str.startsWith('2'||'3') ? false : true;
+
+  let rols = getItem('roleList') ? getItem('roleList'):[]
+  let obj = rols.find(item => {
+    return  ['JS_666666','JS_777777','JS_888888'].includes(item.roleCode)
+  })
+  roleCode.value = obj ? true : false;
  // tabHeightFn();
  getList()
 });
@ -204,6 +221,11 @@ const handleQsFk = (val, type) => {
  }

 }
+
+const handleCzjy = (row) => {
+  czjyRef.value.init( row)
+}
+
 // 发送指令
 const showDialog = ref(false)
 const itemData = ref()
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/item/items
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/item/items
@ -0,0 +1,197 @@
+<template>
+  <div class="warning-item">
+    <!-- 第一行：图片、姓名、年龄、性别 -->
+    <div class="first-row">
+      <div class="avatar-container">
+        <template v-if="!data.yjTp || data.yjTp.includes('baidu')">
+          <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
+          <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
+        </template>
+        <el-image v-else style="width: 60px; height:70px" :src="data.yjTp" :preview-src-list="[data.yjTp]"
+          show-progress>
+          <template #error>
+            <div class="image-slot error">
+              <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
+              <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
+            </div>
+          </template>
+        </el-image>
+      </div>
+      <div class="basic-info">
+        <div class="info-items  name">姓名：<span>{{ data.yjRyxm }}</span></div>
+        <div class="info-items gender">性别：<span>       {{ IdCard(data.yjRysfzh, 3) }}</span></div>
+        <div class="info-items age">年龄：<span>       {{ IdCard(data.yjRysfzh, 2) }}</span></div>
+      </div>
+    </div>
+
+    <!-- 第二行：其他所有字段 -->
+    <div class="second-row">
+      <div class="info-item title">预警标题：<span>{{ data.yjBt }}</span></div>
+      <div class="info-item level">
+        预警级别：
+         <DictTag :color="bqYs(data.yjJb)" :tag="false" v-model:value="data.yjJb" :options="props.dict.D_BZ_YJJB" />
+        <!-- <span :class="getLevelClass(data.yjJb)">{{ data.yjJb || data.yjLx }}</span> -->
+      </div>
+      <div class="info-item similarity">相似度：<span>{{ data.xsd }}%</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item time">预警时间：<span>{{ data.yjSj }}</span></div>
+      <div class="info-item location">预警地点：<span>{{ data.yjDz }}</span></div>
+      <div class="info-item count">预警次数：<span>{{ data.yjCs }}次</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item status">
+        处置状态： <DictTag v-model:value="data.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
+
+      </div>
+      <div class="info-item phone">布控手机：<span>{{ data.yjRysjh }}</span></div>
+      <div class="info-item car">布控车牌号：<span>{{ data.yjClcph }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item idcard">布控身份证：<span>{{ data.yjRysfzh }}</span></div>
+      <div class="info-item tag">预警标签：<span>{{ data.yjbqmc }}</span></div>
+      <div class="info-item department">管辖部门：<span>{{ data.ssbm }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item county">管辖县局：<span>{{ data.ssxgaj }}</span></div>
+      <div class="info-item city">管辖市局：<span>{{ data.sssgaj }}</span></div>
+      <div class="info-item officer">接警员：<span>{{ data.jjyxm }}</span></div>
+    </div>
+    <div class="second-row">
+      <div class="info-item content full-width">预警内容：<span>{{ data.yjNr }}</span></div>
+    </div>
+  </div>
+</template>
+<script setup>
+import { ref, computed } from 'vue'
+import { bqYs } from '@/utils/tools'
+import { IdCard } from '@/utils/validate.js'
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => { }
+  },
+  dict: {
+    type: Object,
+    default: () => { }
+  },
+})
+
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border: 1px solid #e8e8e8;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+.first-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.avatar-container {
+  margin-right: 20px;
+}
+
+.basic-info {
+  display: flex;
+  gap: 30px;
+  align-items: center;
+}
+
+.second-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin-bottom: 10px;
+}
+.info-items {
+  box-sizing: border-box;
+  display: flex;
+  // justify-content: space-between;
+  padding: 5px 0;
+  color: #333;
+
+  span {
+    font-weight: 500;
+    color: #606266;
+  }
+}
+.info-item {
+  flex: 0 0 calc(33.33% - 20px);
+  box-sizing: border-box;
+  display: flex;
+  // justify-content: space-between;
+  padding: 5px 0;
+  color: #333;
+
+  span {
+    font-weight: 500;
+    color: #606266;
+  }
+}
+
+// 特殊字段样式
+.name span {
+  color: #1890ff;
+  font-weight: bold;
+}
+
+// 预警级别颜色
+.level-high span {
+  color: #f56c6c;
+  font-weight: bold;
+}
+
+.level-medium span {
+  color: #e6a23c;
+  font-weight: bold;
+}
+
+.level-low span {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+// 处置状态颜色
+.status-completed span {
+  color: #67c23a;
+  font-weight: bold;
+}
+
+.status-processing span {
+  color: #409eff;
+  font-weight: bold;
+}
+
+.status-pending span {
+  color: #e6a23c;
+  font-weight: bold;
+}
+
+// 全宽字段
+.full-width {
+  flex: 0 0 100% !important;
+}
+
+// 内容字段特殊样式
+.content {
+  flex-direction: column;
+  align-items: flex-start;
+
+  span {
+    margin-top: 5px;
+    padding: 8px 12px;
+    background-color: #f0f9eb;
+    border-radius: 4px;
+    width: 100%;
+    box-sizing: border-box;
+  }
+}
+</style>
--- a/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/item/items.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/item/items.vue
@ -1,197 +1,90 @@
 <template>
-  <div class="warning-item">
-    <!-- 第一行：图片、姓名、年龄、性别 -->
-    <div class="first-row">
-      <div class="avatar-container">
-        <template v-if="!data.yjTp || data.yjTp.includes('baidu')">
-          <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
-          <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
-        </template>
-        <el-image v-else style="width: 60px; height:70px" :src="data.yjTp" :preview-src-list="[data.yjTp]"
-          show-progress>
-          <template #error>
-            <div class="image-slot error">
-              <img src="@/assets/images/car.png" width="60" height="70" v-if="data.yjLx == 2" />
-              <img src="@/assets/images/default_male.png" width="60" height="70" v-else />
-            </div>
-          </template>
-        </el-image>
-      </div>
-      <div class="basic-info">
-        <div class="info-items  name">姓名：<span>{{ data.yjRyxm }}</span></div>
-        <div class="info-items gender">性别：<span>       {{ IdCard(data.yjRysfzh, 3) }}</span></div>
-        <div class="info-items age">年龄：<span>       {{ IdCard(data.yjRysfzh, 2) }}</span></div>
+  <div class="warning-item" >
+
+    <el-divider content-position="left">处置建议</el-divider>
+    <div class="item-row" v-for="(it,idx) in list" :key="idx">
+      <div class="info-item">
+        <span class="text">预警人姓名：{{ it.jryXm }}</span>
+        <span class="text">建议时间：{{ it.jysj }}</span>
+        <span class="text">所属部门：{{ it.ssbm }}</span>
      </div>
+      <div class="info-item">建议内容：<span>{{ it.jynr || '暂无' }}</span></div>
+    </div>
+    <div>
+      <el-empty v-if="list.length === 0" description="暂无数据" />
    </div>

-    <!-- 第二行：其他所有字段 -->
-    <div class="second-row">
-      <div class="info-item title">预警标题：<span>{{ data.yjBt }}</span></div>
-      <div class="info-item level">
-        预警级别：
-         <DictTag :color="bqYs(data.yjJb)" :tag="false" v-model:value="data.yjJb" :options="props.dict.D_BZ_YJJB" />
-        <!-- <span :class="getLevelClass(data.yjJb)">{{ data.yjJb || data.yjLx }}</span> -->
+    <el-divider content-position="left">反馈内容</el-divider>
+    <div class="item-row" v-for="(it,idx) in Fklist" :key="idx">
+      <div class="info-item">
+        <span class="text">处置地址：{{ it.czdz }}</span>
+        <span class="text">处置时间：{{ it.czsj }}</span>
      </div>
-      <div class="info-item similarity">相似度：<span>{{ data.xsd }}%</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item time">预警时间：<span>{{ data.yjSj }}</span></div>
-      <div class="info-item location">预警地点：<span>{{ data.yjDz }}</span></div>
-      <div class="info-item count">预警次数：<span>{{ data.yjCs }}次</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item status">
-        处置状态： <DictTag v-model:value="data.czzt" :options="props.dict.D_GSXT_YJXX_CZZT" />
-
+      <div class="info-item">
+        <span class="text">常控不尿检理由：<span>{{ it.ckbnjly || '暂无' }}</span></span>
+        <span class="text">常控处置反馈补充信息：<span>{{ it.ckczbcxx || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估：<span>{{ it.cklxzcpg || '暂无' }}</span></span>
+        <span class="text">常控立线侦察评估依据：<span>{{ it.cklxzcpgyj || '暂无' }}</span></span>
      </div>
-      <div class="info-item phone">布控手机：<span>{{ data.yjRysjh }}</span></div>
-      <div class="info-item car">布控车牌号：<span>{{ data.yjClcph }}</span></div>
    </div>
-    <div class="second-row">
-      <div class="info-item idcard">布控身份证：<span>{{ data.yjRysfzh }}</span></div>
-      <div class="info-item tag">预警标签：<span>{{ data.yjbqmc }}</span></div>
-      <div class="info-item department">管辖部门：<span>{{ data.ssbm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item county">管辖县局：<span>{{ data.ssxgaj }}</span></div>
-      <div class="info-item city">管辖市局：<span>{{ data.sssgaj }}</span></div>
-      <div class="info-item officer">接警员：<span>{{ data.jjyxm }}</span></div>
-    </div>
-    <div class="second-row">
-      <div class="info-item content full-width">预警内容：<span>{{ data.yjNr }}</span></div>
+    <div>
+      <el-empty v-if="Fklist.length === 0" description="暂无数据" />
    </div>
+    
  </div>
 </template>
 <script setup>
-import { ref, computed } from 'vue'
-import { bqYs } from '@/utils/tools'
-import { IdCard } from '@/utils/validate.js'
+import { ref, computed, onMounted } from 'vue'
+import { qcckPost,qcckGet } from "@/api/qcckApi.js";
+
 const props = defineProps({
-  data: {
+  /** 表格行数据 */
+  row: {
    type: Object,
-    default: () => { }
+    default: () => ({})
  },
  dict: {
    type: Object,
-    default: () => { }
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
  },
 })
-
+const list = ref([])
+const Fklist = ref([])
+onMounted(() => {
+  if(!props.row.id) return;
+  qcckPost({yjid: props.row.id},'/mosty-gsxt/yjxx/czjy/getPageList').then((res) => {
+    list.value = res.records || []
+  })
+  qcckGet({},'/mosty-gsxt/tbYjxx/getInfo/'+ props.row.id).then((res) => {
+    Fklist.value = res.fkList || []
+  })
+})
+// console.log('row😃: ', props.row);
 </script>
 <style lang="scss" scoped>
 .warning-item {
  width: 100%;
  padding: 15px;
-  border: 1px solid #e8e8e8;
  border-radius: 8px;
  background-color: #fafafa;
 }
-
-.first-row {
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-  padding-bottom: 15px;
-  border-bottom: 1px solid #e0e0e0;
-}
-
-.avatar-container {
-  margin-right: 20px;
-}
-
-.basic-info {
-  display: flex;
-  gap: 30px;
-  align-items: center;
-}
-
-.second-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
  margin-bottom: 10px;
 }
-.info-items {
-  box-sizing: border-box;
-  display: flex;
-  // justify-content: space-between;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
-  }
-}
-.info-item {
-  flex: 0 0 calc(33.33% - 20px);
-  box-sizing: border-box;
-  display: flex;
-  // justify-content: space-between;
-  padding: 5px 0;
-  color: #333;
-
-  span {
-    font-weight: 500;
-    color: #606266;
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
  }
 }

-// 特殊字段样式
-.name span {
-  color: #1890ff;
-  font-weight: bold;
-}
-
-// 预警级别颜色
-.level-high span {
-  color: #f56c6c;
-  font-weight: bold;
-}
-
-.level-medium span {
-  color: #e6a23c;
-  font-weight: bold;
-}
-
-.level-low span {
-  color: #67c23a;
-  font-weight: bold;
-}
-
-// 处置状态颜色
-.status-completed span {
-  color: #67c23a;
-  font-weight: bold;
-}
-
-.status-processing span {
-  color: #409eff;
-  font-weight: bold;
-}
-
-.status-pending span {
-  color: #e6a23c;
-  font-weight: bold;
-}
-
-// 全宽字段
-.full-width {
-  flex: 0 0 100% !important;
-}
-
-// 内容字段特殊样式
-.content {
-  flex-direction: column;
-  align-items: flex-start;
-
-  span {
-    margin-top: 5px;
-    padding: 8px 12px;
-    background-color: #f0f9eb;
-    border-radius: 4px;
-    width: 100%;
-    box-sizing: border-box;
-  }
-}
 </style>
Author	SHA1	Message	Date
Esacpe	9f6f712e3d	Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web	2025-12-18 10:23:25 +08:00
Esacpe	7917b9cd44	更新预警	2025-12-18 10:22:42 +08:00