From 65947c2eb496c081a2c918f91221281b1d8e2d2e Mon Sep 17 00:00:00 2001 From: jy <1052480693@qq.com> Date: Mon, 26 May 2025 21:03:06 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E2=80=99=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=B8=83=E6=8E=A7=E7=9A=84=E5=A2=9E=E5=88=A0=E6=9F=A5?= =?UTF-8?q?=E6=94=B9=E2=80=98=EF=BC=8C=E5=B8=83=E6=8E=A7=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=81=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyComponents/ChooseUser/index.vue | 38 +- src/components/aboutTable/FormMessage.vue | 177 +++++- src/router/index.js | 187 ++++-- .../BasicManagement/components/dialogList.vue | 209 +++++++ .../components/editAddForm.vue | 242 ++++++++ .../surveillanceControl/index.vue | 193 ++++++ .../ControlApproval/index.vue | 446 ++++++++------ .../myControl/components/dialogList.vue | 229 +++++++ .../myControl/components/sendControl.vue | 139 +++-- .../myControl/components/ui/approvalInfo.vue | 277 ++++++--- .../myControl/components/ui/controlArea.vue | 341 ++++++++--- .../myControl/components/ui/controlInfo.vue | 561 +++++++++++++++--- .../myControl/components/ui/dialogList.vue | 215 +++++++ .../IntelligentControl/myControl/index.vue | 465 +++++++++------ .../fourColorManage/components/dialogList.vue | 78 ++- .../tagManage/components/editAddForm.vue | 288 ++++++--- src/views/home/layout/head.vue | 7 +- src/views/login/index.vue | 130 ++-- 18 files changed, 3332 insertions(+), 890 deletions(-) create mode 100644 src/views/backOfficeSystem/BasicManagement/components/dialogList.vue create mode 100644 src/views/backOfficeSystem/BasicManagement/surveillanceControl/components/editAddForm.vue create mode 100644 src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue create mode 100644 src/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue create mode 100644 src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/dialogList.vue diff --git a/src/components/MyComponents/ChooseUser/index.vue b/src/components/MyComponents/ChooseUser/index.vue index e5b79d3..8311e04 100644 --- a/src/components/MyComponents/ChooseUser/index.vue +++ b/src/components/MyComponents/ChooseUser/index.vue @@ -44,7 +44,11 @@ style="width: 100%" height="450" > - + { // 为用户分配角色 const onComfirm = () => { const userList = multipleSelectionUser.value; - let list = [] - let listId = [] - userList.forEach(val=>{ - if(listId.indexOf(val.id) == -1) { + let list = []; + let listId = []; + userList.forEach((val) => { + if (listId.indexOf(val.id) == -1) { list.push(val); listId.push(val.id); } - }) + }); emits("choosedUsers", list); let data = { type: props.LeaderType, userList: userList }; + emits("choosedUsersLeader", data); closed(); }; @@ -193,20 +198,20 @@ const handleCurrentChange = (currentPage) => { }; const getListData = () => { const params = listQuery.value; - selectUserDeptPage(params).then(res=>{ + selectUserDeptPage(params).then((res) => { tableData.value = res?.records; total.value = Number(res.total); - multipleUser() + multipleUser(); }); }; //列表回显 function multipleUser() { - tableData.value.forEach(item=>{ - if(props.roleIds.some(id=>id == item.id)){ + tableData.value.forEach((item) => { + if (props.roleIds.some((id) => id == item.id)) { multipleUserRef.value.toggleRowSelection(item, true); } - }) + }); } const handleFilter = () => { @@ -226,7 +231,6 @@ const handleSelectionChange = (val) => { } else { multipleSelectionUser.value = val; } - }; @@ -241,10 +245,8 @@ const handleSelectionChange = (val) => { .tabBoxRadio .el-table__header-wrapper .el-checkbox { display: none; } -.el-dialog{ - background: #050e33; -} -.el-dialog__title{ - color: #fff; + +.el-dialog__title { + color: #fff; } diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue index 41fbb64..10957b4 100644 --- a/src/components/aboutTable/FormMessage.vue +++ b/src/components/aboutTable/FormMessage.vue @@ -1,46 +1,155 @@ - - \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index b86c871..f5f9bab 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,7 +29,8 @@ export const privateRoutes = [ { path: "/user/department-ist", name: "departmentList", - component: () => import("@/views/backOfficeSystem/systemConfig/department-list/index"), + component: () => + import("@/views/backOfficeSystem/systemConfig/department-list/index"), meta: { title: "部门管理", icon: "article-ranking" @@ -39,7 +40,8 @@ export const privateRoutes = [ { path: "/user/userList", name: "userList", - component: () => import("@/views/backOfficeSystem/systemConfig/user-list/index"), + component: () => + import("@/views/backOfficeSystem/systemConfig/user-list/index"), meta: { title: "用户管理", icon: "article-ranking" @@ -48,7 +50,8 @@ export const privateRoutes = [ { path: "/user/role", name: "userRoleIndex", - component: () => import("@/views/backOfficeSystem/systemConfig/role-list/index"), + component: () => + import("@/views/backOfficeSystem/systemConfig/role-list/index"), meta: { title: "角色列表", icon: "article-ranking" @@ -57,7 +60,8 @@ export const privateRoutes = [ { path: "/user/menuList", name: "menuList", - component: () => import("@/views/backOfficeSystem/systemConfig/menu-list/index"), + component: () => + import("@/views/backOfficeSystem/systemConfig/menu-list/index"), meta: { title: "菜单管理", icon: "article-ranking" @@ -67,7 +71,8 @@ export const privateRoutes = [ { path: "/dict/detail", name: "dictDetail", - component: () => import("@/views/backOfficeSystem/systemConfig/dict/detail"), + component: () => + import("@/views/backOfficeSystem/systemConfig/dict/detail"), meta: { title: "字典数据" } @@ -75,7 +80,8 @@ export const privateRoutes = [ { path: "/dict/index", name: "dictIndex", - component: () => import("@/views/backOfficeSystem/systemConfig/dict/index"), + component: () => + import("@/views/backOfficeSystem/systemConfig/dict/index"), meta: { title: "字典列表", icon: "article-ranking" @@ -85,7 +91,10 @@ export const privateRoutes = [ { path: "/user/deptAllocationUser/:id", name: "deptAllocationUser", - component: () => import("@/views/backOfficeSystem/systemConfig/department-list/deptAllocationUser"), + component: () => + import( + "@/views/backOfficeSystem/systemConfig/department-list/deptAllocationUser" + ), meta: { title: "管理用户" } @@ -93,7 +102,10 @@ export const privateRoutes = [ { path: "/user/allocationUser/:id", name: "allocationUser", - component: () => import("@/views/backOfficeSystem/systemConfig/role-list/allocationUser"), + component: () => + import( + "@/views/backOfficeSystem/systemConfig/role-list/allocationUser" + ), meta: { title: "分配用户" } @@ -102,7 +114,10 @@ export const privateRoutes = [ { path: "/user/systemConfig", name: "systemConfig", - component: () => import("@/views/backOfficeSystem/systemConfig/system-config-list/index"), + component: () => + import( + "@/views/backOfficeSystem/systemConfig/system-config-list/index" + ), meta: { title: "系统配置", icon: "article-ranking" @@ -144,7 +159,10 @@ export const publicRoutes = [ { path: "/IdentityManage", name: "IdentityManage", - component: () => import("@/views/backOfficeSystem/fourColorManage/IdentityManage/index"), + component: () => + import( + "@/views/backOfficeSystem/fourColorManage/IdentityManage/index" + ), meta: { title: "身份标签管理", icon: "article" @@ -153,7 +171,10 @@ export const publicRoutes = [ { path: "/BehaviorLabels", name: "BehaviorLabels", - component: () => import("@/views/backOfficeSystem/fourColorManage/BehaviorLabels/index"), + component: () => + import( + "@/views/backOfficeSystem/fourColorManage/BehaviorLabels/index" + ), meta: { title: "行为标签管理", icon: "article" @@ -162,7 +183,10 @@ export const publicRoutes = [ { path: "/tagManage", name: "tagManage", - component: () => import("@/views/backOfficeSystem/fourColorManage/tagManage/index"), + component: () => + import( + "@/views/backOfficeSystem/fourColorManage/tagManage/index" + ), meta: { title: "标签组合管理", icon: "article" @@ -178,7 +202,10 @@ export const publicRoutes = [ { path: "/warningControl", name: "warningControl", - component: () => import("@/views/backOfficeSystem/IntelligentControl/warningControl/index"), + component: () => + import( + "@/views/backOfficeSystem/IntelligentControl/warningControl/index" + ), meta: { title: "预警布控", icon: "article" @@ -187,7 +214,10 @@ export const publicRoutes = [ { path: "/myControl", name: "myControl", - component: () => import("@/views/backOfficeSystem/IntelligentControl/myControl/index"), + component: () => + import( + "@/views/backOfficeSystem/IntelligentControl/myControl/index" + ), meta: { title: "我的布控", icon: "article" @@ -196,7 +226,10 @@ export const publicRoutes = [ { path: "/ControlApproval", name: "ControlApproval", - component: () => import("@/views/backOfficeSystem/IntelligentControl/ControlApproval/index"), + component: () => + import( + "@/views/backOfficeSystem/IntelligentControl/ControlApproval/index" + ), meta: { title: "布控审批", icon: "article" @@ -212,7 +245,10 @@ export const publicRoutes = [ { path: "/DatAcquisition", name: "DatAcquisition", - component: () => import("@/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index"), + component: () => + import( + "@/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index" + ), meta: { title: "情报数据采集", icon: "article" @@ -221,7 +257,10 @@ export const publicRoutes = [ { path: "/MoralAnalysis", name: "MoralAnalysis", - component: () => import("@/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index"), + component: () => + import( + "@/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index" + ), meta: { title: "情报语义分析", icon: "article" @@ -230,7 +269,10 @@ export const publicRoutes = [ { path: "/IntelligenceManagement", name: "IntelligenceManagement", - component: () => import("@/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index"), + component: () => + import( + "@/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index" + ), meta: { title: "情报管理", icon: "article" @@ -246,7 +288,9 @@ export const publicRoutes = [ path: "/InformationFlow", name: "InformationFlow", component: () => - import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InformationFlow/index"), + import( + "@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InformationFlow/index" + ), meta: { title: "情报信息流转", icon: "article" @@ -256,7 +300,9 @@ export const publicRoutes = [ path: "/InstructionInformation", name: "InstructionInformation", component: () => - import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"), + import( + "@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index" + ), meta: { title: "指令信息", icon: "article" @@ -266,7 +312,9 @@ export const publicRoutes = [ path: "/StatisticalAnalysis", name: "StatisticalAnalysis", component: () => - import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/StatisticalAnalysis/index"), + import( + "@/views/backOfficeSystem/ResearchJudgment/InformationFlows/StatisticalAnalysis/index" + ), meta: { title: "情报统计分析", icon: "article" @@ -277,7 +325,10 @@ export const publicRoutes = [ { path: "/RecordsOperations", name: "RecordsOperations", - component: () => import("@/views/backOfficeSystem/ResearchJudgment/RecordsOperations/index"), + component: () => + import( + "@/views/backOfficeSystem/ResearchJudgment/RecordsOperations/index" + ), meta: { title: "操作记录", icon: "article" @@ -293,7 +344,10 @@ export const publicRoutes = [ { path: "/RlStatisticalAnalysis", name: "RlStatisticalAnalysis", - component: () => import("@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"), + component: () => + import( + "@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index" + ), meta: { title: "人力情报统计分析", icon: "article" @@ -302,7 +356,10 @@ export const publicRoutes = [ { path: "/CollectCrculate", name: "CollectCrculate", - component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"), + component: () => + import( + "@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index" + ), meta: { title: "人力情报信息采集流转", icon: "article" @@ -311,7 +368,10 @@ export const publicRoutes = [ { path: "/TaskScheduling", name: "TaskScheduling", - component: () => import("@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"), + component: () => + import( + "@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index" + ), meta: { title: "人力情报信息搜索任务调度", icon: "article" @@ -320,7 +380,10 @@ export const publicRoutes = [ { path: "/ConstructionManagement", name: "ConstructionManagement", - component: () => import("@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"), + component: () => + import( + "@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index" + ), meta: { title: "社会信息人员建设管理", icon: "article" @@ -336,7 +399,10 @@ export const publicRoutes = [ { path: "/ZdryFjyp", name: "ZdryFjyp", - component: () => import("@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"), + component: () => + import( + "@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index" + ), meta: { title: "重点人员发掘研判", icon: "article" @@ -345,7 +411,10 @@ export const publicRoutes = [ { path: "/PreliminaryExcavations", name: "PreliminaryExcavations", - component: () => import("@/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index"), + component: () => + import( + "@/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index" + ), meta: { title: "重点人员初步发掘", icon: "article" @@ -354,7 +423,10 @@ export const publicRoutes = [ { path: "/LandingAudit", name: "LandingAudit", - component: () => import("@/views/backOfficeSystem/ExcavationResearch/LandingAudit/index"), + component: () => + import( + "@/views/backOfficeSystem/ExcavationResearch/LandingAudit/index" + ), meta: { title: "重点人员落地审核", icon: "article" @@ -363,7 +435,10 @@ export const publicRoutes = [ { path: "/WarningModel", name: "WarningModel", - component: () => import("@/views/backOfficeSystem/ExcavationResearch/WarningModel/index"), + component: () => + import( + "@/views/backOfficeSystem/ExcavationResearch/WarningModel/index" + ), meta: { title: "重点人员预警模型", icon: "article" @@ -383,21 +458,25 @@ export const publicRoutes = [ { path: "/ResearchHome", name: "ResearchHome", - component: () => import("@/views/backOfficeSystem/ResearchJudgment/ResearchHome/index"), + component: () => + import( + "@/views/backOfficeSystem/ResearchJudgment/ResearchHome/index" + ), meta: { title: "研判首页", icon: "article" - }, + } }, { path: "/MeetingRoom", name: "MeetingRoom", - component: () => import("@/views/backOfficeSystem/MeetingRoom/index"), + component: () => + import("@/views/backOfficeSystem/MeetingRoom/index"), meta: { title: "网上会商室", icon: "article" } - }, + } ] }, { @@ -412,23 +491,51 @@ export const publicRoutes = [ { path: "/mpvGroup", name: "mpvGroup", - component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index"), + component: () => + import( + "@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index" + ), meta: { title: "重点群体管理", icon: "article" - }, + } }, { path: "/mpvPeo", name: "mpvPeo", - component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index"), + component: () => + import( + "@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index" + ), meta: { title: "重点人管理", icon: "article" - }, - }, + } + } ] }, + { + path: "/BasicManagement", + name: "BasicManagement", + meta: { + title: "基础管理", + icon: "article" + }, + children: [ + { + path: "/surveillanceControl", + name: "surveillanceControl", + component: () => + import( + "@/views/backOfficeSystem/BasicManagement/surveillanceControl/index" + ), + meta: { + title: "布控监视", + icon: "article" + } + } + ] + } ] } ]; @@ -441,7 +548,7 @@ const router = createRouter({ export function resetRouter() { if (store.getters?.routeReady && store.getters?.userInfo?.permission?.menus) { const menus = store.getters.userInfo.permission.menus; - menus.forEach(menu => { + menus.forEach((menu) => { router.removeRoute(menu); }); } diff --git a/src/views/backOfficeSystem/BasicManagement/components/dialogList.vue b/src/views/backOfficeSystem/BasicManagement/components/dialogList.vue new file mode 100644 index 0000000..9424c4f --- /dev/null +++ b/src/views/backOfficeSystem/BasicManagement/components/dialogList.vue @@ -0,0 +1,209 @@ + + + + + + diff --git a/src/views/backOfficeSystem/BasicManagement/surveillanceControl/components/editAddForm.vue b/src/views/backOfficeSystem/BasicManagement/surveillanceControl/components/editAddForm.vue new file mode 100644 index 0000000..3b37628 --- /dev/null +++ b/src/views/backOfficeSystem/BasicManagement/surveillanceControl/components/editAddForm.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue b/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue new file mode 100644 index 0000000..6c84f4e --- /dev/null +++ b/src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue b/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue index 87c29e4..6233daa 100644 --- a/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue +++ b/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue @@ -8,16 +8,22 @@
- + 我的待办 - + 我的已办
- + @@ -25,7 +31,11 @@
- + diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue new file mode 100644 index 0000000..ddf9fa7 --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue @@ -0,0 +1,229 @@ + + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue index 00544aa..1fe3ca7 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue @@ -3,68 +3,127 @@
发起布控
+ 保存 + 关闭
布控信息
- +
布控范围
- +
审批信息
- +
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue index 28f2351..92b810f 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue @@ -1,7 +1,7 @@ diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue index 38c7d0f..afa2eae 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue @@ -1,24 +1,53 @@ diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue index e897130..ca1af4d 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue @@ -1,32 +1,78 @@ diff --git a/src/views/backOfficeSystem/fourColorManage/components/dialogList.vue b/src/views/backOfficeSystem/fourColorManage/components/dialogList.vue index 700e0e3..b0c1378 100644 --- a/src/views/backOfficeSystem/fourColorManage/components/dialogList.vue +++ b/src/views/backOfficeSystem/fourColorManage/components/dialogList.vue @@ -1,28 +1,63 @@ - + - + - \ No newline at end of file diff --git a/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue index ecf9a35..c3a7cb1 100644 --- a/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue +++ b/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue @@ -3,45 +3,76 @@
组合标签管理{{ title }}
- 保存 + 保存 关闭
- + + 选择 +
+ + + + + + + + +
+ -
- + From f217eddce2153fcd55f73bcf44719875f3078a6f Mon Sep 17 00:00:00 2001 From: jy <1052480693@qq.com> Date: Tue, 27 May 2025 10:01:47 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=B8=83=E6=8E=A7=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myControl/components/sendControl.vue | 4 ++ .../myControl/components/ui/approvalInfo.vue | 35 ++++++++++- .../IntelligentControl/myControl/index.vue | 60 +++++++++++++------ 3 files changed, 80 insertions(+), 19 deletions(-) diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue index 1fe3ca7..52491d8 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/sendControl.vue @@ -76,6 +76,10 @@ const submit = async () => { await qcckPost(formData, url); ElMessage.success(formData.id ? "编辑成功" : "新增成功"); close(); + // 触发父组件方法 + if (window.parent.updateList) { + window.parent.getList(); // 调用父组件方法 + } router.push("@/views/backOfficeSystem/IntelligentControl/myControl/index"); // qcckPost(formData, "/mosty-gsxt/tbGsxtBk/save").then((res) => { // router.push( diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue index 92b810f..633c8f7 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/approvalInfo.vue @@ -39,6 +39,17 @@ ref="elform" :rules="rules" > + + @@ -84,6 +95,8 @@ import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/co import { qcckPost, qcckPut } from "@/api/qcckApi.js"; import MyTable from "@/components/aboutTable/MyTable.vue"; import { fa } from "element-plus/es/locale.mjs"; +import { selectUserDeptPage } from "@/api/user-manage"; + const { proxy } = getCurrentInstance(); const { D_GS_BK_CZJSDWLX, D_GS_BK_TJFS } = proxy.$dict( "D_GS_BK_CZJSDWLX", @@ -93,14 +106,19 @@ const listQuery = ref({}); //表单 const chooseUserVisible = ref(false); //审批流程 const roleIds = ref([]); //角色id let currentSelectedIndex = null; +const deptList = ref([]); //部门列表 const formData = ref([ { label: "处置接收单位", + prop: "czJsdwdm", + type: "slot" + }, + { + label: "处置接收单位类型", prop: "czJsdwlx", type: "select", options: D_GS_BK_CZJSDWLX }, - { label: "提交方式", prop: "bkTjfs", @@ -124,6 +142,21 @@ const step = ref([ { fqr: "发起人", fqbm: "发起部门", title: "审批确认", default: false } ]); +onMounted(() => { + getdepartmentList(); +}); +// 获取部门列表 +const getdepartmentList = () => { + selectUserDeptPage().then((res) => { + deptList.value = res?.records.map((item) => ({ + label: item.deptName, + value: item.deptId + })); + + console.log(deptList.value, D_GS_BK_CZJSDWLX); + // tableData.value = res?.records; + }); +}; // 处理选择的人员数据 const handleUserSelected = (userData) => { if (currentSelectedIndex !== null) { diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue index 5f96292..d3f1e23 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue @@ -59,7 +59,9 @@ - + - - - - - - - \ 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 @@ + + + + + + + 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 @@ 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 @@ + + + + + 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" > - - - + + + + + +
+
- + - - - - - \ 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 @@ + + + + + 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 @@ + + + + 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 @@ > + + @@ -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 @@ @@ -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 }}
- 保存 + 保存 关闭
- + + +
- + From 1ecca030f8b99023ae9be22c794b2ea76893dc86 Mon Sep 17 00:00:00 2001 From: jy <1052480693@qq.com> Date: Wed, 4 Jun 2025 18:23:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat=E2=9C=A8:=20=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E9=87=87=E7=BA=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectCrculate/components/addForm.vue | 21 ++++-- .../CollectCrculate/index.vue | 67 ++++++++++++++++--- 2 files changed, 75 insertions(+), 13 deletions(-) diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue index 9cff06b..663b854 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue @@ -195,8 +195,8 @@ const formData = ref([ { label: "线索编号", prop: "xsBh", type: "input" }, { label: "线索类型", prop: "xsLx", type: "select", options: D_GS_XS_LX }, // { label: "线索来源", prop: "xsly", type: "input" }, - { label: "线索开始日期", prop: "xsRqKs", type: "datetime" }, - { label: "线索截止日期", prop: "xsRqJs", type: "datetime" }, + { label: "线索开始日期", prop: "xsRqKs", type: "date" }, + { label: "线索截止日期", prop: "xsRqJs", type: "date" }, { label: "指向地点", prop: "xsZxdd", type: "input" }, { label: "群体名称", prop: "xsQtmc", type: "input" }, { label: "群体类型", prop: "xsQtlx", type: "select", options: D_GS_ZDQT_LB }, @@ -227,14 +227,23 @@ const init = (type, row) => { dialogForm.value = true; title.value = type == "add" ? "新增" : "编辑"; if (row) getDataById(row.id); + if (row.sbRyId) getDataRyId(row.sbRyId); }; // 根据id查询详情 const getDataById = (id) => { - // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => { - // listQuery.value = res; - // }); + qcckGet({}, "/mosty-gsxt/tbGsxtXs/selectVoById/" + id).then((res) => { + listQuery.value = res; + tableDate.bqList = listQuery.value.bqList; + }); }; +// 根据id查询详情 +const getDataRyId = (id) => { + qcckGet({}, "/mosty-gsxt/tbGsxtJwry/" + id).then((res) => { + tableDate.ryList = [res]; + listQuery.value.sbRyId = res.id; + }); +}; // 提交 const submit = () => { elform.value.submit((data) => { @@ -295,6 +304,8 @@ const handleTagSelect = (selectedTags) => { // 关闭 const close = () => { listQuery.value = {}; + tableDate.bqList = []; + tableDate.ryList = []; dialogForm.value = false; loading.value = false; }; diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue index 1ece06b..0f585fb 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue @@ -34,16 +34,35 @@ :controlsWidth="pageData.controlsWidth" @chooseData="chooseData" > + + + + + @@ -60,6 +79,15 @@ + + 是否采纳该条数据 + + @@ -84,7 +112,8 @@ const { 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 dialogVisible = ref(false); +const transferClueId = ref(); const searchConfiger = ref([ { label: "线索名称", @@ -196,20 +225,24 @@ const pageData = reactive({ { 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: "xsLy", showSolt: true }, + { label: "风险等级", prop: "xsFxdj", showSolt: true }, { label: "开始时间", prop: "startTime" }, { label: "结束时间", prop: "endTime" }, { label: "指向地点", prop: "xsZxdd" }, { label: "线索内容", prop: "xsNr" }, - { label: "群体类型", prop: "xsQtlx", options: D_GS_ZDQT_LB }, + { label: "群体类型", prop: "xsQtlx", showSolt: true }, { 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 } + { + label: "处置状态", + prop: "xsZtCz", + showSolt: true + }, + { label: "状态", prop: "xsZt", showSolt: true } ] }); @@ -233,6 +266,24 @@ const onSearch = (val) => { getList(); }; +//采纳 +const transferClue = (row) => { + dialogVisible.value = true; + transferClueId.value = row.id; +}; + +const submitClue = () => { + dialogVisible.value = false; + qcckGet({}, "/mosty-gsxt/tbGsxtXs/adopt/" + transferClueId.value) + .then((res) => { + proxy.$message({ type: "success", message: "采纳成功" }); + getList(); + transferClueId.value = ""; + }) + .catch(() => { + transferClueId.value = ""; + }); +}; const changeNo = (val) => { pageData.pageConfiger.pageNum = val; getList(); From e34b2bbdae67d42b69ebc12085f47bff89df2320 Mon Sep 17 00:00:00 2001 From: jy <1052480693@qq.com> Date: Thu, 5 Jun 2025 09:16:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 16e9cda..61e5644 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,7 +4,7 @@ function resolve(dir) { return path.join(__dirname, dir); } -const serverHost = "http://172.20.19.62:8006" +const serverHost = "http://192.168.31.232:8006" module.exports = { publicPath: "./", outputDir: "ylth", From a5c65af9879fd5a8b4a84fbf184485ff301d53dc Mon Sep 17 00:00:00 2001 From: jy <1052480693@qq.com> Date: Fri, 6 Jun 2025 15:23:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat=E2=9C=A8:=20=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E5=A2=9E=E5=88=A0=E6=9F=A5?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 855 +++++++++++++++++- package.json | 2 + src/components/MyComponents/Sex/index.vue | 13 +- src/components/aboutTable/MyTable.vue | 6 +- .../CollectCrculate/components/addForm.vue | 486 ++++++++-- .../CollectCrculate/index.vue | 26 +- .../TaskScheduling/components/addForm.vue | 326 ++++++- .../TaskScheduling/components/dialogList.vue | 269 ++++++ .../TaskScheduling/components/infoForm.vue | 285 ++++++ .../TaskScheduling/index.vue | 210 ++++- .../myControl/components/ui/controlInfo.vue | 1 - 11 files changed, 2321 insertions(+), 158 deletions(-) create mode 100644 src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/dialogList.vue create mode 100644 src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/infoForm.vue diff --git a/package-lock.json b/package-lock.json index fa1e6db..2cac6a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,8 @@ "@fullcalendar/timegrid": "^5.9.0", "@fullcalendar/vue3": "^5.9.0", "@types/video.js": "^7.3.42", + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^0.26.0", "core-js": "^3.6.5", "echarts": "^5.3.3", @@ -1691,7 +1693,6 @@ "version": "7.18.9", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -2215,6 +2216,11 @@ "prosemirror-view": "~1.18.7" } }, + "node_modules/@transloadit/prettier-bytes": { + "version": "0.0.7", + "resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz", + "integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==" + }, "node_modules/@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -2244,6 +2250,11 @@ "@types/node": "*" } }, + "node_modules/@types/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ==" + }, "node_modules/@types/express": { "version": "4.17.13", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", @@ -2429,6 +2440,56 @@ "node": ">= 8" } }, + "node_modules/@uppy/companion-client": { + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz", + "integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==", + "dependencies": { + "@uppy/utils": "^4.1.2", + "namespace-emitter": "^2.0.1" + } + }, + "node_modules/@uppy/core": { + "version": "2.3.4", + "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz", + "integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==", + "dependencies": { + "@transloadit/prettier-bytes": "0.0.7", + "@uppy/store-default": "^2.1.1", + "@uppy/utils": "^4.1.3", + "lodash.throttle": "^4.1.1", + "mime-match": "^1.0.2", + "namespace-emitter": "^2.0.1", + "nanoid": "^3.1.25", + "preact": "^10.5.13" + } + }, + "node_modules/@uppy/store-default": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz", + "integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==" + }, + "node_modules/@uppy/utils": { + "version": "4.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz", + "integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==", + "dependencies": { + "lodash.throttle": "^4.1.1" + } + }, + "node_modules/@uppy/xhr-upload": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz", + "integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==", + "dependencies": { + "@uppy/companion-client": "^2.2.2", + "@uppy/utils": "^4.1.2", + "nanoid": "^3.1.25" + }, + "peerDependencies": { + "@uppy/core": "^2.3.3" + } + }, "node_modules/@vue/babel-helper-vue-jsx-merge-props": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", @@ -3162,6 +3223,156 @@ } } }, + "node_modules/@wangeditor/basic-modules": { + "version": "1.1.7", + "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz", + "integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==", + "dependencies": { + "is-url": "^1.2.4" + }, + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "lodash.throttle": "^4.1.1", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/code-highlight": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz", + "integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==", + "dependencies": { + "prismjs": "^1.23.0" + }, + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/core": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz", + "integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==", + "dependencies": { + "@types/event-emitter": "^0.3.3", + "event-emitter": "^0.3.5", + "html-void-elements": "^2.0.0", + "i18next": "^20.4.0", + "scroll-into-view-if-needed": "^2.2.28", + "slate-history": "^0.66.0" + }, + "peerDependencies": { + "@uppy/core": "^2.1.1", + "@uppy/xhr-upload": "^2.0.3", + "dom7": "^3.0.0", + "is-hotkey": "^0.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.foreach": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "lodash.toarray": "^4.4.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/editor": { + "version": "5.1.23", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz", + "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==", + "dependencies": { + "@uppy/core": "^2.1.1", + "@uppy/xhr-upload": "^2.0.3", + "@wangeditor/basic-modules": "^1.1.7", + "@wangeditor/code-highlight": "^1.0.3", + "@wangeditor/core": "^1.1.19", + "@wangeditor/list-module": "^1.0.5", + "@wangeditor/table-module": "^1.1.4", + "@wangeditor/upload-image-module": "^1.0.2", + "@wangeditor/video-module": "^1.1.4", + "dom7": "^3.0.0", + "is-hotkey": "^0.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.foreach": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "lodash.toarray": "^4.4.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/editor-for-vue": { + "version": "5.1.12", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", + "peerDependencies": { + "@wangeditor/editor": ">=5.1.0", + "vue": "^3.0.5" + } + }, + "node_modules/@wangeditor/list-module": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz", + "integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==", + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/table-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz", + "integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==", + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/upload-image-module": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz", + "integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==", + "peerDependencies": { + "@uppy/core": "^2.0.3", + "@uppy/xhr-upload": "^2.0.3", + "@wangeditor/basic-modules": "1.x", + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "lodash.foreach": "^4.5.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/video-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz", + "integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==", + "peerDependencies": { + "@uppy/core": "^2.1.4", + "@uppy/xhr-upload": "^2.0.7", + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, "node_modules/@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -5366,6 +5577,11 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, + "node_modules/compute-scroll-into-view": { + "version": "1.0.20", + "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", + "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -6366,6 +6582,18 @@ "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==", "dev": true }, + "node_modules/d": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/d/-/d-1.0.2.tgz", + "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", + "dependencies": { + "es5-ext": "^0.10.64", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -6894,6 +7122,14 @@ } ] }, + "node_modules/dom7": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz", + "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==", + "dependencies": { + "ssr-window": "^3.0.0-alpha.1" + } + }, "node_modules/domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -7300,6 +7536,43 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es5-ext": { + "version": "0.10.64", + "resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", + "hasInstallScript": true, + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.4", + "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz", + "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", + "dependencies": { + "d": "^1.0.2", + "ext": "^1.7.0" + }, + "engines": { + "node": ">=0.12" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -7936,6 +8209,20 @@ "node": ">=8" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/espree": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", @@ -8049,6 +8336,15 @@ "node": ">= 0.6" } }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "node_modules/event-pubsub": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz", @@ -8259,6 +8555,14 @@ } ] }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dependencies": { + "type": "^2.7.2" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -9434,6 +9738,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/html-void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz", + "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/html-webpack-plugin": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", @@ -9710,6 +10023,14 @@ "node": ">=8.12.0" } }, + "node_modules/i18next": { + "version": "20.6.1", + "resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz", + "integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==", + "dependencies": { + "@babel/runtime": "^7.12.0" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -9803,6 +10124,15 @@ "node": ">=0.10.0" } }, + "node_modules/immer": { + "version": "9.0.21", + "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.21.tgz", + "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/immer" + } + }, "node_modules/immutable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", @@ -10461,6 +10791,11 @@ "node": ">=0.10.0" } }, + "node_modules/is-hotkey": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz", + "integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==" + }, "node_modules/is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -10684,6 +11019,11 @@ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", "dev": true }, + "node_modules/is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, "node_modules/is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -11622,11 +11962,20 @@ "lodash-es": "*" } }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, "node_modules/lodash.defaultsdeep": { "version": "4.6.1", @@ -11634,6 +11983,17 @@ "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==", "dev": true }, + "node_modules/lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" + }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead." + }, "node_modules/lodash.kebabcase": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", @@ -11652,6 +12012,16 @@ "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", "dev": true }, + "node_modules/lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==" + }, + "node_modules/lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==" + }, "node_modules/lodash.transform": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz", @@ -11999,6 +12369,14 @@ "node": ">= 0.6" } }, + "node_modules/mime-match": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz", + "integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==", + "dependencies": { + "wildcard": "^1.1.0" + } + }, "node_modules/mime-types": { "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", @@ -12262,6 +12640,11 @@ "thenify-all": "^1.0.0" } }, + "node_modules/namespace-emitter": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz", + "integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==" + }, "node_modules/nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -12316,6 +12699,11 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -14847,6 +15235,14 @@ "renderkid": "^2.0.4" } }, + "node_modules/prismjs": { + "version": "1.30.0", + "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.30.0.tgz", + "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==", + "engines": { + "node": ">=6" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -15251,8 +15647,7 @@ "node_modules/regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "node_modules/regenerator-transform": { "version": "0.15.0", @@ -15896,6 +16291,14 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/scroll-into-view-if-needed": { + "version": "2.2.31", + "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz", + "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==", + "dependencies": { + "compute-scroll-into-view": "^1.0.20" + } + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -16226,6 +16629,43 @@ "node": ">=6" } }, + "node_modules/slate": { + "version": "0.72.8", + "resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz", + "integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==", + "dependencies": { + "immer": "^9.0.6", + "is-plain-object": "^5.0.0", + "tiny-warning": "^1.0.3" + } + }, + "node_modules/slate-history": { + "version": "0.66.0", + "resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz", + "integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==", + "dependencies": { + "is-plain-object": "^5.0.0" + }, + "peerDependencies": { + "slate": ">=0.65.3" + } + }, + "node_modules/slate-history/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/slate/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/slice-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", @@ -16249,6 +16689,14 @@ "node": ">=4" } }, + "node_modules/snabbdom": { + "version": "3.6.2", + "resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.6.2.tgz", + "integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==", + "engines": { + "node": ">=12.17.0" + } + }, "node_modules/snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -16700,6 +17148,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz", + "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==" + }, "node_modules/ssri": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", @@ -17768,6 +18221,11 @@ "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==", "dev": true }, + "node_modules/tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -17954,6 +18412,11 @@ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", "dev": true }, + "node_modules/type": { + "version": "2.7.3", + "resolved": "https://registry.npmmirror.com/type/-/type-2.7.3.tgz", + "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==" + }, "node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -19647,6 +20110,11 @@ "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", "dev": true }, + "node_modules/wildcard": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz", + "integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==" + }, "node_modules/wmf": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz", @@ -21058,7 +21526,6 @@ "version": "7.18.9", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -21477,6 +21944,11 @@ "prosemirror-view": "~1.18.7" } }, + "@transloadit/prettier-bytes": { + "version": "0.0.7", + "resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz", + "integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==" + }, "@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -21506,6 +21978,11 @@ "@types/node": "*" } }, + "@types/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ==" + }, "@types/express": { "version": "4.17.13", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", @@ -21690,6 +22167,53 @@ } } }, + "@uppy/companion-client": { + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz", + "integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==", + "requires": { + "@uppy/utils": "^4.1.2", + "namespace-emitter": "^2.0.1" + } + }, + "@uppy/core": { + "version": "2.3.4", + "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz", + "integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==", + "requires": { + "@transloadit/prettier-bytes": "0.0.7", + "@uppy/store-default": "^2.1.1", + "@uppy/utils": "^4.1.3", + "lodash.throttle": "^4.1.1", + "mime-match": "^1.0.2", + "namespace-emitter": "^2.0.1", + "nanoid": "^3.1.25", + "preact": "^10.5.13" + } + }, + "@uppy/store-default": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz", + "integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==" + }, + "@uppy/utils": { + "version": "4.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz", + "integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==", + "requires": { + "lodash.throttle": "^4.1.1" + } + }, + "@uppy/xhr-upload": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz", + "integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==", + "requires": { + "@uppy/companion-client": "^2.2.2", + "@uppy/utils": "^4.1.2", + "nanoid": "^3.1.25" + } + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", @@ -22264,6 +22788,93 @@ "vue-demi": "*" } }, + "@wangeditor/basic-modules": { + "version": "1.1.7", + "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz", + "integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==", + "requires": { + "is-url": "^1.2.4" + } + }, + "@wangeditor/code-highlight": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz", + "integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==", + "requires": { + "prismjs": "^1.23.0" + } + }, + "@wangeditor/core": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz", + "integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==", + "requires": { + "@types/event-emitter": "^0.3.3", + "event-emitter": "^0.3.5", + "html-void-elements": "^2.0.0", + "i18next": "^20.4.0", + "scroll-into-view-if-needed": "^2.2.28", + "slate-history": "^0.66.0" + } + }, + "@wangeditor/editor": { + "version": "5.1.23", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz", + "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==", + "requires": { + "@uppy/core": "^2.1.1", + "@uppy/xhr-upload": "^2.0.3", + "@wangeditor/basic-modules": "^1.1.7", + "@wangeditor/code-highlight": "^1.0.3", + "@wangeditor/core": "^1.1.19", + "@wangeditor/list-module": "^1.0.5", + "@wangeditor/table-module": "^1.1.4", + "@wangeditor/upload-image-module": "^1.0.2", + "@wangeditor/video-module": "^1.1.4", + "dom7": "^3.0.0", + "is-hotkey": "^0.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.foreach": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "lodash.toarray": "^4.4.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "@wangeditor/editor-for-vue": { + "version": "5.1.12", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", + "requires": {} + }, + "@wangeditor/list-module": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz", + "integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==", + "requires": {} + }, + "@wangeditor/table-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz", + "integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==", + "requires": {} + }, + "@wangeditor/upload-image-module": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz", + "integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==", + "requires": {} + }, + "@wangeditor/video-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz", + "integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==", + "requires": {} + }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -24046,6 +24657,11 @@ } } }, + "compute-scroll-into-view": { + "version": "1.0.20", + "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", + "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -24846,6 +25462,15 @@ "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==", "dev": true }, + "d": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/d/-/d-1.0.2.tgz", + "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", + "requires": { + "es5-ext": "^0.10.64", + "type": "^2.7.2" + } + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -25261,6 +25886,14 @@ } } }, + "dom7": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz", + "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==", + "requires": { + "ssr-window": "^3.0.0-alpha.1" + } + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -25607,6 +26240,36 @@ "is-symbol": "^1.0.2" } }, + "es5-ext": { + "version": "0.10.64", + "resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", + "requires": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", + "next-tick": "^1.1.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "es6-symbol": { + "version": "3.1.4", + "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz", + "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", + "requires": { + "d": "^1.0.2", + "ext": "^1.7.0" + } + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -26085,6 +26748,17 @@ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true }, + "esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "requires": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + } + }, "espree": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", @@ -26167,6 +26841,15 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "requires": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "event-pubsub": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz", @@ -26337,6 +27020,14 @@ } } }, + "ext": { + "version": "1.7.0", + "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "requires": { + "type": "^2.7.2" + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -27256,6 +27947,11 @@ "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", "dev": true }, + "html-void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz", + "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==" + }, "html-webpack-plugin": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", @@ -27472,6 +28168,14 @@ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", "dev": true }, + "i18next": { + "version": "20.6.1", + "resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz", + "integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==", + "requires": { + "@babel/runtime": "^7.12.0" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -27531,6 +28235,11 @@ "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", "dev": true }, + "immer": { + "version": "9.0.21", + "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.21.tgz", + "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==" + }, "immutable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", @@ -28024,6 +28733,11 @@ "is-extglob": "^2.1.1" } }, + "is-hotkey": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz", + "integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==" + }, "is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -28180,6 +28894,11 @@ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", "dev": true }, + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, "is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -28905,11 +29624,20 @@ "integrity": "sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==", "requires": {} }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, "lodash.defaultsdeep": { "version": "4.6.1", @@ -28917,6 +29645,16 @@ "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==", "dev": true }, + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" + }, "lodash.kebabcase": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", @@ -28935,6 +29673,16 @@ "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", "dev": true }, + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==" + }, + "lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==" + }, "lodash.transform": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz", @@ -29212,6 +29960,14 @@ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true }, + "mime-match": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz", + "integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==", + "requires": { + "wildcard": "^1.1.0" + } + }, "mime-types": { "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", @@ -29430,6 +30186,11 @@ "thenify-all": "^1.0.0" } }, + "namespace-emitter": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz", + "integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==" + }, "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -29472,6 +30233,11 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -31494,6 +32260,11 @@ "renderkid": "^2.0.4" } }, + "prismjs": { + "version": "1.30.0", + "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.30.0.tgz", + "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==" + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -31843,8 +32614,7 @@ "regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "regenerator-transform": { "version": "0.15.0", @@ -32327,6 +33097,14 @@ "ajv-keywords": "^3.5.2" } }, + "scroll-into-view-if-needed": { + "version": "2.2.31", + "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz", + "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==", + "requires": { + "compute-scroll-into-view": "^1.0.20" + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -32616,6 +33394,38 @@ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", "dev": true }, + "slate": { + "version": "0.72.8", + "resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz", + "integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==", + "requires": { + "immer": "^9.0.6", + "is-plain-object": "^5.0.0", + "tiny-warning": "^1.0.3" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" + } + } + }, + "slate-history": { + "version": "0.66.0", + "resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz", + "integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==", + "requires": { + "is-plain-object": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" + } + } + }, "slice-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", @@ -32635,6 +33445,11 @@ } } }, + "snabbdom": { + "version": "3.6.2", + "resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.6.2.tgz", + "integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==" + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -33009,6 +33824,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz", + "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==" + }, "ssri": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", @@ -33860,6 +34680,11 @@ "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==", "dev": true }, + "tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -34012,6 +34837,11 @@ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", "dev": true }, + "type": { + "version": "2.7.3", + "resolved": "https://registry.npmmirror.com/type/-/type-2.7.3.tgz", + "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==" + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -35354,6 +36184,11 @@ "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", "dev": true }, + "wildcard": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz", + "integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==" + }, "wmf": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz", diff --git a/package.json b/package.json index 0776ffe..7c32224 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "@fullcalendar/timegrid": "^5.9.0", "@fullcalendar/vue3": "^5.9.0", "@types/video.js": "^7.3.42", + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^0.26.0", "core-js": "^3.6.5", "echarts": "^5.3.3", diff --git a/src/components/MyComponents/Sex/index.vue b/src/components/MyComponents/Sex/index.vue index c7a5614..6a93c23 100644 --- a/src/components/MyComponents/Sex/index.vue +++ b/src/components/MyComponents/Sex/index.vue @@ -1,6 +1,11 @@ + + + + + + + + + + + { + const isReport = typeOf.value === "report"; + const isReportDetails = typeOf.value === "reportDetails"; + const isLeadDetails = typeOf.value === "leadDetails"; + // 判断是否应该全部禁用（reportDetails 或 leadDetails） + const shouldDisableAll = isReportDetails || isLeadDetails; + const baseFields = isReportDetails + ? [] // reportDetails 模式下不显示 baseFields + : [ + { + label: "标签列表", + prop: "bqList", + type: "slot", + width: "80%", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "上报人员", + prop: "sbRyId", + type: "slot", + width: "80%", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "上报人员类型", + prop: "sbRyLx", + type: "select", + options: D_GS_XS_SBRYLX, + disabled: true // 原本就禁用的保持不变 + }, + { + label: "线索标题", + prop: "xsBt", + type: "input", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "线索编号", + prop: "xsBh", + type: "input", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "线索类型", + prop: "xsLx", + type: "select", + options: D_GS_XS_LX, + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "线索开始日期", + prop: "xsRqKs", + type: "date", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "线索截止日期", + prop: "xsRqJs", + type: "date", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "指向地点", + prop: "xsZxdd", + type: "input", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "群体名称", + prop: "xsQtmc", + type: "input", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "群体类型", + prop: "xsQtlx", + type: "select", + options: D_GS_ZDQT_LB, + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "风险等级", + prop: "xsFxdj", + type: "select", + options: D_GS_XS_FXDJ, + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "线索名称", + prop: "xsMc", + type: "input", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + }, + { + label: "线索内容", + prop: "xsNr", + type: "textarea", + width: "100%", + disabled: isReport || shouldDisableAll // report 或详情模式时禁用 + } + ]; + + const conditionalFields = + isReport || isReportDetails + ? [ + { + label: "报送编号", + prop: "bsBh", + type: "input", + disabled: isReportDetails + }, + { + label: "报送日期", + prop: "bsRq", + type: "date", + disabled: isReportDetails + }, + { + label: "是否初报", + prop: "bsSfCb", + type: "radio", + options: D_BZ_SF, + disabled: isReportDetails + }, + { + label: "报送状态", + prop: "bsZt", + type: "select", + options: D_GS_RLQB_BJSB_BSZT, + disabled: isReportDetails + }, + { + label: "上报单位", + prop: "sbDwMc", + type: "input", + disabled: isReportDetails + }, + { + label: "上报单位代码", + prop: "sbDwDm", + type: "slot", + disabled: isReportDetails + }, + { + label: "抄送单位", + prop: "csDwMc", + type: "input", + disabled: isReportDetails + }, + { + label: "抄送单位代码", + prop: "csDwDm", + type: "slot", + disabled: isReportDetails + }, + { + label: "编制单位", + prop: "bzDwMc", + type: "input", + disabled: isReportDetails + }, + { + label: "编制单位代码", + prop: "bzDwDm", + type: "slot", + disabled: isReportDetails + }, + { + label: "承办人", + prop: "cbrXm", + type: "input", + disabled: isReportDetails + }, + { + label: "承办人身份证号", + prop: "cbrSfzh", + type: "input", + disabled: isReportDetails + }, + { + label: "审核人", + prop: "shrXm", + type: "input", + disabled: isReportDetails + }, + { + label: "审核人身份证号", + prop: "shrSfzh", + type: "input", + disabled: isReportDetails + }, + { + label: "签发人", + prop: "qfrXm", + type: "input", + disabled: isReportDetails + }, + { + label: "签发人身份证号", + prop: "qfrSfzh", + type: "input", + disabled: isReportDetails + }, + { + label: "报送内容", + prop: "bsNr", + type: "textarea", + width: "100%", + disabled: isReportDetails + }, + { + label: "汇编报刊", + prop: "hbBk", + type: "slot", + width: "100%", + disabled: isReportDetails + } + ] + : []; + // 最终表单数据 + formData.value = [...baseFields, ...conditionalFields]; +}; +// 编辑器实例，必须用 shallowRef +const editorRef = shallowRef(); +// 内容 HTML +const valueHtml = ref("

hello

"); +const toolbarConfig = {}; +const editorConfig = ref({ placeholder: "请输入内容...", readOnly: false }); - { label: "线索编号", prop: "xsBh", type: "input" }, - { label: "线索类型", prop: "xsLx", type: "select", options: D_GS_XS_LX }, - // { label: "线索来源", prop: "xsly", type: "input" }, - { label: "线索开始日期", prop: "xsRqKs", type: "date" }, - { label: "线索截止日期", prop: "xsRqJs", type: "date" }, - { label: "指向地点", prop: "xsZxdd", type: "input" }, - { label: "群体名称", prop: "xsQtmc", type: "input" }, - { label: "群体类型", prop: "xsQtlx", type: "select", options: D_GS_ZDQT_LB }, - { label: "风险等级", prop: "xsFxdj", type: "select", options: D_GS_XS_FXDJ }, - // { label: "是否初报", prop: "qtmc", type: "input" }, - { label: "线索名称", prop: "xsMc", type: "input" }, - { label: "线索内容", prop: "xsNr", type: "textarea", width: "100%" } - // { label: "报送编号", prop: "bsbh", type: "input" }, - // { label: "上报单位", prop: "sbdw", type: "input" }, - // { label: "抄送单位", prop: "csdw", type: "input" }, - // { label: "承办人", prop: "cbr", type: "input" }, - // { label: "审核人", prop: "shr", type: "input" }, - // { label: "签发人", prop: "qfr", type: "input" } -]); const listQuery = ref({ sbRyLx: "06", xsLy: "02" }); //表单 const loading = ref(false); const elform = ref(); -const title = ref(""); const tagDialog = ref(); - +const TYPE_TO_TITLE = { + add: "新增", + report: "上报", + edit: "编辑", + leadDetails: "详情", // 保持原逻辑 + reportDetails: "上报详情" // 保持原逻辑 +}; const rules = reactive({ xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }] }); const editpeo = ref(); -onMounted(() => {}); +onMounted(() => { + getdepartmentList(); +}); + +// 获取部门列表 +const getdepartmentList = () => { + selectUserDeptPage().then((res) => { + deptList.value = res?.records.map((item) => ({ + label: item.deptName, + value: item.deptId + })); + }); +}; // 初始化数据 const init = (type, row) => { dialogForm.value = true; - title.value = type == "add" ? "新增" : "编辑"; + title.value = TYPE_TO_TITLE[type] || "新增"; // 安全回退 + + typeOf.value = type; + if (typeOf == "reportDetails") { + editorRef.value.disable(); // 禁用 + editorConfig.readOnly = true; // 禁用 + } + if (row) getDataById(row.id); if (row.sbRyId) getDataRyId(row.sbRyId); }; // 根据id查询详情 const getDataById = (id) => { - qcckGet({}, "/mosty-gsxt/tbGsxtXs/selectVoById/" + id).then((res) => { + // 根据 typeOf 的值决定调用哪个接口 + const apiUrl = + typeOf.value === "reportDetails" + ? "/mosty-gsxt/tbGsxtRlqbBjsb/selectVoByXsId/" + id + : "/mosty-gsxt/tbGsxtXs/selectVoById/" + id; + qcckGet({}, apiUrl).then((res) => { listQuery.value = res; tableDate.bqList = listQuery.value.bqList; }); @@ -247,12 +565,60 @@ const getDataRyId = (id) => { // 提交 const submit = () => { elform.value.submit((data) => { + // 定义仅在 report 模式下需要的字段 + const reportFields = [ + "bsBh", + "bsNr", + "bsRq", + "bsSfCb", + "bsZt", + "sbDwDm", + "sbDwMc", + "csDwMc", + "csDwDm", + "bzDwMc", + "bzDwDm", + "cbrXm", + "cbrSfzh", + "shrXm", + "shrSfzh", + "qfrXm", + "qfrSfzh", + "hbBk", + "xsId" // 新增 xsId + ]; + + // 准备最终提交数据 + let submitData; + + if (typeOf.value === "report") { + // report 模式：只提交 reportFields 里的字段 + hbBk（富文本） + submitData = { + ...Object.fromEntries( + Object.entries(data).filter(([key]) => reportFields.includes(key)) + ), + hbBk: valueHtml.value, // 强制覆盖富文本字段 + xsId: listQuery.value.id // 强制添加 xsId + }; + } else { + // 非 report 模式：提交除 reportFields 外的所有字段 + submitData = { + ...Object.fromEntries( + Object.entries(data).filter(([key]) => !reportFields.includes(key)) + ) + }; + } + + // 根据 title 决定请求 URL let url = title.value == "新增" ? "/mosty-gsxt/tbGsxtXs/save" + : title.value == "上报" + ? "/mosty-gsxt/tbGsxtRlqbBjsb/save" : "/mosty-gsxt/tbGsxtXs/update"; - let params = { ...data }; - qcckPost(params, url) + + // 发起请求 + qcckPost(submitData, url) .then((res) => { proxy.$message({ type: "success", message: title.value + "成功" }); emit("getList"); @@ -309,6 +675,22 @@ const close = () => { dialogForm.value = false; loading.value = false; }; +const handleCreated = (editor) => { + editorRef.value = editor; // 记录 editor 实例，重要！ +}; +// 组件销毁时，也及时销毁编辑器 +onBeforeUnmount(() => { + const editor = editorRef.value; + if (editor == null) return; + editor.destroy(); +}); +// 初始化调用一次 +updateFormData(); + +// 监听 title 变化 +watch(title, () => { + updateFormData(); +}); defineExpose({ init }); diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue index 0f585fb..c7e6a9f 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue @@ -54,7 +54,26 @@ 编辑 - 上报 + 线索详情 + 上报详情 + 上报 删除 @@ -172,7 +191,8 @@ const pageData = reactive({ reportUnit: "林芝公安局", reportTime: "2025/05/05", involvedCount: 2, - status: "未处置" + status: "未处置", + xsZt: "01" }, { clueNo: "GBJD01", @@ -220,7 +240,7 @@ const pageData = reactive({ pageSize: 20, pageCurrent: 1 }, - controlsWidth: 220, + controlsWidth: 350, tableColumn: [ { label: "线索编号", prop: "xsBh" }, { label: "线索名称", prop: "xsMc" }, diff --git a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue index 83f4b82..b894f01 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue @@ -3,86 +3,340 @@
人力情报信息搜索任务调度{{ title }}
- 保存 + 保存 关闭
- + + + + + + + + + +
diff --git a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/dialogList.vue b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/dialogList.vue new file mode 100644 index 0000000..f217214 --- /dev/null +++ b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/dialogList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/infoForm.vue b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/infoForm.vue new file mode 100644 index 0000000..efcee29 --- /dev/null +++ b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/infoForm.vue @@ -0,0 +1,285 @@ + + + + + diff --git a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue index d62a48b..76ccf1d 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue @@ -17,7 +17,27 @@
- + + + +
@@ -28,13 +48,40 @@ :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth" - @chooseData="chooseData"> + @chooseData="chooseData" + > + + +
- - + + + + @@ -59,18 +108,64 @@ import Pages from "@/components/aboutTable/Pages.vue"; import Search from "@/components/aboutTable/Search.vue"; import DetailForm from "./components/addForm.vue"; import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js"; +import { selectUserDeptPage } from "@/api/user-manage"; import { reactive, ref, onMounted, getCurrentInstance } from "vue"; +import InfoForm from "./components/infoForm.vue"; const { proxy } = getCurrentInstance(); +const { D_GS_RLQB_RWDD_LY, D_GS_RLQB_RWDD_YZCD, D_GS_RLQB_RWDD_ZT } = + proxy.$dict("D_GS_RLQB_RWDD_LY", "D_GS_RLQB_RWDD_YZCD", "D_GS_RLQB_RWDD_ZT"); //获取字典数据 + const detailDiloag = ref(); +const infoDiloag = ref(); const searchBox = ref(); //搜索框 +const deptList = ref([]); //部门列表 const searchConfiger = ref([ - { label: "所属单位", prop: 'belongUnit', placeholder: "请选择所属单位", showType: "select" }, - { label: "任务标题", prop: 'taskTitle', placeholder: "请输入任务标题", showType: "input" }, - { label: "任务编号", prop: 'taskNo', placeholder: "请输入任务编号", showType: "input" }, - { label: "任务内容", prop: 'taskContent', placeholder: "请输入任务内容", showType: "input" }, - { label: "任务来源", prop: 'taskSource', placeholder: "请选择任务来源", showType: "select" }, - { label: "严重程度", prop: 'severity', placeholder: "请选择严重程度", showType: "select" }, + { + label: "所属单位", + prop: "ssbmdm", + placeholder: "请选择所属单位", + showType: "department" + }, + { + label: "任务标题", + prop: "rwBt", + placeholder: "请输入任务标题", + showType: "input" + }, + { + label: "任务编号", + prop: "rwBh", + placeholder: "请输入任务编号", + showType: "input" + }, + { + label: "任务内容", + prop: "rwNr", + placeholder: "请输入任务内容", + showType: "input" + }, + { + label: "任务来源", + prop: "rwLy", + placeholder: "请选择任务来源", + showType: "select", + options: D_GS_RLQB_RWDD_LY + }, + { + label: "严重程度", + prop: "rwYzcd", + placeholder: "请选择严重程度", + showType: "select", + options: D_GS_RLQB_RWDD_YZCD + }, + { + label: "任务状态", + prop: "rwZt", + placeholder: "请选择任务状态", + showType: "select", + options: D_GS_RLQB_RWDD_ZT + } ]); const pageData = reactive({ @@ -88,68 +183,86 @@ const pageData = reactive({ }, controlsWidth: 220, tableColumn: [ - { label: "任务编号", prop: "taskNo" }, - { label: "任务标题", prop: "taskTitle" }, - { label: "任务内容", prop: "taskContent", width: 200 }, - { label: "任务来源", prop: "taskSource" }, - { label: "严重程度", prop: "severity" }, - { label: "处理情况", prop: "processStatus" }, - { label: "上报时间", prop: "reportTime" }, - { label: "采集状态", prop: "collectStatus" }, - { label: "填充部门", prop: "fillDepartment" }, - { label: "状态", prop: "status" } + { label: "任务编号", prop: "rwBh" }, + { label: "任务标题", prop: "rwBt" }, + { label: "任务内容", prop: "rwNr", width: 200 }, + { label: "任务来源", prop: "rwLy", showSolt: true }, + { label: "严重程度", prop: "rwYzcd", showSolt: true }, + // { label: "处理情况", prop: "processStatus" }, + { label: "上报时间", prop: "sbSj" }, + // { label: "采集状态", prop: "collectStatus" }, + // { label: "填充部门", prop: "fillDepartment" }, + { label: "状态", prop: "rwZt", showSolt: true } ] -}) +}); const queryFrom = ref({}); onMounted(() => { - getList() + getList(); tabHeightFn(); + getdepartmentList(); }); - +// 获取部门列表 +const getdepartmentList = () => { + selectUserDeptPage().then((res) => { + deptList.value = res?.records.map((item) => ({ + label: item.deptName, + value: item.deptId + })); + }); +}; //选择类型 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) =>{ +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/tbGsxtRlqbRwdd/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) => { detailDiloag.value.init(type, row); }; +// 详情 +const infoList = (type, row) => { + infoDiloag.value.init(type, row); +}; // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; + pageData.tableHeight = + window.innerHeight - searchBox.value.offsetHeight - 250; window.onresize = function () { tabHeightFn(); }; @@ -161,4 +274,3 @@ const tabHeightFn = () => { background: rgba(0, 0, 0, 0.5) !important; } - diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue index 4264c0d..5290479 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlInfo.vue @@ -353,7 +353,6 @@ const getFormData = () => { }; // 打开弹窗 const openDialog = (type) => { - console.log(tableDate.yjbqList, tableDate.rybqList); chooseShow.value = true; chooseType.value = type; chooseTitle.value = type == "01" ? "请选择预警标签模型" : "请选择人员标签";