diff --git a/src/assets/images/index/i-fxjg.png b/src/assets/images/index/i-fxjg.png new file mode 100644 index 000000000..09a2b3b72 Binary files /dev/null and b/src/assets/images/index/i-fxjg.png differ diff --git a/src/assets/images/index/i-sqjj.png b/src/assets/images/index/i-sqjj.png new file mode 100644 index 000000000..bf0ce57b7 Binary files /dev/null and b/src/assets/images/index/i-sqjj.png differ diff --git a/src/assets/images/index/i-tx.png b/src/assets/images/index/i-tx.png new file mode 100644 index 000000000..cc46fac73 Binary files /dev/null and b/src/assets/images/index/i-tx.png differ diff --git a/src/assets/images/index/i-xz.png b/src/assets/images/index/i-xz.png new file mode 100644 index 000000000..c2a90ca41 Binary files /dev/null and b/src/assets/images/index/i-xz.png differ diff --git a/src/assets/images/index/i-zntb.png b/src/assets/images/index/i-zntb.png new file mode 100644 index 000000000..e0ab2c536 Binary files /dev/null and b/src/assets/images/index/i-zntb.png differ diff --git a/src/assets/imgs/index/arrow-down.png b/src/assets/imgs/index/arrow-down.png deleted file mode 100644 index 2541b9dce..000000000 Binary files a/src/assets/imgs/index/arrow-down.png and /dev/null differ diff --git a/src/assets/imgs/index/title-icon-sqcx.png b/src/assets/imgs/index/title-icon-sqcx.png deleted file mode 100644 index 2bc4a5847..000000000 Binary files a/src/assets/imgs/index/title-icon-sqcx.png and /dev/null differ diff --git a/src/assets/imgs/index/title-icon-sqzl.png b/src/assets/imgs/index/title-icon-sqzl.png deleted file mode 100644 index 4e0784158..000000000 Binary files a/src/assets/imgs/index/title-icon-sqzl.png and /dev/null differ diff --git a/src/assets/imgs/index/title-icon-zntb.png b/src/assets/imgs/index/title-icon-zntb.png deleted file mode 100644 index a33106f82..000000000 Binary files a/src/assets/imgs/index/title-icon-zntb.png and /dev/null differ diff --git a/src/assets/imgs/index/title-icon-zntx.png b/src/assets/imgs/index/title-icon-zntx.png deleted file mode 100644 index 02bf15188..000000000 Binary files a/src/assets/imgs/index/title-icon-zntx.png and /dev/null differ diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index 190ffee7d..803155284 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -83,6 +83,7 @@ border-radius: 2px; color: #0056d6; text-align: center; + cursor: pointer; &.z-on { color: #ffffff; background: #0056d6; @@ -156,7 +157,7 @@ } .btn { - margin: 8px 9px 8px auto; + margin: 7px 9px 0 auto; line-height: 32px; width: 66px; height: 32px; diff --git a/src/js/store/index.js b/src/js/store/index.js index 7ebb31e94..623524e6d 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -26,14 +26,8 @@ export default new Vuex.Store({ // 内容, 是否需要刷新 contentIsNeedRefresh: false, // 内容, 标签页(默认添加首页) - contentTabs: [ - { - ...window.SITE_CONFIG["contentTabDefault"], - name: "indexWork", - title: "首页", - }, - ], - contentTabsActiveName: "indexWork", + contentTabs: [], + contentTabsActiveName: "", mainShuju: { menuList: [], diff --git a/src/router/index.js b/src/router/index.js index a604ef203..1241c89a5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -89,10 +89,11 @@ export const moduleRoutes = { component: () => import("@/views/main"), name: "main", redirect: { - path: "/main/shequ-index", + path: "/main/home", }, meta: { title: "主入口布局", + isTab: false, }, children: [ { @@ -100,7 +101,7 @@ export const moduleRoutes = { component: () => import("@/views/modules/home"), name: "home", meta: { - title: "主页", + title: "首页", isTab: true, }, }, @@ -123,7 +124,6 @@ export const moduleRoutes = { isTab: false, }, }, - { path: "home-notice", props: true, @@ -140,6 +140,16 @@ export const moduleRoutes = { ], }, }, + { + path: "shequ-chaxun", + props: true, + name: "shequ-chaxun", + component: () => import("@/views/modules/shequ/chaxun"), + meta: { + isTab: true, + title: "社区查询", + }, + }, ], }; diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 400c2232e..59c92680d 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -15,8 +15,8 @@ 查居民
查房屋
@@ -59,7 +59,7 @@
- + 社区简介

@@ -67,7 +67,7 @@

- + 分析结果
@@ -84,7 +84,7 @@ :key="item.code" v-for="(item, index) in warningChart.list" > -
{{ ("0" + (index + 1)).substr(0, 2) }}.
+
{{ ("0" + (index + 1)).substr(-2) }}.
{{ item.name }}
{{ item.count }}人
@@ -151,76 +151,64 @@
- + 智能填报
更多>
- +
《80-90周岁高龄老人生活补助申请表》
- + 填写
- + 下载
- +
《80-90周岁高龄老人生活补助申请表》
- + 填写
- + 下载
- +
《80-90周岁高龄老人生活补助申请表》
- + 填写
- + 下载
- +
《80-90周岁高龄老人生活补助申请表》
- + 填写
- + 下载
@@ -293,25 +281,22 @@ export default { }); }, + toSearchPage(type, keyword) { + this.$router.push({ + path: "/main/shequ-chaxun", + query: { + type, + keyword, + }, + }); + }, + handleClickSearchBtn() { const { searchData: { type, keyword }, } = this; if (!keyword) return this.$message.error("请输入搜索条件"); - if (type == "jumin") { - this.searchJumin.pageNo = 1; - this.searchJumin.total = 0; - this.getSearchJumin(); - } else if (type == "fangwu") { - this.searchFangwu.pageNo = 1; - this.searchFangwu.total = 0; - this.getSearchFangwu(); - } else if (type == "xuqiu") { - this.searchXuqiu.pageNo = 1; - this.searchXuqiu.total = 0; - this.getSearchXuqiu(); - } - this.searchStatus = "ing"; + this.toSearchPage(type, keyword); }, async getApiData() { diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue index e25f3f006..61cfbf38a 100644 --- a/src/views/modules/home/notice.vue +++ b/src/views/modules/home/notice.vue @@ -1,32 +1,51 @@