diff --git a/src/api/commit.js b/src/api/commit.js index a229afd..2a791d7 100644 --- a/src/api/commit.js +++ b/src/api/commit.js @@ -84,3 +84,10 @@ export const qbcjSendFqzl = (data) => { data }); }; +export function upImageFileInfo(data) { + return request({ + url: api + '/minio/file/uploadObj', + method: 'post', + data + }) +} diff --git a/src/api/qt.js b/src/api/qt.js new file mode 100644 index 0000000..0eb54b2 --- /dev/null +++ b/src/api/qt.js @@ -0,0 +1,279 @@ +import request from "@/utils/request"; +const api = "/mosty-api/mosty-gsxt"; +// 群体性质新增 +export const tbGsxtZdqtAdd = (data) => { + return request({ + url: api + "/tbGsxtZdqt/save", + method: "POST", + data + }); +} +export const tbGsxtZdqtUpdate = (data) => { + return request({ + url: api + "/tbGsxtZdqt/update", + method: "POST", + data + }); +}; +// 群体查询单条 +export const tbGsxtZdqtSelectVoById = (id) => { + return request({ + url: api + "/tbGsxtZdqt/selectVoById/" + id, + method: "GET", + }); +} + + +// 新增群体性质 +export const tbZdqtQtxzAdd = (data) => { + return request({ + url: api + "/tbZdqtQtxz/add", + method: "POST", + data + }); +} + +// 批量新增群体性质 +export const tbZdqtQtxzBatchAdd = (data) => { + return request({ + url: api + "/tbZdqtQtxz/batchAdd", + method: "POST", + data + }); +} +// 批量删除群体性质 +export const tbZdqtQtxzBatchDelete = (data) => { + return request({ + url: api + "/tbZdqtQtxz/delete", + method: "POST", + data + }); +} +// 群体性质查询列表 +export const tbZdqtQtxzSelectPage = (params) => { + return request({ + url: api + "/tbZdqtQtxz/selectPage", + method: "get", + params + }); +} +// 群体性质更新 +export const tbZdqtQtxzUpdate = (data) => { + return request({ + url: api + "/tbZdqtQtxz/update", + method: "POST", + data + }); +} +// 重点群体管控信息 -(批量新增) +export const tbZdqtGkxxBatchAdd = (data) => { + return request({ + url: api + "/tbZdqtGkxx/batchAdd", + method: "POST", + data + }); +} +// 重点群体管控信息 -(删除) +export const tbZdqtGkxxDelete = (data) => { + return request({ + url: api + "/tbZdqtGkxx/delete", + method: "POST", + data + }); +} +// 重点群体管控信息 -(查询列表) +export const tbZdqtGkxxSelectPage = (params) => { + return request({ + url: api + "/tbZdqtGkxx/selectPage", + method: "get", + params + }); +} +// 重点群体诉求-(新增) +export const tbZdqtSqAdd = (data) => { + return request({ + url: api + "/tbZdqtSq/add", + method: "POST", + data + }); +} +export const tbZdqtSqBatchAdd = (data) => { + return request({ + url: api + "/tbZdqtSq/batchAdd", + method: "POST", + data + }); +} + + + + +// 重点群体诉求 -(删除) +export const tbZdqtSqDelete = (data) => { + return request({ + url: api + "/tbZdqtSq/delete", + method: "POST", + data + }); +} +// 重点群体诉求 -(更新) +export const tbZdqtSqUpdate = (data) => { + return request({ + url: api + "/tbZdqtSq/update", + method: "POST", + data + }); +} +// 重点群体诉求 -(查询列表) +export const tbZdqtSqSelectPage = (params) => { + return request({ + url: api + "/tbZdqtSq/selectPage", + method: "get", + params + }); +} +// 重点群体研判 -(新增) +export const tbZdqtYpAdd = (data) => { + return request({ + url: api + "/tbZdqtYp/add", + method: "POST", + data + }); +} +// 重点群体研判 -(删除) +export const tbZdqtYpDelete = (data) => { + return request({ + url: api + "/tbZdqtYp/delete", + method: "POST", + data + }); +} +// 重点群体研判 -(查询列表) +export const tbZdqtYpSelectPage = (params) => { + return request({ + url: api + "/tbZdqtYp/selectPage", + method: "get", + params + }); +} +// 重点群体研判 -(更新) +export const tbZdqtYpUpdate = (data) => { + return request({ + url: api + "/tbZdqtYp/update", + method: "POST", + data + }); +} +// 重点群体历史集会 -(新增) +export const tbZdqtLsjhAdd = (data) => { + return request({ + url: api + "/tbZdqtLsjh/add", + method: "POST", + data + }); +} +// 重点群体历史集会 -(删除) +export const tbZdqtLsjhDelete = (data) => { + return request({ + url: api + "/tbZdqtLsjh/delete", + method: "POST", + data + }); +} +// 重点群体历史集会 -(查询列表) +export const tbZdqtLsjhSelectPage = (params) => { + return request({ + url: api + "/tbZdqtLsjh/selectPage", + method: "get", + params + }); +} +// 重点群体历史集会 -(更新) +export const tbZdqtLsjhUpdate = (data) => { + return request({ + url: api + "/tbZdqtLsjh/update", + method: "POST", + data + }); +} +// 重点群体工作记录 -(新增) +export const tbZdqtGzjlAdd = (data) => { + return request({ + url: api + "/tbZdqtGzjl/add", + method: "POST", + data + }); +} +// 重点群体工作记录 -(删除) +export const tbZdqtGzjlDelete = (data) => { + return request({ + url: api + "/tbZdqtGzjl/delete", + method: "POST", + data + }); +} +// 重点群体工作记录 -(查询) +export const tbZdqtGzjlSelectPage = (params) => { + return request({ + url: api + "/tbZdqtGzjl/selectPage", + method: "get", + params + }); +} +// 重点群体工作记录 -(修改) +export const tbZdqtGzjlUpdate = (data) => { + return request({ + url: api + "/tbZdqtGzjl/update", + method: "POST", + data + }); +} +// 统计 +// 群体人员管控级别统计(app) +export function zdryGkjbtj(params) { + return request({ + url: api + `/tbGsxtZdqt/zdryGkjbtj`, + method: "get", + params + }) +} +// 群体人员业务类别统计(app) +export function zdryYwlbtj(params) { + return request({ + url: api + `/tbGsxtZdqt/zdryYwlbtj`, + method: "get", + params + }) +} +// 重点人-区域统计 +export function zdryQytj(params) { + return request({ + url: api + `/tbGsxtZdqt/zdrQytj`, + method: "get", + params + }) +} +// 群体人员年龄段统计(app) +export function zdryNldtj(params) { + return request({ + url: api + `/tbGsxtZdqt/zdryNldtj`, + method: "get", + params + }) +} +// 群体人员职业类别统计(app) +export function zdryZclbtj(params) { + return request({ + url: api + `/tbGsxtZdqt/zdryZylbtj`, + method: "get", + params + }) +} +// 群体人员文化程度统计(app) +export function zdryWhcdtj(params) { + return request({ + url: api + `/tbGsxtZdqt/zdryWhcdtj`, + method: "get", + params + }) +} diff --git a/src/components/ChooseList/ChooseUser/index.vue b/src/components/ChooseList/ChooseUser/index.vue index ed612c1..3632f91 100644 --- a/src/components/ChooseList/ChooseUser/index.vue +++ b/src/components/ChooseList/ChooseUser/index.vue @@ -153,11 +153,28 @@ watch(()=>props.modelValue, (val) => { nextTick(() => { getListData(); }); - } + } },{ immediate: true }); + +// 监听 roleIds 变化,实时更新选择状态 +watch(()=>props.roleIds, () => { + if (props.modelValue && tableData.value && tableData.value.length > 0) { + nextTick(() => { + multipleUser(); + }); + } +}, { deep: true }); const closed = () => { + // 清空新选择的内容 + multipleSelectionUser.value = []; + // 取消表格中所有行的选择状态 + if (multipleUserRef.value && tableData.value && tableData.value.length > 0) { + tableData.value.forEach(item => { + multipleUserRef.value.toggleRowSelection(item, false); + }); + } emits("update:modelValue", false); }; const reset = () => { @@ -176,6 +193,7 @@ const keyid = (row) => { // 为用户分配角色 const onComfirm = () => { const userList = multipleSelectionUser.value; + console.log("userList", userList); let list = []; let listId = []; userList.forEach((val) => { @@ -185,9 +203,8 @@ const onComfirm = () => { } }); emits("choosedUsers", list); - let data = { type: props.LeaderType, userList: userList }; - - emits("choosedUsersLeader", data); + // let data = { type: props.LeaderType, userList: userList }; + // emits("choosedUsersLeader", data); closed(); }; /** @@ -210,12 +227,23 @@ const getListData = () => { selectUserDeptPage(params).then((res) => { tableData.value = res?.records; total.value = Number(res.total); - multipleUser(); + // 使用 nextTick 确保表格已经渲染完成后再执行回显 + nextTick(() => { + multipleUser(); + }); }); }; //列表回显 function multipleUser() { + // 先清空之前的选择,确保选择状态的准确性 + if (multipleUserRef.value && tableData.value && tableData.value.length > 0) { + tableData.value.forEach(item => { + multipleUserRef.value.toggleRowSelection(item, false); + }); + } + + // 根据 roleIds 进行回显 tableData.value.forEach((item) => { if (props.roleIds.some((id) => id == item.id)) { multipleUserRef.value.toggleRowSelection(item, true); diff --git a/src/components/Watermark.vue b/src/components/Watermark.vue index 84b681d..a0bd3b2 100644 --- a/src/components/Watermark.vue +++ b/src/components/Watermark.vue @@ -193,6 +193,6 @@ watchEffect(() => { .watermark-container { position: relative; height: 100vh; - color: rgba(136, 135, 135, 0.58); + /* color: rgba(136, 135, 135, 0.58); */ } diff --git a/src/router/index.js b/src/router/index.js index 57b5378..c1899a8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -507,6 +507,15 @@ export const publicRoutes = [ icon: "article" } }, + { + path: "/analysisReport", + name: "AnalysisReport", + component: () => import("@/views/backOfficeSystem/AnalysisReport/index"), + meta: { + title: "研判报告", + icon: "article" + } + }, { path: "/MeetingRoom", name: "MeetingRoom", @@ -617,15 +626,7 @@ export const publicRoutes = [ icon: "article" } }, - // { - // path: "/analysisReport", - // name: "AnalysisReport", - // component: () => import("@/views/backOfficeSystem/AnalysisReport/index"), - // meta: { - // title: "分析报告", - // icon: "article" - // } - // }, + ] } ] diff --git a/src/utils/tools.js b/src/utils/tools.js index 321741f..a18aa4c 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -1,6 +1,15 @@ import ImageCompressor from "image-compressor.js"; + +// 生成10位数的随机数 +export function generateRandom10Digits() { + // 生成范围在1000000000到9999999999之间的随机整数 + const min = 1000000000; + const max = 9999999999; + return Math.floor(Math.random() * (max - min + 1)) + min; +} + // 随机颜色 - 把16进制的颜色换成rgba格式 export function choseRbgb(color, opcity) { if (color) { diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/BarChart.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/BarChart.vue new file mode 100644 index 0000000..debeb9a --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/BarChart.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/LineChart.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/LineChart.vue new file mode 100644 index 0000000..f555290 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/LineChart.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/PieChart.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/PieChart.vue new file mode 100644 index 0000000..ce0b0d1 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/PieChart.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/appeal.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/appeal.vue new file mode 100644 index 0000000..d08413c --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/appeal.vue @@ -0,0 +1,71 @@ + + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/groupStaff.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/groupStaff.vue new file mode 100644 index 0000000..9cef436 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/groupStaff.vue @@ -0,0 +1,232 @@ + + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/history.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/history.vue new file mode 100644 index 0000000..b153938 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/history.vue @@ -0,0 +1,356 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/judgmentRecord.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/judgmentRecord.vue new file mode 100644 index 0000000..38185cf --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/judgmentRecord.vue @@ -0,0 +1,286 @@ + + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/record.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/record.vue new file mode 100644 index 0000000..fb666bc --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/record.vue @@ -0,0 +1,338 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/showXz.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/showXz.vue new file mode 100644 index 0000000..762a781 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/component/showXz.vue @@ -0,0 +1,236 @@ + + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/addForm.vue new file mode 100644 index 0000000..bdcfe43 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/addForm.vue @@ -0,0 +1,327 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/addcjlr.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/addcjlr.vue new file mode 100644 index 0000000..791ec2b --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/addcjlr.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/zxsForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/zxsForm.vue new file mode 100644 index 0000000..68e7114 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components copy/zxsForm.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue index bdcfe43..e02bae5 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue @@ -3,325 +3,417 @@
{{ title }} 重点群体管理
- 保存 + 保存 关闭
-
- - - - -
管理重点人 : 选择
-
- - - - +
+
+
    +
  • 基本信息
  • +
  • 群体信息
  • +
  • 群体标签
  • +
  • 群体性质
  • +
  • 管控信息
  • +
  • 群体特征
  • +
  • 主要诉求
  • +
  • 诉求信息
  • +
  • 重点人员
  • +
  • 研判记录
  • +
  • 历史汇集
  • +
  • 工作记录
  • +
- -
- - - - - - - - - - - +
+
+
+
+
+
+
+
+
+
+
+
+
+
- - - - - - + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index copy.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index copy.vue new file mode 100644 index 0000000..52364b1 --- /dev/null +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index copy.vue @@ -0,0 +1,341 @@ + + + + + + + diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue index 52364b1..98b5ea2 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue @@ -40,41 +40,26 @@
- -