From 2f90d0585790a3c780e1c3c8300fb08bebd97dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 24 Oct 2024 18:37:46 +0800 Subject: [PATCH] =?UTF-8?q?pc=E9=A6=96=E9=A1=B5=E4=B8=9A=E5=8A=A1=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/facilities/index.vue | 524 +++++++++--- src/views/modules/base/vehicleManger/add.vue | 616 ++++++++++++++ .../modules/base/vehicleManger/index.vue | 776 ++++++++++++++++++ src/views/modules/base/vehicleManger/info.vue | 590 +++++++++++++ src/views/modules/home/index.vue | 484 ++++++++++- src/views/modules/shequ/chaxun.vue | 156 +++- src/views/modules/shequ/index.vue | 1 - .../volunteer/pointsRedemption/index.vue | 2 +- 8 files changed, 3016 insertions(+), 133 deletions(-) create mode 100644 src/views/modules/base/vehicleManger/add.vue create mode 100644 src/views/modules/base/vehicleManger/index.vue create mode 100644 src/views/modules/base/vehicleManger/info.vue diff --git a/src/views/modules/base/facilities/index.vue b/src/views/modules/base/facilities/index.vue index adbc84015..f427e915b 100644 --- a/src/views/modules/base/facilities/index.vue +++ b/src/views/modules/base/facilities/index.vue @@ -1,130 +1,134 @@ + + + + \ No newline at end of file diff --git a/src/views/modules/base/vehicleManger/index.vue b/src/views/modules/base/vehicleManger/index.vue new file mode 100644 index 000000000..d92ecc732 --- /dev/null +++ b/src/views/modules/base/vehicleManger/index.vue @@ -0,0 +1,776 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/base/vehicleManger/info.vue b/src/views/modules/base/vehicleManger/info.vue new file mode 100644 index 000000000..c03f0b089 --- /dev/null +++ b/src/views/modules/base/vehicleManger/info.vue @@ -0,0 +1,590 @@ + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index d0b652438..0f4e38089 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -1,6 +1,6 @@ @@ -203,6 +391,16 @@ export default { data() { return { + selectedFuncIdList: [], + showedFuncPanel:false, + funcList: [ + // { + // url: '', + // menuId: '', + // menuName: '', + // icon: '', + // } + ], yesterdayDate:null, searchStatus: "ini", //ing over searchData: { @@ -251,9 +449,51 @@ export default { agencyLevel: '', yData: [], myChartStyle: { float: "left", width: "140%", height: "100%" }, + activeIndex: 0, + activeLevel: "1", + warningTb: { + pageNo: 1, + pageSize: window.localStorage.getItem("pageSize") || 20, + total: 1, + list: [], + }, + } }, - computed: {}, + computed: { + selectedFuncList() { + const { + selectedFuncIdList, + $store: { + state: { sidebarMenuList }, + }, + } = this; + let obj = {}; + sidebarMenuList.forEach((menu) => { + if (selectedFuncIdList.indexOf(menu.id) !== -1) { + obj[menu.id] = { + menuId: menu.id, + menuName: menu.name, + icon: menu.icon, + url: menu.url, + }; + } + if (menu.children && menu.children.length > 0) { + menu.children.forEach((item) => { + if (selectedFuncIdList.indexOf(item.id) !== -1) { + obj[item.id] = { + menuId: item.id, + menuName: item.name, + icon: item.icon, + url: item.url, + }; + } + }); + } + }); + return selectedFuncIdList.map((id) => obj[id]); + }, + }, watch: { "searchData.searchKey": function (val) { if (val == "") { @@ -274,6 +514,10 @@ export default { created() { }, mounted() { + this.getWarningTb() + this.getBuildingwarnlist() + this.getFuncList() + this.getUserwarnlist() // this.ehso(); //图形 @@ -283,6 +527,7 @@ export default { this.initChart() this.initEcharts(); }) + this.getYesterdayDate() // this.agencyLevel = localStorage.getItem("level", data.level); console.log( @@ -291,6 +536,137 @@ export default { ); }, methods: { + //预警人数列表 + async getWarningTb() { + const url = "/epmetuser/icresiuser/personwarn/rightlist"; + const { + warningTb: { pageSize, pageNo }, + } = this; + const { data, code, msg } = await requestPost(url, { + pageSize, + pageNo, + categoryCode: this.currentCategoryCode, + }); + if (code === 0) { + + this.warningTb.total = data.total || 0; + this.warningTb.list = data.list + ? data.list.map((item) => { + item.typeName = item.type.join("、"); + return item; + }) + : []; + } else { + } + }, + //具体人员列表 + async getUserwarnlist() { + const { activeIndex, activeLevel, warningList } = this; + const reqItem = warningList[activeIndex]; + let tableData = []; + const url = "/epmetuser/statsresiwarn/userwarnlist"; + let params = { + configId: reqItem.configId, + buildingIdList: reqItem["buildingIdList" + activeLevel], + pageNo: 1, + pageSize: 20, + }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + data.list.forEach((item, index) => { + tableData.push([ + index + 1, + item.gridName, + item.neighborhoodName, + item.buildingName, + item.count, + { + type: "btn", + name: "查看人员", + buildingId: item.buildingId, + configId: item.configId, + gridName: item.gridName, + }, + ]); + }); + this.tableData = tableData; + this.total = data.total; + } else { + } + }, + //人员预警 + // 【人员预警】 楼宇预警数量列表 + async getBuildingwarnlist() { + const url = "/epmetuser/statsresiwarn/buildingwarnlist"; + let params = { + agencyId: this.$store.state.user.agencyId, + }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.warningList = data; + this.visibleLoading = false; + this.getUserwarnlist(); + } else { + } + }, + //选中常用功能 + selectFuncItem(id) { + let index = this.selectedFuncIdList.indexOf(id); + if (index === -1) { + this.selectedFuncIdList.push(id); + } else { + this.selectedFuncIdList.splice(index, 1); + } + }, + + //加载组织数据 + async getFuncList() { + const url = "/gov/access/icoftenusefunction/oftenusefunctionlist"; + let params = {}; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.funcList = data || []; + this.selectedFuncIdList = this.funcList.map((item) => item.menuId); + } else { + this.$message.error(msg); + } + }, + //加载组织数据 + async editFuncList() { + const url = "/gov/access/icoftenusefunction/addoftenusefunction"; + const { selectedFuncIdList } = this; + let params = selectedFuncIdList.map((menuId, sort) => { + return { menuId, sort }; + }); + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.$message.success("修改成功"); + this.showedFuncPanel = false; + this.getFuncList(); + } else { + this.$message.error(msg); + } + }, + //常用功能添加 + handleClickFunc(menu) { + console.log(menu,"dskjlfdsjkljkfs"); + const menuId = menu.menuId; + var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter( + (item) => item.meta.menuId === menuId + )[0]; + if (route) { + if (route.meta.iframeURL.endsWith("【跳转新页面】")) { + window.open(route.meta.iframeURL.slice(0, -7)); + } else { + this.$router.push({ name: route.name }); + } + } + }, + // 获取昨天时间 getYesterdayDate() { const now = new Date(); @@ -780,8 +1156,110 @@ export default { + diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue index 73b569c8c..089e83b96 100644 --- a/src/views/modules/shequ/chaxun.vue +++ b/src/views/modules/shequ/chaxun.vue @@ -23,7 +23,7 @@ :class="searchData.type == 'xuqiu' ? 'z-on' : ''" @click="handelClickTab('xuqiu')" > - 查诉求 + 查需求 -
@@ -177,6 +177,8 @@
+ +
-
@@ -324,6 +326,7 @@
+ @@ -399,6 +402,116 @@ export default { data() { return { + //需求查询 + searchXuqiu: { + header: [ + { + label: "所属组织", + align: "center", + columnName: "statusName", + width: "120", + options: [ + { + label: "待处理", + value: "pending", + }, + { + label: "已取消", + value: "canceled", + }, + { + label: "已派单", + value: "assigned", + }, + { + label: "已接单", + value: "have_order", + }, + { + label: "已完成", + value: "finished", + }, + ], + }, + { + label: "事件来源", + columnName: "gridName", + align: "center", + width: "", + options: [], + }, + { + label: "事件类别", + columnName: "categoryName", + align: "center", + width: "", + options: [], + }, + { + label: "事件描述", + columnName: "content", + align: "center", + width: "", + options: [], + }, + { + label: "上报人", + columnName: "reportTypeName", + align: "center", + width: "120", + options: [ + { + label: "社区帮办", + value: "community", + }, + { + label: "楼长帮办", + value: "building_caption", + }, + { + label: "党员帮办", + value: "party", + }, + { + label: "自身上报", + value: "self_help", + }, + ], + }, + { + label: "上报人电话", + columnName: "reportUserName", + align: "center", + width: "120", + options: [], + }, + { + label: "催办状态", + columnName: "reportTime", + align: "center", + width: "180", + options: [], + }, + { + label: "办理状态", + columnName: "demandUserName", + align: "center", + width: "80", + options: [], + }, + { + label: "办结时限", + columnName: "serviceShowName", + align: "center", + width: "120", + options: [], + }, + ], + pageNo: 1, + pageSize: window.localStorage.getItem("pageSize") || 20, + total: 1, + list: [], + }, btnLoading:false, searchStatus: "ini", //ing over searchData: { @@ -547,6 +660,30 @@ export default { this.getHotHouseSearch() }, methods: { + //需求列表 + async getSearchXuqiu() { + const url = "/governance/userdemand/search"; + const { + searchData: { keyword }, + searchXuqiu: { pageSize, pageNo }, + } = this; + console.log(this.searchData,"sdklfklsjklsjdfkljd"); + + const { data, code, msg } = await requestPost(url, { + keyword, + pageSize, + pageNo, + }); + if (code === 0) { + this.searchXuqiu.total = data.total || 0; + this.searchXuqiu.list = data.list + ? data.list.map((item) => { + return item; + }) + : []; + } else { + } + }, handleDel(row) { console.log("row1", row); this.$http @@ -689,13 +826,11 @@ export default { const { searchData: { type, searchKey }, } = this; - console.log(type, searchKey,"dslkdsfklsz"); - + console.log( type, searchKey,"dsjknfkjsjf"); localStorage.setItem("homeSearchType", type); localStorage.setItem("homeSearchKey", searchKey); if (!searchKey) return; if (!this.smatrFlag) this.childrenRulesData = []; - if (type == "jumin") { this.searchJumin.pageNo = 1; this.searchJumin.total = 0; @@ -705,6 +840,11 @@ export default { this.searchFangwu.total = 0; this.getSearchFangwu(); } + else if (type == "xuqiu") { + this.searchFangwu.pageNo = 1; + this.searchFangwu.total = 0; + this.getSearchXuqiu(); + } // if (this.smatrFlag && this.childrenRulesData.length === 0) { // this.getRulesList(); // } diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 539ddb4d6..0064c5419 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -29,7 +29,6 @@ 需求 -
-