From b0c880d8359352fb58ecdfb3c8b250913699029e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 2 Jan 2025 14:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=8F=9C=E5=8D=95=EF=BC=9A?=
=?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=A1=AB=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 80 +--
src/views/main-navbar.vue | 22 +-
src/views/main-sidebar.vue | 4 +-
src/views/modules/base/smartExcel/filling.vue | 295 ++++++++++
src/views/modules/base/smartExcel/index.vue | 534 +++++++++---------
5 files changed, 613 insertions(+), 322 deletions(-)
create mode 100644 src/views/modules/base/smartExcel/filling.vue
diff --git a/src/router/index.js b/src/router/index.js
index 01c2837a2..6af320693 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -128,7 +128,7 @@ export const moduleRoutes = {
title: "社区查询",
},
},
- {
+ {
path: "smartImport",
props: true,
name: "smartImport",
@@ -163,41 +163,41 @@ export const moduleRoutes = {
props: true,
name: "loudong-huaxiang",
component: () => import("@/views/modules/portrayal/loudong/index"),
- meta: {
- isTab: true,
- title: "",
- },
+ meta: {
+ isTab: true,
+ title: "",
},
- {
- path: "add-resi",
- props: true,
- name: "add-resi",
- component: () => import("@/views/components/addResi"),
- meta: {
- isTab: true,
- title: "新增居民",
- },
- },
- {
- path: "suggestionList",
- props: true,
- name: "suggestionList",
- component: () => import("@/views/modules/shequzhili/solicitationSpecial/cpts/suggestionList"),
- meta: {
- isTab: true,
- title: "专题征集列表",
- },
- },
- {
- path: "edit-resi",
- props: true,
- name: "edit-resi",
- component: () => import("@/views/components/editResi"),
- meta: {
- isTab: true,
- title: "编辑居民",
- },
- }
+ },
+ {
+ path: "add-resi",
+ props: true,
+ name: "add-resi",
+ component: () => import("@/views/components/addResi"),
+ meta: {
+ isTab: true,
+ title: "新增居民",
+ },
+ },
+ {
+ path: "suggestionList",
+ props: true,
+ name: "suggestionList",
+ component: () => import("@/views/modules/shequzhili/solicitationSpecial/cpts/suggestionList"),
+ meta: {
+ isTab: true,
+ title: "专题征集列表",
+ },
+ },
+ {
+ path: "edit-resi",
+ props: true,
+ name: "edit-resi",
+ component: () => import("@/views/components/editResi"),
+ meta: {
+ isTab: true,
+ title: "编辑居民",
+ },
+ }
],
};
// pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
@@ -968,13 +968,14 @@ router.beforeEach((to, from, next) => {
// 已添加或者当前路由为页面路由, 可直接访问
let toUrl = to.meta.iframeURL
console.log("=====", toUrl)
+
if (toUrl && toUrl.indexOf("ticket=") != -1) {
// 此处请求后端,获取一个ticket票据
http.get("/auth/sso/getTicket")
- .then(({data: res}) => {
- let ticket = res.data
- window.open(toUrl + ticket)
- })
+ .then(({ data: res }) => {
+ let ticket = res.data
+ window.open(toUrl + ticket)
+ })
return null;
}
if (to.name === "caiji") {
@@ -1053,7 +1054,6 @@ router.beforeEach((to, from, next) => {
.map((item) => cookApiDataItem2(item))
.map((item) => cookApiDataItem(item));
fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);
- // next({ ...to, replace: true })
next({
...to,
replace: true,
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 0a5c3ccbd..e0a2bd8c0 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -21,24 +21,24 @@
- 智能分析
+ 
+ 社区一张表