From d8bee57f6bce205aec1a5fa80a6a4e62cd3159f1 Mon Sep 17 00:00:00 2001
From: jy <1052480693@qq.com>
Date: Wed, 4 Jun 2025 17:27:57 +0800
Subject: [PATCH] =?UTF-8?q?feat=E2=9C=A8:=201.=E5=AF=B9=E6=8E=A5=E5=85=A8?=
=?UTF-8?q?=E5=9F=9F=E5=B8=83=E6=8E=A7=E4=B8=8B=E8=8F=9C=E5=8D=95=E7=9A=84?=
=?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=9F=A5=E6=94=B9=E5=8A=9F=E8=83=BD=EF=BC=8C?=
=?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=94=A8=E6=88=B7=E6=93=8D=E4=BD=9C=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E4=BC=98=E5=8C=96=E3=80=822.=E5=AF=B9=E6=8E=A5?=
=?UTF-8?q?=E4=BA=BA=E5=8A=9B=E6=83=85=E6=8A=A5=E9=87=87=E9=9B=86=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E9=87=87=E9=9B=86=E6=B5=81=E8=BD=AC=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 14 +
package.json | 1 +
.../MyComponents/Department/index.vue | 1 -
src/components/MyComponents/Select/index.vue | 33 +-
src/components/aboutTable/FormMessage.vue | 14 +
.../aboutTable/TagSelectorDialog.vue | 407 ++++++++++++
src/router/index.js | 12 +
.../autompvGroup/components/detailForm.vue | 221 +++++++
.../DeploymentDisposal/autompvGroup/index.vue | 439 +++++++++++++
.../components/TagSelectorDialogPeo.vue | 408 ++++++++++++
.../mpvGroup/components/addForm.vue | 506 +++++++++++++--
.../mpvGroup/components/addFormPeo.vue | 438 +++++++++++++
.../mpvGroup/components/approvalInfo.vue | 303 +++++++++
.../mpvGroup/components/dialogList.vue | 119 ++++
.../mpvGroup/components/infoForm.vue | 608 ++++++++++++++++++
.../mpvGroup/components/qtDetail.vue | 61 +-
.../mpvGroup/components/selectionList.vue | 277 ++++++++
.../DeploymentDisposal/mpvGroup/index.vue | 304 ++++++---
.../mpvPeo/components/TagSelectorDialog.vue | 407 ++++++++++++
.../mpvPeo/components/addForm.vue | 403 ++++++++++--
.../mpvPeo/components/infoForm.vue | 492 ++++++++++++++
.../DeploymentDisposal/mpvPeo/index.vue | 316 +++++++--
.../CollectCrculate/components/addForm.vue | 288 +++++++--
.../CollectCrculate/components/dialogList.vue | 229 +++++++
.../CollectCrculate/index.vue | 162 +++--
.../components/addForm.vue | 163 +++--
.../ConstructionManagement/index.vue | 118 ++--
.../ControlApproval/index.vue | 200 ++++--
.../MyControlInfo/components/areaModel.vue | 86 +++
.../MyControlInfo/components/detailForm.vue | 131 ++++
.../MyControlInfo/components/dialogList.vue | 229 +++++++
.../components/drawerAreaModel.vue | 168 +++++
.../MyControlInfo/components/personNum.vue | 125 ++++
.../MyControlInfo/components/sendControl.vue | 194 ++++++
.../components/ui/approvalInfo.vue | 205 ++++++
.../components/ui/controlArea.vue | 192 ++++++
.../components/ui/controlInfo.vue | 282 ++++++++
.../components/ui/dialogList.vue | 215 +++++++
.../myControl/components/sendControl.vue | 15 +-
.../myControl/components/ui/approvalInfo.vue | 79 ++-
.../myControl/components/ui/controlArea.vue | 33 +-
.../myControl/components/ui/controlInfo.vue | 10 +-
.../IntelligentControl/myControl/index.vue | 32 +-
.../BehaviorLabels/components/editAddForm.vue | 133 ++--
44 files changed, 8479 insertions(+), 594 deletions(-)
create mode 100644 src/components/aboutTable/TagSelectorDialog.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/components/detailForm.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addFormPeo.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/TagSelectorDialog.vue
create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/infoForm.vue
create mode 100644 src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/dialogList.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/areaModel.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/detailForm.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/dialogList.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/drawerAreaModel.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/personNum.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/sendControl.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/approvalInfo.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlArea.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlInfo.vue
create mode 100644 src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/dialogList.vue
diff --git a/package-lock.json b/package-lock.json
index 1f6375b..fa1e6db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
"gifler": "^0.1.0",
"lodash": "^4.17.21",
"mitt": "^3.0.0",
+ "moment": "^2.30.1",
"ol": "^6.14.1",
"pinia": "^3.0.1",
"vue": "^3.2.8",
@@ -12196,6 +12197,14 @@
"mkdirp": "bin/cmd.js"
}
},
+ "node_modules/moment": {
+ "version": "2.30.1",
+ "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -29363,6 +29372,11 @@
"minimist": "^1.2.6"
}
},
+ "moment": {
+ "version": "2.30.1",
+ "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+ },
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index aac86aa..0776ffe 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"gifler": "^0.1.0",
"lodash": "^4.17.21",
"mitt": "^3.0.0",
+ "moment": "^2.30.1",
"ol": "^6.14.1",
"pinia": "^3.0.1",
"vue": "^3.2.8",
diff --git a/src/components/MyComponents/Department/index.vue b/src/components/MyComponents/Department/index.vue
index fd4c4c5..58ddbe2 100644
--- a/src/components/MyComponents/Department/index.vue
+++ b/src/components/MyComponents/Department/index.vue
@@ -74,7 +74,6 @@ const endProps = {
const tableData = ref([]);
const getSysMenuTree = async () => {
const res = await selectDeptPage(listQuery.value);
- debugger
tableData.value = res;
depList.value = res
};
diff --git a/src/components/MyComponents/Select/index.vue b/src/components/MyComponents/Select/index.vue
index c480dff..c105872 100644
--- a/src/components/MyComponents/Select/index.vue
+++ b/src/components/MyComponents/Select/index.vue
@@ -1,8 +1,19 @@
-
-
-
+
+
@@ -16,20 +27,24 @@ const props = defineProps({
default: "请选择",
type: String
},
- disabled:{
+ disabled: {
default: false,
type: Boolean
},
modelValue: {
- default: "",
- type: String
+ type: [String, Array], // 允许 String 或 Array
+ default: "", // 默认值设为空字符串
+ validator: (value) => {
+ // 允许:空字符串、非空字符串、数组
+ return typeof value === "string" || Array.isArray(value);
+ }
},
dictEnum: {
- default: Array,
- type: String
+ default: [],
+ type: Array
},
width: {
- default: '100%',
+ default: "100%",
type: String
}
});
diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue
index 10957b4..bad98e7 100644
--- a/src/components/aboutTable/FormMessage.vue
+++ b/src/components/aboutTable/FormMessage.vue
@@ -22,6 +22,7 @@
clearable
v-model="listQuery[item.prop]"
:placeholder="`请输入${item.label}`"
+ :disabled="item.disabled"
/>
@@ -67,6 +72,7 @@
width="100%"
v-model="listQuery[item.prop]"
:isImg="item.isImg"
+ :disabled="item.disabled"
/>
diff --git a/src/components/aboutTable/TagSelectorDialog.vue b/src/components/aboutTable/TagSelectorDialog.vue
new file mode 100644
index 0000000..ee8fcad
--- /dev/null
+++ b/src/components/aboutTable/TagSelectorDialog.vue
@@ -0,0 +1,407 @@
+
+
+
+
+
+
+
+
+
+ {{ it.zdmc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index f5f9bab..169726d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -500,6 +500,18 @@ export const publicRoutes = [
icon: "article"
}
},
+ {
+ path: "/autompvGroup",
+ name: "autompvGroup",
+ component: () =>
+ import(
+ "@/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index"
+ ),
+ meta: {
+ title: "重点群体审批",
+ icon: "article"
+ }
+ },
{
path: "/mpvPeo",
name: "mpvPeo",
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/components/detailForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/components/detailForm.vue
new file mode 100644
index 0000000..ff23f37
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/components/detailForm.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue
new file mode 100644
index 0000000..9661dd1
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue
@@ -0,0 +1,439 @@
+
+
+
+
+
+
+
+
+
+ 我的待办
+
+
+ 我的已办
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+ - 群体名称:{{ row.qtMc }}
+
+ -
+ 风险等级:
+
+
+ - 创建时间:{{ row.xtCjsj }}
+
+
+
+ 涉恐群体
+ 涉稳群体
+ 讨薪群体
+
+
+
+ 背景资料:{{ row.qtBjzl }}
+ 创建单位:{{ row.xtCjbmmc }}
+
+
+
+ 管辖单位:{{ row.gxSsdwmc }}
+ 列控原因:{{ row.zdrLkyy }}
+ 开始时间:{{ row.startTime }}
+ 截至时间:{{ row.endTime }}
+
+
+ {{ row.wkrs }}
+
+
+
+
+
+
+
+ 审核
+ 审批
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue
new file mode 100644
index 0000000..1b280aa
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue
@@ -0,0 +1,408 @@
+
+
+
+
+
+
+
+
+
+ {{ it.zdmc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
index 2d76f64..4bbfa16 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
@@ -3,60 +3,352 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue
new file mode 100644
index 0000000..4915a99
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.title }}
+
+
+
+
+ {{ item.sqrXm }}
+
+
{{ item.sqrSsbmmc }}
+
+ {{ item.description }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue
new file mode 100644
index 0000000..76fe052
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue
new file mode 100644
index 0000000..0d8f76b
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue
@@ -0,0 +1,608 @@
+
+
+
+
重点群体管理
+
+ 审核
+ 审批
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/qtDetail.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/qtDetail.vue
index 9ece9de..28b9ce3 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/qtDetail.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/qtDetail.vue
@@ -3,43 +3,26 @@
群体信息
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
群体管辖信息
-
+
-
+
-
+
-
+
审批信息
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -134,4 +117,4 @@ defineExpose({ submit });
\ No newline at end of file
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue
new file mode 100644
index 0000000..41d1518
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ {{
+ getLabelByValue(scope.row.ryXb, D_BZ_XB)
+ }}
+
+
+
+
+
+
+
+
+ {{
+ getLabelByValue(scope.row.ryMz, D_BZ_MZ)
+ }}
+
+
+
+
+
+ {{
+ getLabelByValue(scope.row.zdrCzzt, D_GS_ZDR_CZZT)
+ }}
+
+
+
+
+ {{
+ getLabelByValue(scope.row.zdrRyjb, D_GS_ZDR_RYJB)
+ }}
+
+
+
+
+ {{
+ getLabelByValue(scope.row.zdrSsjz, D_GS_BK_SSJZ)
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
index 67fa615..4b1ea8f 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
@@ -2,7 +2,9 @@
- {{ it }}
+
+ {{ it }}
新增
@@ -32,44 +34,63 @@
:controlsWidth="pageData.controlsWidth"
@chooseData="chooseData"
>
-
-
-
![]()
-
- - 群体名称:
- - 所属辖区:
- - 群体级别:
- - 风险等级:
-
-
-
- 涉恐群体
- 涉稳群体
- 讨薪群体
-
-
-
- 背景资料:
- 创建单位:
- 风险监测:
- 一般监测:
- 重点监测:
-
-
- 群体标签:
- 管辖单位:
- 列控原因:
- 开始时间:
- 截至时间:
-
-
- {{ row.wkrs }}
-
+
+
+
![]()
+
+ - 群体名称:{{ row.qtMc }}
+
+ -
+ 风险等级:
+
+
+ - 创建时间:{{ row.xtCjsj }}
+
+
+
+ 涉恐群体
+ 涉稳群体
+ 讨薪群体
+
+
+
+ 背景资料:{{ row.qtBjzl }}
+ 创建单位:{{ row.xtCjbmmc }}
+
+
+
+ 管辖单位:{{ row.gxSsdwmc }}
+ 列控原因:{{ row.zdrLkyy }}
+ 开始时间:{{ row.startTime }}
+ 截至时间:{{ row.endTime }}
+
+
+ {{ row.wkrs }}
+
+
+
+
+
- 编辑
- 查看
- 删除
+ 送审
+ 编辑
+ 查看
+ 删除
+
+ 是否要发起送审
+
+
+
+
+
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/TagSelectorDialog.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/TagSelectorDialog.vue
new file mode 100644
index 0000000..ee8fcad
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/TagSelectorDialog.vue
@@ -0,0 +1,407 @@
+
+
+
+
+
+
+
+
+
+ {{ it.zdmc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue
index 8d7bf1b..a8d9a6a 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue
@@ -1,51 +1,305 @@
-
重点群体管理
+
{{ title }}重点人管理
- 保存
+ 保存
关闭
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/infoForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/infoForm.vue
new file mode 100644
index 0000000..636501e
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/infoForm.vue
@@ -0,0 +1,492 @@
+
+
+
+
{{ title }}重点人管理
+
+ 关闭
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
index 187c6ee..d7b2122 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
@@ -2,7 +2,9 @@
- {{ it }}
+
+ {{ it }}
新增
@@ -32,41 +34,85 @@
:controlsWidth="pageData.controlsWidth"
@chooseData="chooseData"
>
-
-
-
![]()
-
- - 姓名:
- - 性别:
- - 籍贯:
- - 身份证:
- - 出生日期:
- - 民族:
-
-
-
- 涉恐人员
- 涉稳人员
- 在逃人员
-
-
-
- 户籍地区化:
- 户籍派出所:
- 户籍地详址:
-
-
- 管辖单位:
- 人类类别:
- 人员级别:
- 管控原因:
- 管控状态:
-
+
+
+
![]()
+
+ - 姓名:{{ row.rySfzh }}
+ -
+ 性别:
+
+
+ -
+ 籍贯:
+
+
+ - 身份证:{{ row.rySfzh }}
+ - 出生日期:{{ row.ryCsrq }}
+ -
+ 民族:
+
+
+
+
+
+ 涉恐人员
+ 涉稳人员
+ 在逃人员
+
+
+
+
+ 户籍地区划:
+
+
+ 户籍派出所:{{ row.hjdPcsmc }}
+ 户籍地详址:{{ row.hjdXz }}
+
+
+ 管辖单位:{{ row.gxSsbmmc }}
+
+ 人员级别:
+
+
+ 管控原因:{{ zdrLkyy }}
+
+ 管控状态:
+
+
+
+
+
+
+
+
+ {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}
+
+
+
- 编辑
- 查看
- 删除
+ 编辑
+ 查看
+ 删除
+
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue
index 95130a8..9cff06b 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue
@@ -3,63 +3,229 @@
情报信息流转{{ title }}
- 保存
+ 保存
关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue
index 69d79c9..1ece06b 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue
@@ -17,7 +17,11 @@
-
+
@@ -28,13 +32,20 @@
:key="pageData.keyCount"
:tableConfiger="pageData.tableConfiger"
:controlsWidth="pageData.controlsWidth"
- @chooseData="chooseData">
+ @chooseData="chooseData"
+ >
- 编辑
+ 编辑
处置
- 删除
- 采纳
+ 删除
+ 采纳
-
+
@@ -61,16 +72,58 @@ import DetailForm from "./components/addForm.vue";
import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
import { reactive, ref, onMounted, getCurrentInstance } from "vue";
const { proxy } = getCurrentInstance();
+
+const { D_GS_XS_LY, D_GS_XS_FXDJ, D_GS_ZDQT_LB, D_GS_XS_CZZT, D_GS_XS_ZT } =
+ proxy.$dict(
+ "D_GS_XS_LY",
+ "D_GS_XS_FXDJ",
+ "D_GS_ZDQT_LB",
+ "D_GS_XS_CZZT",
+ "D_GS_XS_ZT"
+ ); //获取字典数据
+const dialogTitle = ref("新增信息"); //弹窗标题
const detailDiloag = ref();
const searchBox = ref(); //搜索框
const searchConfiger = ref([
- { label: "线索名称", prop: 'clueTitle', placeholder: "请输入线索名称", showType: "input" },
- { label: "线索内容", prop: 'semanticKeywords', placeholder: "请输入线索内容", showType: "input" },
- { label: "线索大类", prop: 'clueType', placeholder: "请选择线索大型", showType: "select" },
- { label: "线索细类", prop: 'xsxl', placeholder: "请选择线索细类", showType: "select" },
- { label: "线索来源", prop: 'xsly', placeholder: "请选择线索来源", showType: "select" },
- { label: "线索风险等级", prop: 'xsfxdj', placeholder: "请选择线索风险等级", showType: "select" },
+ {
+ label: "线索名称",
+ prop: "xsMc",
+ placeholder: "请输入线索名称",
+ showType: "input"
+ },
+ {
+ label: "线索内容",
+ prop: "xsNr",
+ placeholder: "请输入线索内容",
+ showType: "input"
+ },
+ {
+ label: "线索大类",
+ prop: "xsDl",
+ placeholder: "请选择线索大型",
+ showType: "input"
+ },
+ {
+ label: "线索细类",
+ prop: "xsXl",
+ placeholder: "请选择线索细类",
+ showType: "input"
+ },
+ {
+ label: "线索来源",
+ prop: "xsLy",
+ placeholder: "请选择线索来源",
+ showType: "select",
+ options: D_GS_XS_LY
+ },
+ {
+ label: "线索风险等级",
+ prop: "xsFxdj",
+ placeholder: "请选择线索风险等级",
+ showType: "select",
+ options: D_GS_XS_FXDJ
+ }
]);
const pageData = reactive({
@@ -140,30 +193,30 @@ const pageData = reactive({
},
controlsWidth: 220,
tableColumn: [
- { label: "线索编号", prop: "clueNo" },
- { label: "线索名称", prop: "clueTitle" },
- { label: "线索类型", prop: "clueType" },
- { label: "线索来源", prop: "clueSource" },
- { label: "风险等级", prop: "riskLevel" },
+ { label: "线索编号", prop: "xsBh" },
+ { label: "线索名称", prop: "xsMc" },
+ // { label: "线索类型", prop: "xsQtlx", options: D_GS_ZDQT_LB },
+ { label: "线索来源", prop: "xsLy", options: D_GS_XS_LY },
+ { label: "风险等级", prop: "xsFxdj", options: D_GS_XS_FXDJ },
{ label: "开始时间", prop: "startTime" },
{ label: "结束时间", prop: "endTime" },
- { label: "指向地点", prop: "targetLocation" },
- { label: "线索内容", prop: "clueContent", width: 200 },
- { label: "群体类型", prop: "attachmentType" },
- { label: "群题名称", prop: "attachmentName" },
- { label: "上报单位", prop: "reportUnit" },
- { label: "上报时间", prop: "reportTime" },
- { label: "涉及人数", prop: "involvedCount" },
- { label: "附件", prop: "involvedCount" },
- { label: "处置状态", prop: "status" },
- { label: "状态", prop: "status" }
+ { label: "指向地点", prop: "xsZxdd" },
+ { label: "线索内容", prop: "xsNr" },
+ { label: "群体类型", prop: "xsQtlx", options: D_GS_ZDQT_LB },
+ { label: "群体名称", prop: "xsQtmc" },
+ { label: "上报单位", prop: "sbDwMc" },
+ { label: "上报时间", prop: "sbSj" },
+ { label: "涉及人数", prop: "xsSjrs" },
+ { label: "附件", prop: "xsFj" },
+ { label: "处置状态", prop: "xsZtCz", options: D_GS_XS_CZZT },
+ { label: "状态", prop: "xsZt", options: D_GS_XS_ZT }
]
-})
+});
const queryFrom = ref({});
onMounted(() => {
- getList()
+ getList();
tabHeightFn();
});
@@ -171,35 +224,39 @@ onMounted(() => {
const handleType = (val) => {
pageData.keyCount++;
pageData.pageConfiger.pageCurrent = 1;
- getList()
-}
+ getList();
+};
// 搜索
-const onSearch = (val) =>{
- queryFrom.value = {...val}
+const onSearch = (val) => {
+ queryFrom.value = { ...val };
pageData.pageConfiger.pageCurrent = 1;
- getList()
-}
+ getList();
+};
-const changeNo = (val) =>{
+const changeNo = (val) => {
pageData.pageConfiger.pageNum = val;
- getList()
-}
-const changeSize = (val) =>{
+ getList();
+};
+const changeSize = (val) => {
pageData.pageConfiger.pageSize = val;
- getList()
-}
+ getList();
+};
// 获取列表
-const getList = (val) =>{
- // pageData.tableConfiger.loading = true;
+const getList = (val) => {
+ pageData.tableConfiger.loading = true;
let data = { ...pageData.pageConfiger, ...queryFrom.value };
- // let url = '/mosty-lzcj/tbDwMbkf/queryList';
- // qcckPost(data,url).then(res=>{
- // pageData.tableData = res.records || [];
- // pageData.total = res.total;
- // pageData.tableConfiger.loading = false;
- // }).catch(()=>{ pageData.tableConfiger.loading = false; })
-}
+ let url = "/mosty-gsxt/tbGsxtXs/selectPage";
+ qcckGet(data, url)
+ .then((res) => {
+ pageData.tableData = res.records || [];
+ pageData.total = res.total;
+ pageData.tableConfiger.loading = false;
+ })
+ .catch(() => {
+ pageData.tableConfiger.loading = false;
+ });
+};
// 详情
const addEdit = (type, row) => {
@@ -208,7 +265,8 @@ const addEdit = (type, row) => {
// 表格高度计算
const tabHeightFn = () => {
- pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+ pageData.tableHeight =
+ window.innerHeight - searchBox.value.offsetHeight - 250;
window.onresize = function () {
tabHeightFn();
};
@@ -220,5 +278,3 @@ const tabHeightFn = () => {
background: rgba(0, 0, 0, 0.5) !important;
}
-
-
diff --git a/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue
index f31f8dd..5ab3235 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue
@@ -3,62 +3,127 @@
社会信息人员建设管理{{ title }}
- 保存
+ 保存
关闭
-
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/detailForm.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/detailForm.vue
new file mode 100644
index 0000000..5b45cc0
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/detailForm.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/dialogList.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/dialogList.vue
new file mode 100644
index 0000000..ddf9fa7
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/dialogList.vue
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/drawerAreaModel.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/drawerAreaModel.vue
new file mode 100644
index 0000000..fa23dd0
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/drawerAreaModel.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 添加应用模型
+
+
+
+
+
+
+
+
+
巴宜区公路外国模型
+
模型类型:重点区域城规模型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/personNum.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/personNum.vue
new file mode 100644
index 0000000..b518204
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/personNum.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/sendControl.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/sendControl.vue
new file mode 100644
index 0000000..ea09d0d
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/sendControl.vue
@@ -0,0 +1,194 @@
+
+
+
+
布控详情
+
+ 审核
+ 审批
+ 关闭
+
+
+
+
布控信息
+
+
布控范围
+
+
审批信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/approvalInfo.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/approvalInfo.vue
new file mode 100644
index 0000000..1409c60
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/approvalInfo.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.title }}
+
+
+
+
+ {{ item.fqr }}
+
+
{{ item.fqbm }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlArea.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlArea.vue
new file mode 100644
index 0000000..d9bcd7d
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlArea.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlInfo.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlInfo.vue
new file mode 100644
index 0000000..abd2266
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlInfo.vue
@@ -0,0 +1,282 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.qtTbsc == true ? "是" : "否" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/dialogList.vue b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/dialogList.vue
new file mode 100644
index 0000000..69b34ef
--- /dev/null
+++ b/src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/dialogList.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue
index 52491d8..3d4b268 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue
@@ -55,19 +55,26 @@ const init = async (type, row) => {
approvalInfoRef.value?.resetForm?.();
}
};
+
+const cleanObj = (obj) => {
+ if (!obj) return {};
+ return Object.fromEntries(
+ Object.entries(obj).filter(([_, v]) => v !== null && v !== undefined)
+ );
+};
const submit = async () => {
try {
+
// 1. 分别获取各子组件数据
const controlInfoData = controlInfoRef.value?.getFormData?.();
const controlAreaData = controlAreaRef.value?.getFormData?.();
const approvalInfoData = approvalInfoRef.value?.getFormData?.();
// 2. 合并数据
const formData = {
- ...controlInfoData.formData,
- ...controlAreaData.formData,
- ...approvalInfoData.formData
+ ...cleanObj(controlInfoData?.formData),
+ ...cleanObj(controlAreaData?.formData),
+ ...cleanObj(approvalInfoData?.formData)
};
- console.log("合并数据:", formData);
// 根据是否有 id 判断是新增还是编辑
const url = formData.id
? "/mosty-gsxt/tbGsxtBk/update" // 编辑接口
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue
index 633c8f7..9eafe9d 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue
@@ -41,7 +41,11 @@
>
-
+
{{ item.fqbm }}
+
+ {{ item.description }}
+
@@ -119,12 +126,12 @@ const formData = ref([
type: "select",
options: D_GS_BK_CZJSDWLX
},
- {
- label: "提交方式",
- prop: "bkTjfs",
- type: "radio",
- options: D_GS_BK_TJFS
- },
+ // {
+ // label: "提交方式",
+ // prop: "bkTjfs",
+ // type: "radio",
+ // options: D_GS_BK_TJFS
+ // },
{
label: "签收时间",
prop: "bkSjQs",
@@ -133,13 +140,27 @@ const formData = ref([
]);
const rules = reactive({
bkBt: [{ required: true, message: "请选择处置接收单位", trigger: "blur" }],
- bkObj: [{ required: true, message: "请选择提交方式", trigger: "blur" }],
+ // bkObj: [{ required: true, message: "请选择提交方式", trigger: "blur" }],
bkSjQs: [{ required: true, message: "请选择签收时间", trigger: "change" }]
});
const step = ref([
{ fqr: "发起人", fqbm: "发起部门", title: "发起申请", default: true },
- { fqr: "发起人", fqbm: "发起部门", title: "审核确认", default: false },
- { fqr: "发起人", fqbm: "发起部门", title: "审批确认", default: false }
+ {
+ fqr: "发起人",
+ fqbm: "发起部门",
+ title: "审核确认",
+ default: false,
+ status: "", // 动态设置状态
+ description: "" // 动态设置描述(如不通过原因)
+ },
+ {
+ fqr: "发起人",
+ fqbm: "发起部门",
+ title: "审批确认",
+ default: false,
+ status: "", // 动态设置状态
+ description: "" // 动态设置描述(如不通过原因)
+ }
]);
onMounted(() => {
@@ -214,14 +235,46 @@ const setFormData = (data) => {
{
fqr: data.bkshrXm || "系统管理", // 审核人姓名
fqbm: data.bkshrSsbmmc || "西藏", // 审核部门
- title: "审核确认"
+ title: "审核确认",
+ status: "", // 动态设置状态
+ description: "" // 动态设置描述(如不通过原因)
},
{
fqr: data.bksprXm || "测试", // 审批人姓名
fqbm: data.bksprSsbmmc || "西藏", // 审批部门
- title: "审批确认"
+ title: "审批确认",
+ status: "", // 动态设置状态
+ description: "" // 动态设置描述(如不通过原因)
}
];
+ // 根据 bkZt 的值设置不同的状态
+ switch (data.bkZt) {
+ case "02": // 审核中
+ step.value[1].status = "process";
+ step.value[1].description = "审核中";
+ break;
+ case "03": // 审核不通过
+ step.value[1].status = "error";
+ step.value[1].description = `审核不通过(原因:${data.bkshBtgyy})`;
+ break;
+ case "04": // 审批中
+ step.value[1].status = "finish"; // 审核已完成
+ step.value[2].status = "process"; // 审批中
+ step.value[2].description = "审批中";
+ break;
+ case "05": // 审批通过
+ step.value[1].status = "finish"; // 审核已完成
+ step.value[2].status = "finish"; // 审批已完成
+ step.value[2].description = "审批通过";
+ break;
+ case "06": // 审批不通过
+ step.value[1].status = "finish"; // 审核已完成
+ step.value[2].status = "error"; // 审批不通过
+ step.value[2].description = `审批不通过(原因:${data.bkshBtgyy})`;
+ break;
+ default:
+ break;
+ }
};
// 3. 暴露方法给父组件
@@ -240,7 +293,7 @@ defineExpose({
.desc {
margin: 5px;
color: #929090;
- width: 350px;
+ // width: 350px;
}
.icon {
// position: absolute;
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue
index afa2eae..df81ae9 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue
@@ -25,6 +25,14 @@
+
+
+ {{
+ listQuery?.bkSjKs && listQuery?.bkSjJs
+ ? calculateDays(listQuery.bkSjKs, listQuery.bkSjJs)
+ : "--"
+ }}
+
@@ -152,7 +160,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
import FormMessage from "@/components/aboutTable/FormMessage.vue";
import { qcckPost, qcckPut } from "@/api/qcckApi.js";
import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/components/ui/dialogList.vue";
-
+import moment from "moment";
const { D_GS_BK_CZYQ, D_GS_BK_CZJSDWLX, D_GS_BK_DJ, D_GS_BK_YZ, D_GS_BK_SJLX } =
proxy.$dict(
"D_GS_BK_CZYQ",
@@ -211,7 +219,7 @@ const formData = ref([
{
label: "布控失效时间",
prop: "bkSjSx",
- type: "datetime"
+ type: "slot"
},
{
@@ -258,13 +266,24 @@ const openDialog = (type) => {
chooseShow.value = true;
chooseType.value = type;
chooseTitle.value = type == "01" ? "请选择布控范围" : "请选择人员标签";
- console.log(tableDate.bkfwList, "tableDate.bkfwList");
roleIds.value =
type == "01"
? tableDate.bkfwList.map((item) => item.id)
: tableDate.rybqList.map((item) => item.id);
};
+const calculateDays = (start, end) => {
+ if (!start || !end) return null; // 如果参数为空,返回 null
+ const startDate = new Date(start);
+ const endDate = new Date(end);
+
+ // 检查日期是否有效
+ if (isNaN(startDate) || isNaN(endDate)) return null;
+
+ const diffInDays = (endDate - startDate) / (24 * 60 * 60 * 1000); // 计算天数差
+ return diffInDays.toFixed(1); // 保留1位小数(返回字符串,如 "6.3")
+};
+
// 选择数据
const chooseDate = (data) => {
if (chooseType.value == "01") {
@@ -281,6 +300,10 @@ const handleFileChange = (file, fileList) => {
// 2. 暴露获取数据的方法
const getFormData = () => {
+ if (listQuery.value.bkSjLx == "01") {
+ listQuery.value.bkSjSx = calculateDays(listQuery.value.bkSjKs, listQuery.value.bkSjJs);
+ }
+ console.log(listQuery.value, "listQuery.value",'数据');
// 可以在这里添加验证逻辑
return {
formData: listQuery.value
@@ -288,8 +311,8 @@ const getFormData = () => {
};
// 接收父组件传入的数据并回显
const setFormData = (data) => {
- tableDate.bkfwList = data.bkfwList;
- tableDate.rybqList = data.rybqList;
+ tableDate.bkfwList = data.bkfwList ?? [];
+ tableDate.rybqList = data.rybqList ?? [];
listQuery.value = {
...data // 假设 data 包含所有需要的字段
};
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue
index ca1af4d..4264c0d 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue
@@ -227,7 +227,7 @@ const formDataModel = ref([
{ label: "手机号", prop: "rySjhm", type: "input", width: "45%" },
{ label: "同步上传", prop: "qtTbsc", type: "switch" },
{ label: "车牌号", prop: "clCph", type: "input", width: "45%" },
- { label: "车号", prop: "clCjh", type: "input", width: "45%" },
+ { label: "车架号", prop: "clCjh", type: "input", width: "45%" },
{ label: "特许证号", prop: "qtTxzh", type: "input", width: "45%" },
{
label: "布控类型",
@@ -309,7 +309,7 @@ const pageData = reactive({
{ label: "手机号", prop: "rySjhm" },
{ label: "同步上传", prop: "qtTbsc", showSolt: true },
{ label: "车牌号", prop: "clCph" },
- { label: "车号", prop: "clCjh" },
+ { label: "车架号", prop: "clCjh" },
{ label: "特许证号", prop: "qtTxzh" },
{ label: "布控类型", prop: "bkLx", showSolt: true },
{ label: "人员标签", prop: "" }
@@ -323,7 +323,7 @@ const formData = ref([
},
{
- label: "所属警钟",
+ label: "所属警种",
prop: "bkSsjz",
type: "select",
options: D_GS_BK_SSJZ
@@ -353,6 +353,7 @@ const getFormData = () => {
};
// 打开弹窗
const openDialog = (type) => {
+ console.log(tableDate.yjbqList, tableDate.rybqList);
chooseShow.value = true;
chooseType.value = type;
chooseTitle.value = type == "01" ? "请选择预警标签模型" : "请选择人员标签";
@@ -401,7 +402,6 @@ const submitForm = () => {
clCjh: validData.clCjh,
qtTxzh: validData.qtTxzh,
bkLx: validData.bkLx,
- bkLx: validData.bkLx,
fjZp: validData.fjZp
};
} else {
@@ -442,7 +442,7 @@ const submitForm = () => {
// 接收父组件传入的数据并回显
const setFormData = (data) => {
- tableDate.yjbqList = data.yjbqList;
+ tableDate.yjbqList = data.yjbqList ?? [];
listQuery.value = {
...data // 假设 data 包含所有需要的字段
};
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
index d3f1e23..2f61379 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
@@ -60,20 +60,28 @@
- {{ deptList.find(item => item.id == row.czJsdwdm)?.label || '未知单位' }}
+
+ {{
+ deptList.find((item) => item.id == row.czJsdwdm)?.label ||
+ "未知单位"
+ }}
+
- 编辑
送审
- 详情
@@ -105,11 +113,10 @@
-
+
-
@@ -120,13 +127,15 @@ 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/detailForm.vue";
+import MyControlInfo from "../MyControlInfo/components/sendControl.vue";
import SendControl from "./components/sendControl.vue";
import PersonNum from "./components/personNum.vue";
import DrawerAreaModel from "./components/drawerAreaModel.vue";
import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { ElMessage } from "element-plus";
+
import { selectUserDeptPage } from "@/api/user-manage";
const { proxy } = getCurrentInstance();
const {
@@ -151,6 +160,7 @@ const searchBox = ref(); //搜索框
const sendControlRef = ref();
const personNumRef = ref();
const autoId = ref();
+const myControlInfoRef = ref(null);
const searchConfiger = ref([
{
label: "布控等级",
@@ -253,12 +263,10 @@ const pageData = reactive({
]
});
-
onMounted(() => {
getList();
tabHeightFn();
getdepartmentList();
-
});
// 获取部门列表
@@ -268,11 +276,9 @@ const getdepartmentList = () => {
label: item.deptName,
value: item.deptId
}));
-
});
};
const openDetail = (row) => {
- console.log(row);
autoId.value = row.id;
dialogVisible.value = true;
};
@@ -316,8 +322,8 @@ const getList = (val) => {
};
// 详情
-const addEdit = (type, row) => {
- detailDiloag.value.init(type, row);
+const info = (type, row) => {
+ myControlInfoRef.value.init(type, row);
};
//送审
diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
index 0cf8441..27ded8c 100644
--- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
@@ -3,31 +3,62 @@
行为标签管理{{ title }}
- 保存
+ 保存
关闭
-
+
-
-
+
+
-
+