From 060f2bedaa21677344167e00192d01a461fef010 Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Thu, 18 Dec 2025 11:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/aboutTable/Search.vue | 9 +++-- .../warningControl/behaviorWarning/index.vue | 33 +++++++++------ .../warningControl/combinedWarning/index.vue | 38 +++++++++++++----- .../warningControl/identityWarning/index.vue | 40 +++++++++++-------- 4 files changed, 78 insertions(+), 42 deletions(-) diff --git a/src/components/aboutTable/Search.vue b/src/components/aboutTable/Search.vue index 776db41..708277d 100644 --- a/src/components/aboutTable/Search.vue +++ b/src/components/aboutTable/Search.vue @@ -132,10 +132,13 @@ :options="getOptions[item.prop]" :placeholder="item.placeholder" /> -
+
+ +
+
-
+
@@ -472,8 +475,8 @@ const reset = () => { getArr.forEach((item) => { searchObj[item.prop] = item.defaultVal; }); + emit("reset", true); emit("submit", searchObj); - emit("reset", false); }; watchEffect(() => { loadingPage.value = true; diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue index be89f67..9759324 100644 --- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue @@ -15,7 +15,15 @@
- + + +
@@ -95,7 +103,7 @@ 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"); //获取字典数据 +const { D_BZ_YJJB,D_GS_SSYJ, D_GSXT_YJXX_CZZT } = proxy.$dict('D_BZ_YJJB',"D_GS_SSYJ", "D_GSXT_YJXX_CZZT"); //获取字典数据 // 字典数据集合 const dict = ref({ @@ -114,10 +122,10 @@ const searchConfiger = ref( { label: "姓名", prop: 'xm', placeholder: "请输入姓名", showType: "input" }, { label: "身份证号码", prop: 'sfzh', placeholder: "请输入身份证号码", showType: "input" }, { label: "电话号码", prop: 'dh', placeholder: "请输入电话号码", showType: "input" }, - { - label: "标签小类", prop: 'bqxl', placeholder: "请选择标签小类", - showType: "select", options: [] - }, + { label: "预警标签", prop: 'yjbqmc', placeholder: "请输入预警标签", showType: "input" }, + { label: "部门", prop: 'ssbmdm', placeholder: "请选择部门", showType: "department" }, + { label: "级别", prop: 'bqys', placeholder: "请选择级别", showType: "select" ,options: D_BZ_YJJB}, + { label: "积分段", prop: 'jfd', placeholder: "请选择积分段", showType: "Slot" }, ]); const detailRef = ref() @@ -164,12 +172,7 @@ const gettbGsxtBqglSelectList = (val) => { }) || [] }) } -watch(() => bqLbData.value.bqXl, (res) => { - searchConfiger.value.push({ - label: "标签小类", prop: 'bqxl', placeholder: "请选择标签小类", - showType: "select", options: res - },) -}, { deep: true }) + onMounted(() => { let str = getItem('deptId') ? getItem('deptId')[0].deptLevel : '' permission_sfqs.value = str.startsWith('2'||'3') ? false : true; @@ -192,10 +195,14 @@ const handleCzjy = (row) => { // 搜索 const onSearch = (val) => { - queryFrom.value = { ...val } + queryFrom.value = { ...queryFrom.value,...val }; pageData.pageConfiger.pageCurrent = 1; getList() } +const reset = () => { + delete queryFrom.value.ksfz + delete queryFrom.value.jsfz +} const changeNo = (val) => { pageData.pageConfiger.pageCurrent = val; getList() diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue index 092ee42..b0b1878 100644 --- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue @@ -15,7 +15,15 @@
- + + +
@@ -79,7 +87,7 @@ import Information from "@/views/home/model/information.vue"; import SemdFqzl from '@/components/instructionHasBeen/sendFqzl.vue' import FkDialog from "@/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue"; import AddFrom from "./components/addFrom.vue"; -import { reactive, ref, onMounted, getCurrentInstance, watch, nextTick } from "vue"; +import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue"; import { qcckGet, qcckPost } from "@/api/qcckApi.js"; import Detail from './components/detail.vue' import { exportExlByObj } from "@/utils/exportExcel.js" @@ -103,6 +111,10 @@ import { holographicProfileJump } from "@/utils/tools.js" const searchConfiger = ref([ { label: "姓名", prop: 'xm', placeholder: "请输入姓名", showType: "input" }, { label: "身份证号码", prop: 'sfzh', placeholder: "请输入身份证号码", showType: "input" }, + { label: "预警标签", prop: 'yjbqmc', placeholder: "请输入预警标签", showType: "input" }, + { label: "部门", prop: 'ssbmdm', placeholder: "请选择部门", showType: "department" }, + { label: "级别", prop: 'bqys', placeholder: "请选择级别", showType: "select" ,options: D_BZ_YJJB}, + { label: "积分段", prop: 'jfd', placeholder: "请选择积分段", showType: "Slot" }, ]); const queryFrom = ref({}); @@ -161,11 +173,16 @@ const handleCzjy = (row) => { } const onSearch = (val) => { - queryFrom.value = { ...val }; + queryFrom.value = { ...queryFrom.value,...val }; pageData.pageConfiger.pageCurrent = 1; getList(); }; +const reset = () => { + delete queryFrom.value.ksfz + delete queryFrom.value.jsfz +} + const changeNo = (val) => { pageData.pageConfiger.pageCurrent = val; getList(); @@ -179,7 +196,13 @@ const changeSize = (val) => { const getList = () => { pageData.tableConfiger.loading = true; // TODO: 替换为实际的组合预警API接口 - tbYjxxGetZbtj(queryFrom.value).then((res) => { + const promes = { + ...queryFrom.value, + pageCurrent: pageData.pageConfiger.pageCurrent, + pageSize: pageData.pageConfiger.pageSize + } + + tbYjxxGetZbtj(promes).then((res) => { pageData.tableData = res.records || []; pageData.total = res.total || 0; pageData.tableConfiger.loading = false; @@ -211,12 +234,7 @@ const gettbGsxtBqglSelectList = (val) => { }) || [] }) } -watch(() => bqLbData.value.bqXl, (res) => { - searchConfiger.value.push({ - label: "组合标签", prop: 'bqmc', placeholder: "请选择组合标签", - showType: "select", options: res - },) -}, { deep: true, immediate: true }) + // 查看详情 const detailRef = ref() diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue index 3cb3350..0222fe3 100644 --- a/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue @@ -15,17 +15,13 @@
- - -