diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss index d6f0a6d1a..609b713a9 100644 --- a/src/assets/scss/modules/search.scss +++ b/src/assets/scss/modules/search.scss @@ -143,8 +143,7 @@ width: 78px; height: 78px; - &::before { - content: ""; + .icon-wrap { position: absolute; z-index: 0; display: block; @@ -170,8 +169,8 @@ position: relative; display: block; margin: auto; - width: 78px; - height: 78px; + width: 64px; + height: 64px; object-fit: cover; } } diff --git a/src/router/index.js b/src/router/index.js index 623ba827a..fb66b869c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -123,7 +123,7 @@ function cookApiDataItem(item) { } let allChildrenUrl = n2one(item.children) - .filter((i) => i.url != "") + .filter((i) => i.url != "" && i.showFlag == 1) .map((i) => i.url); console.log("))))))))))))", allChildrenUrl); @@ -132,6 +132,10 @@ function cookApiDataItem(item) { item.url = allChildrenUrl[0]; } } + // item.children.forEach((item) => { + // item.color = "#f00"; + // return item; + // }); return item; } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index febbcd0ca..075118bfe 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -22,10 +22,7 @@ @click="$store.state.sidebarFold = !$store.state.sidebarFold" >
{{ menu.name }}
- + {{ { jumin: "居民", fangwu: "房屋", xuqiu: "需求" }[ @@ -28,240 +30,297 @@ - - -
+ + +
-
搜索
+
搜索
-
+ " + >
- - - + + + " + > - +
- +
-
+ " + >
- - - + + + - + - + - + - + - + - + - + - + - + - + - +
- +
-
+ " + >
- - - - + + + + - +
- +
-
+ " + >
-
+
常用功能
-
+
- +
+ +

{{ item.menuName }}

-
+
- +

添加应用

@@ -270,22 +329,21 @@
-
+
人员预警
-
-
通知
+
+
通知
- + {{ item.noticeContent }} @@ -295,57 +353,65 @@
- +
- - - + + + - + - - + - + - + + +
- +
@@ -355,29 +421,45 @@
-
+ " + >
-
+
常用功能
-
+
- +
+ +

{{ item.menuName }}

@@ -387,27 +469,43 @@
所有功能
-
+
{{ menu.name }}
-
-
+
+ }" + >
- +
+ +

{{ item.name }}

@@ -416,11 +514,10 @@
- 返回 - 确认 + 返回 + 确认
@@ -433,35 +530,47 @@ 人员预警
- +
- + - - + + - - + +
@@ -487,7 +596,7 @@ export default { scrollNotice, }, - data () { + data() { return { searchStatus: "ini", //ing over searchData: { @@ -684,7 +793,7 @@ export default { }; }, computed: { - selectedFuncList () { + selectedFuncList() { const { selectedFuncIdList, $store: { @@ -716,7 +825,7 @@ export default { }); return selectedFuncIdList.map((id) => obj[id]); }, - maxTableHeight () { + maxTableHeight() { // return this.clientHeight - 450; return 420; }, @@ -729,7 +838,7 @@ export default { } }, }, - mounted () { + mounted() { this.getApiData(); console.log( "dynamicMenuRoutes----------------------------", @@ -737,18 +846,18 @@ export default { ); }, methods: { - changeCategoryCode ({ code }) { + changeCategoryCode({ code }) { this.currentCategoryCode = code || ""; this.warningTb.pageNo = 1; this.getWarningTb(); }, - computedWidth (label) { + computedWidth(label) { const wd = 20 * label.length; return wd > 80 ? wd : 80; }, - handleFilterSpan (row, item) { + handleFilterSpan(row, item) { let _val = ""; if (item.options && item.options.length > 0) { item.options.forEach((n) => { @@ -758,7 +867,7 @@ export default { return _val || row[item.columnName]; }, - handleClickSearchBtn () { + handleClickSearchBtn() { const { searchData: { type, keyword }, } = this; @@ -779,18 +888,18 @@ export default { this.searchStatus = "ing"; }, - handleSizeChangeWarning (val) { + handleSizeChangeWarning(val) { console.log(`每页 ${val} 条`); this.warningTb.pageSize = val; window.localStorage.setItem("pageSize", val); this.getWarningTb(); }, - handleCurrentChangeWarning (val) { + handleCurrentChangeWarning(val) { console.log(`当前页: ${val}`); this.warningTb.pageNo = val; this.getWarningTb(); }, - async handleWatchWarning (rowIndex) { + async handleWatchWarning(rowIndex) { let item = this.warningTb.list[rowIndex]; this.currentPepeleId = item.userId; this.currentPepeleGridName = item.gridName; @@ -798,18 +907,18 @@ export default { this.showedPeopleMoreInfo = true; }, - handleSizeChangeSearchJumin (val) { + handleSizeChangeSearchJumin(val) { console.log(`每页 ${val} 条`); this.searchJumin.pageSize = val; window.localStorage.setItem("pageSize", val); this.getSearchJumin(); }, - handleCurrentChangeSearchJumin (val) { + handleCurrentChangeSearchJumin(val) { console.log(`当前页: ${val}`); this.searchJumin.pageNo = val; this.getSearchJumin(); }, - async handleWatchSearchJumin (rowIndex) { + async handleWatchSearchJumin(rowIndex) { let item = this.searchJumin.list[rowIndex]; this.currentPepeleId = item.icResiUserId; this.currentPepeleGridName = item.GRID_ID; @@ -817,51 +926,55 @@ export default { this.showedPeopleMoreInfo = true; }, - handleSizeChangeSearchFangwu (val) { + handleSizeChangeSearchFangwu(val) { console.log(`每页 ${val} 条`); this.searchFangwu.pageSize = val; window.localStorage.setItem("pageSize", val); this.getSearchFangwu(); }, - handleCurrentChangeSearchFangwu (val) { + handleCurrentChangeSearchFangwu(val) { console.log(`当前页: ${val}`); this.searchFangwu.pageNo = val; this.getSearchFangwu(); }, - async handleWatchSearchFangwu (row) { + async handleWatchSearchFangwu(row) { this.showedFangwuInfo = true; await nextTick(); this.$refs.fangwu_info.initForm("detail", row); }, - handleSizeChangeSearchXuqiu (val) { + handleSizeChangeSearchXuqiu(val) { console.log(`每页 ${val} 条`); this.searchXuqiu.pageSize = val; window.localStorage.setItem("pageSize", val); this.getSearchXuqiu(); }, - handleCurrentChangeSearchXuqiu (val) { + handleCurrentChangeSearchXuqiu(val) { console.log(`当前页: ${val}`); this.searchXuqiu.pageNo = val; this.getSearchXuqiu(); }, - async handleWatchSearchXuqiu (row) { + async handleWatchSearchXuqiu(row) { this.showedXuqiuInfo = true; await nextTick(); this.$refs.xuqiu_info.initForm("detail", row); }, - handleClickFunc (menu) { + handleClickFunc(menu) { const menuId = menu.menuId; var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter( (item) => item.meta.menuId === menuId )[0]; if (route) { - this.$router.push({ name: route.name }); + if (route.meta.iframeURL.endsWith("【跳转新页面】")) { + window.open(route.meta.iframeURL.slice(0, -7)); + } else { + this.$router.push({ name: route.name }); + } } }, - getApiData () { + getApiData() { this.getFuncList(); this.getWarningList(); this.getWarningTb(); @@ -869,7 +982,7 @@ export default { this.getNoticeList(); }, - selectFuncItem (id) { + selectFuncItem(id) { let index = this.selectedFuncIdList.indexOf(id); if (index === -1) { this.selectedFuncIdList.push(id); @@ -878,7 +991,7 @@ export default { } }, - toNoticeInfo (item) { + toNoticeInfo(item) { console.log(item); this.currentPage = "yujing"; if (item) { @@ -890,7 +1003,7 @@ export default { } }, - async getNoticeList () { + async getNoticeList() { const url = "/epmetuser/statsresiwarn/queryuserwarnnotice"; const { data, code, msg } = await requestPost(url, { agencyId: this.$store.state.user.agencyId, @@ -902,7 +1015,7 @@ export default { } }, - async getSearchJuminHeader () { + async getSearchJuminHeader() { const url = "/oper/customize/icform/tableheaders"; const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info", @@ -915,7 +1028,7 @@ export default { } }, - async getSearchXuqiu () { + async getSearchXuqiu() { const url = "/heart/userdemand/search"; const { searchData: { keyword }, @@ -931,14 +1044,14 @@ export default { this.searchXuqiu.total = data.total || 0; this.searchXuqiu.list = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, - async getSearchJumin () { + async getSearchJumin() { const url = "/epmetuser/icresiuser/search"; const { searchData: { keyword }, @@ -954,14 +1067,14 @@ export default { this.searchJumin.total = data.total || 0; this.searchJumin.list = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, - async getSearchFangwu () { + async getSearchFangwu() { const url = "/gov/org/house/search"; const { searchData: { keyword }, @@ -977,14 +1090,14 @@ export default { this.searchFangwu.total = data.total || 0; this.searchFangwu.list = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, - async getWarningTb () { + async getWarningTb() { const url = "/epmetuser/icresiuser/personwarn/rightlist"; const { warningTb: { pageSize, pageNo }, @@ -999,16 +1112,16 @@ export default { this.warningTb.total = data.total || 0; this.warningTb.list = data.list ? data.list.map((item) => { - item.typeName = item.type.join("、"); - return item; - }) + item.typeName = item.type.join("、"); + return item; + }) : []; } else { } }, //加载组织数据 - async getWarningList () { + async getWarningList() { const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie"; let params = {}; @@ -1031,7 +1144,7 @@ export default { }, //加载组织数据 - async getFuncList () { + async getFuncList() { const url = "/gov/access/icoftenusefunction/oftenusefunctionlist"; let params = {}; @@ -1046,7 +1159,7 @@ export default { }, //加载组织数据 - async editFuncList () { + async editFuncList() { const url = "/gov/access/icoftenusefunction/addoftenusefunction"; const { selectedFuncIdList } = this; let params = selectedFuncIdList.map((menuId, sort) => {