diff --git a/gsxt.zip b/gsxt.zip new file mode 100644 index 0000000..09f03cf Binary files /dev/null and b/gsxt.zip differ diff --git a/src/api/xxcj.js b/src/api/xxcj.js index c66b534..da82280 100644 --- a/src/api/xxcj.js +++ b/src/api/xxcj.js @@ -75,6 +75,14 @@ export const xxcjSelectCzlcList = (params) => { }) } // 情报采集指令更新 +export const xxcjPlsb = (data) => { + return request({ + url: api + `/xxcj/plsb`, + method: "post", + data + }) +} +// 情报采集指令更新 export const xxcjUpdateCzlc = (data) => { return request({ url: api + `/xxcj/updateCzlc`, diff --git a/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/info.vue b/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/info.vue index 1fa62ba..490daf3 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/info.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/info.vue @@ -76,37 +76,37 @@ const chooseMarksVisible = ref(false); // 控制标签选择弹窗显示 const roleIds = ref([]); // 已选择的标签ID const formData = ref([ { label: "人员照片", prop: "ryzp", type: "slot", width: "100%" }, - { label: "姓名", prop: "ryXm", type: "input" }, - { label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB }, - { label: "身份证号", prop: "rySfzh", type: "input" }, - { label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM }, - { label: "曾用名", prop: "cym", type: "input" }, - { label: "文化程度", prop: "whcdBm", type: "select", options: D_BZ_WHCD }, - { label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ }, - { label: "政治面貌", prop: "zzmm", type: "select", options: D_BZ_ZZMM }, - { label: "职业", prop: "zyBm", type: "select", options: D_ZDRY_ZYLB }, - { label: "人员级别", prop: "zdrRyjb", type: "select", options: D_GS_ZDR_RYJB }, - { label: "预警等级", prop: "zdrYjdj", type: "select", options: D_GS_ZDR_YJDJ }, - { label: "出生日期", prop: "ryCsrq", type: "date" }, - { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM }, - { label: "户籍地详址", prop: "hjdXz", type: "input" }, - { label: "户籍地派出所", prop: "hjdPcsdm",depMc:"hjdPcsmc" ,type: "department" }, - { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM }, - { label: "现住地详址", prop: "xzdXz", type: "input" }, - { label: "现住地派出所", prop: "xzdPcsdm",depMc:"xzdPcsmc" ,type: "department" }, - { label: "管辖单位", prop: "gxSsbmdm", depMc: 'gxSsbmmc', type: "department" }, - { label: "诉求单位", prop: "sqSsbmdm", depMc: 'sqSsbmmc', type: "department" }, - { label: "责任单位", prop: "zrSsbmdm", depMc: 'zrSsbmmc', type: "department" }, - { label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ }, - { label: "涉及警种", prop: "zdrSjjz", type: "select", options: D_GS_BK_SSJZ, multiple: true }, - { label: "婚姻状态", prop: "hyzk", type: "select", options: D_BZ_HYZK }, + { label: "姓名", prop: "ryXm", type: "input", width: "30%" }, + { label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB, width: "30%" }, + { label: "身份证号", prop: "rySfzh", type: "input", width: "30%" }, + { label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM, width: "30%" }, + { label: "曾用名", prop: "cym", type: "input", width: "30%" }, + { label: "文化程度", prop: "whcdBm", type: "select", options: D_BZ_WHCD, width: "30%" }, + { label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ, width: "30%" }, + { label: "政治面貌", prop: "zzmm", type: "select", options: D_BZ_ZZMM, width: "30%" }, + { label: "职业", prop: "zyBm", type: "select", options: D_ZDRY_ZYLB, width: "30%" }, + { label: "人员级别", prop: "zdrRyjb", type: "select", options: D_GS_ZDR_RYJB, width: "30%" }, + { label: "预警等级", prop: "zdrYjdj", type: "select", options: D_GS_ZDR_YJDJ, width: "30%" }, + { label: "出生日期", prop: "ryCsrq", type: "date", width: "30%" }, + { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM, width: "30%" }, + { label: "户籍地详址", prop: "hjdXz", type: "input", width: "30%" }, + { label: "户籍地派出所", prop: "hjdPcsdm", depMc: "hjdPcsmc", type: "department", width: "30%" }, + { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM, width: "30%" }, + { label: "现住地详址", prop: "xzdXz", type: "input", width: "30%" }, + { label: "现住地派出所", prop: "xzdPcsdm", depMc: "xzdPcsmc", type: "department", width: "30%" }, + { label: "管辖单位", prop: "gxSsbmdm", depMc: 'gxSsbmmc', type: "department", width: "30%" }, + { label: "诉求单位", prop: "sqSsbmdm", depMc: 'sqSsbmmc', type: "department", width: "30%" }, + { label: "责任单位", prop: "zrSsbmdm", depMc: 'zrSsbmmc', type: "department", width: "30%" }, + { label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ, width: "30%" }, + { label: "涉及警种", prop: "zdrSjjz", type: "select", options: D_GS_BK_SSJZ, multiple: true, width: "30%" }, + { label: "婚姻状态", prop: "hyzk", type: "select", options: D_BZ_HYZK, width: "30%" }, // { label: "处置状态", prop: "zdrCzzt", type: "select", options: D_GS_ZDR_CZZT }, // { label: "布控状态", prop: "zdrBkZt", type: "select", options: D_BZ_RCBKZT }, // { label: "人员类型", prop: "rylx", type: "select", options: D_ZDRY_RYLX }, - { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" }, - { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" }, - { label: "Mac地址", prop: "macDz", type: "input" }, - { label: "联系电话", prop: "ryLxdh", type: "slot", width: "100%" }, + { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime", width: "30%" }, + { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime", width: "30%" }, + { label: "Mac地址", prop: "macDz", type: "input", width: "30%" }, + { label: "联系电话", prop: "ryLxdh", type: "slot", width: "30%" }, // { label: "标签选择", prop: "tags", type: "slot", width: "100%" }, { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" }, ]); @@ -171,17 +171,17 @@ const gettbGsxtZdryUpdate = () => { } elform.value.submit((data) => { tbGsxtZdryUpdate(promes).then((res) => { - listQuery.value.ryzp = [] - proxy.$message({ - message: '更新成功', - type: 'success', - }) - }).catch((err) => { + listQuery.value.ryzp = [] + proxy.$message({ + message: '更新成功', + type: 'success', + }) + }).catch((err) => { - }).finally(() => { - loading.value = false - }); -}) + }).finally(() => { + loading.value = false + }); + }) diff --git a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue index cb8f4a4..907b3b4 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue @@ -2,8 +2,8 @@
- - + + @@ -36,7 +36,7 @@
-
+
@@ -54,21 +54,26 @@
- + - + - + - - + + - + @@ -169,7 +154,7 @@ import Searchs from "@/components/aboutTable/Search.vue"; import AddForm from "./components/addForm.vue"; import { useRouter, useRoute } from 'vue-router' import { qbcjSelectQbsbPage, qbcjDeletes, qbcjCzzt, qbcjPlsb } from "@/api/Intelligence.js"; -import { xxcjSelectXxsbPage, xxcjDeletes, xxcjXxzsx, xxcjUpdateCzlc, xxcjXxqd, xxcjXxcjTjsh ,xxcjCare, xxcjReportGat} from '@/api/xxcj.js' +import { xxcjSelectXxsbPage, xxcjDeletes, xxcjXxzsx, xxcjUpdateCzlc, xxcjXxqd, xxcjXxcjTjsh, xxcjCare, xxcjReportGat, xxcjPlsb } from '@/api/xxcj.js' import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue"; import MakeTag from '../components/maketag.vue' import ExportFile from './components/exportFile.vue' @@ -181,7 +166,7 @@ import Configuration from '../components/configuration.vue' import transferMerchant from "./components/transferMerchant.vue"; import { Edit } from "@element-plus/icons"; const { proxy } = getCurrentInstance(); -const { D_BZ_SF,D_GS_XS_LY, D_BZ_SSSHZT, D_GS_XS_LX, D_BZ_BQJB,D_BZ_QBCZZT, D_BZ_CJLX, D_BZ_LCZT,D_XXCJ_BQLX } = proxy.$dict( "D_BZ_SF","D_GS_XS_LY", 'D_BZ_SSSHZT',"D_GS_XS_LX", "D_BZ_QBCZZT", "D_BZ_CJLX", "D_BZ_BQJB", "D_BZ_LCZT", "D_XXCJ_BQLX"); //获取字典数据 +const { D_BZ_SF, D_GS_XS_LY, D_BZ_SSSHZT, D_GS_XS_LX, D_BZ_BQJB, D_BZ_QBCZZT, D_BZ_CJLX, D_BZ_LCZT, D_XXCJ_BQLX } = proxy.$dict("D_BZ_SF", "D_GS_XS_LY", 'D_BZ_SSSHZT', "D_GS_XS_LX", "D_BZ_QBCZZT", "D_BZ_CJLX", "D_BZ_BQJB", "D_BZ_LCZT", "D_XXCJ_BQLX"); //获取字典数据 const route = useRoute() const titleData = ref() const exportFileModel = ref(false) @@ -269,19 +254,19 @@ const cnMsg = (item) => { } const handleReport = () => { - if(tableList.value.length == 0) return proxy.$message({ type: "warning", message: "请选择情报信息" }); + if (tableList.value.length == 0) return proxy.$message({ type: "warning", message: "请选择情报信息" }); inforReportShow.value = true } // 关注 -const handleAttention = (val) =>{ - let data = { id:val.id, sfgz:val.sfgz == '1' ? '0':'1' } - xxcjCare(data).then(res=>{ - let text = data.sfgz == '1' ? '关注成功' :'已取消' +const handleAttention = (val) => { + let data = { id: val.id, sfgz: val.sfgz == '1' ? '0' : '1' } + xxcjCare(data).then(res => { + let text = data.sfgz == '1' ? '关注成功' : '已取消' proxy.$message({ type: "success", message: text }); getList(); - }).catch(()=>{ - let text = data.sfgz == '1' ? '关注失败' :'取消失败' + }).catch(() => { + let text = data.sfgz == '1' ? '关注失败' : '取消失败' proxy.$message({ type: "error", message: text }); }) @@ -330,6 +315,8 @@ const rollbackNewspapers = (item) => { } // 上报 const appearNewspapers = (item) => { + console.log(item); + if ((item.lczt == '01' || item.lczt == '05' || item.lczt == '02') && item.qbjb == '00' && qxkz.deptLevel != '01') { proxy.$confirm("确定要上报", "警告", { type: "warning" }).then(() => { let promes = { id: item.id } @@ -396,7 +383,8 @@ const handleSumbit = () => { const listDb = tableList.value.filter(item => item.czzt != '01' && item.czzt != '04') if (listDb.length == 0) { proxy.$confirm("确定要上报", "警告", { type: "warning" }).then(() => { - qbcjPlsb({ ids: ids.value, qbjb: '00' }).then(res => { + const lczt = qxkz.deptLevel == '02' ? '03' : '02'; + xxcjPlsb({ ids: ids.value, lczt: lczt }).then(res => { proxy.$message({ type: "success", message: "上报成功" }); getList(); }) @@ -451,7 +439,7 @@ const getList = () => { pageData.tableConfiger.loading = true; let data = { ...pageData.pageConfiger, ...queryFrom.value }; xxcjSelectXxsbPage(data).then(res => { - pageData.tableData = (res.records || []).map(item=>{ + pageData.tableData = (res.records || []).map(item => { item.glbqList = item.glbqList || []; return item; }); @@ -464,8 +452,8 @@ const delDictItem = (id) => { proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => { xxcjDeletes({ ids: Array.isArray(id) ? id : [id] }).then((res) => { proxy.$message({ type: "success", message: "删除成功" }); - getList(); - }).catch(() => { + getList(); + }).catch(() => { }) }).catch(() => { }); } @@ -495,7 +483,7 @@ const tabHeightFn = () => { }; // 转线索 const FollowUpOnLeads = (row) => { - if (!qxkz.depBool) return proxy.$message({message: '权限不足',type: 'warning',showClose: true, }) + if (!qxkz.depBool) return proxy.$message({ message: '权限不足', type: 'warning', showClose: true, }) proxy.$confirm("确定要转线索吗？", "警告", { type: "warning" }).then(() => { xxcjXxzsx({ ids: Array.isArray(row) ? row.join(',') : row.id }).then(res => { proxy.$message({ type: "success", message: "转线索成功" }); @@ -590,7 +578,7 @@ onMounted(() => { qxkz.depBool = false } - console.log(qxkz,'=======qxkz'); + console.log(qxkz, '=======qxkz'); titleData.value = route.meta.title tabHeightFn() diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue index 0148b78..49e2a89 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue @@ -3,49 +3,21 @@
布控对象
- 保存 + 保存 关闭
- +
- - {{ item.zdmc }} + + {{ + item.zdmc }} - + @@ -53,43 +25,25 @@
- + @@ -99,109 +53,58 @@
-
+
- + - + - +
- +
- +
- - + + - + - +
- +
- +
支持png、jpg、pdf文件上传
 @@ -255,36 +158,16 @@
- + - + - - + +