diff --git a/.env.development b/.env.development index b23cea2c..de4725c1 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api +# VUE_APP_API_SERVER = http://192.168.1.140/api #家中开发连级的后端服务 # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api diff --git a/package.json b/package.json index 360bbcb1..3deef137 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "js-cookie": "^2.2.0", "jsencrypt": "^3.0.3", "lodash": "^4.17.15", + "mint-ui": "^2.2.13", "node-sass": "^4.12.0", "ol": "^6.9.0", "portfinder": "^1.0.21", diff --git a/public/index.html b/public/index.html index 7761c737..6581742c 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,8 @@ + + diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss new file mode 100644 index 00000000..8526f6e8 --- /dev/null +++ b/src/assets/scss/pages/caiji.scss @@ -0,0 +1,45 @@ +.bg-app { + background-color: rgba(218, 218, 218, 0.89); + height: 100%; + width: 100vw; + padding: 20px; + + .title { + text-align: center; + font-size: 20px; + } + + .main { + padding-top: 20px; + // font-size: 40px; + + .content { + border-radius: 5px; + + background-color: rgba(255, 255, 255, 0.787); + + .member_title { + padding: 10px; + font-size: 14px; + } + } + .content1 { + margin-top: 20px; + } + + .line { + border: 1px solid #e4e4e48e; + } + } + + .div-btn { + margin-top: 30px; + padding-bottom: 20px; + display: flex; + justify-content: center; + } +} + +.picker_content { + color: rgb(59, 59, 59); +} diff --git a/src/main.js b/src/main.js index 05367aa0..296c9448 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,8 @@ import Vue from "vue"; import Element from "element-ui"; +import Mint from 'mint-ui'; +import 'mint-ui/lib/style.css'; + import App from "@/App"; import i18n from "@/i18n"; @@ -60,6 +63,7 @@ Vue.use(renProcessStart); Vue.use(renProcessRunning); Vue.use(renProcessDetail); Vue.use(Element); +Vue.use(Mint); Vue.use(Element, { size: "default", diff --git a/src/router/index.js b/src/router/index.js index 932df895..c8eb853e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,6 +44,15 @@ export const pageRoutes = [ name: "index", }, }, + { + path: "/caiji/:id", + props: true, + name: "caiji", + component: () => import("@/views/pages/caiji"), + meta: { + title: "居民信息填报", + }, + }, ]; // 模块路由(基于主入口布局页面) @@ -402,8 +411,21 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { eval(s2) ); // URL支持{{ window.xxx }}占位符变量 if (isURL(URL)) { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["meta"]["iframeURL"] = URL; + if (menuList[i].children && menuList[i].children.length >= 1) { + let item = menuList[i].children.find( + (subMenu) => subMenu.url == menuList[i].url + ); + if (item) { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["redirect"] = `i-${item.id}`; + } else { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["meta"]["iframeURL"] = URL; + } + } else { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["meta"]["iframeURL"] = URL; + } } else { URL = URL.replace(/^\//, "").replace(/_/g, "-"); if (URL.startsWith("unopen")) { diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue new file mode 100644 index 00000000..9c8fc74e --- /dev/null +++ b/src/views/pages/caiji.vue @@ -0,0 +1,797 @@ + + + +