diff --git a/src/assets/styles/element-variables.scss b/src/assets/styles/element-variables.scss
index 4b93ad0..a5e605c 100644
--- a/src/assets/styles/element-variables.scss
+++ b/src/assets/styles/element-variables.scss
@@ -4,7 +4,7 @@
**/
/* theme color */
-$--color-primary: #0856c0;
+// $--color-primary: #0856c0;
$--color-success: #13ce66;
$--color-warning: #ffb800;
$--color-danger: #ff5722;
diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css
new file mode 100644
index 0000000..4021085
--- /dev/null
+++ b/src/assets/styles/font.css
@@ -0,0 +1,74 @@
+@font-face {
+ font-family: "xiniu";
+ src: url("http://www.jichuanglanhai.com/demo/taicang-file/fonts/xiniu.TTF");
+}
+/* 正常文字 */
+@font-face {
+ font-family: "Alibaba-PuHuiTi-Regular.otf";
+ src: url("http://www.jichuanglanhai.com/demo/taicang-file/fonts/Alibaba-PuHuiTi-Regular.otf");
+}
+@font-face {
+ font-family: "Alibaba-PuHuiTi-Bold.otf";
+ src: url("http://www.jichuanglanhai.com/demo/taicang-file/fonts/Alibaba-PuHuiTi-Bold.otf");
+}
+/* 标题类 */
+@font-face {
+ font-family: "Alibaba-PuHuiTi-Medium.otf";
+ src: url("http://www.jichuanglanhai.com/demo/taicang-file/fonts/Alibaba-PuHuiTi-Medium.otf");
+}
+/* 数字类 */
+@font-face {
+ font-family: "din-bold-2.ttf";
+ src: url("http://www.jichuanglanhai.com/demo/taicang-file/fonts/din-bold-2.ttf");
+}
+@font-face {
+ font-family: "FZZCHJW--GB1-0";
+ src: url("http://www.jichuanglanhai.com/demo/js-yingdi/font/方正正粗黑简体.TTF");
+}
+
+@font-face {
+ font-family: "xiaowei";
+ src: url("http://www.jichuanglanhai.com/demo/js-yingdi/font/ZCOOL - Xiaowei Logo.otf");
+}
+
+@font-face {
+ font-family: "AccidentalPresidency";
+ src: url("http://www.jichuanglanhai.com/demo/js-yingdi/font/AccidentalPresidency_0.ttf");
+}
+
+@font-face {
+ font-family: "Source Han Sans CN-Regular";
+ src: url("http://www.jichuanglanhai.com/demo/font-file/SourceHanSansCN-Regular_1.otf");
+}
+
+@font-face {
+ font-family: "DIN-Regular-2.otf";
+ src: url("http://www.jichuanglanhai.com/demo/font-file/DIN-BlackItalic.otf");
+}
+
+@font-face {
+ font-family: "Source Han Sans CN";
+ src: url("./font/SourceHanSansCN-Medium.otf");
+}
+
+@font-face {
+ font-family: "Source Han Regular CN";
+ src: url("./font/SourceHanSansCN-Regular.otf");
+}
+@font-face {
+ font-family: "Source Han Bolde CN";
+ src: url("./font/SourceHanSansCN-Bold.otf");
+}
+@font-face {
+ font-family: "DIN";
+ src: url("./font/D-DIN.otf");
+}
+@font-face {
+ font-family: "DIN-Regular";
+ src: url("./font/DIN-Regular.otf");
+}
+@font-face {
+ font-family: "xiniu";
+ src: url("./font/兮妞中黑体_0.TTF");
+}
+
diff --git a/src/assets/styles/font/D-DIN.otf b/src/assets/styles/font/D-DIN.otf
new file mode 100644
index 0000000..ea5c4c8
Binary files /dev/null and b/src/assets/styles/font/D-DIN.otf differ
diff --git a/src/assets/styles/font/DIN Condensed Bold.ttf b/src/assets/styles/font/DIN Condensed Bold.ttf
new file mode 100644
index 0000000..f05a1a9
Binary files /dev/null and b/src/assets/styles/font/DIN Condensed Bold.ttf differ
diff --git a/src/assets/styles/font/DIN-Medium.otf b/src/assets/styles/font/DIN-Medium.otf
new file mode 100644
index 0000000..3296d1e
Binary files /dev/null and b/src/assets/styles/font/DIN-Medium.otf differ
diff --git a/src/assets/styles/font/DIN-Regular.otf b/src/assets/styles/font/DIN-Regular.otf
new file mode 100644
index 0000000..cb5f1c5
Binary files /dev/null and b/src/assets/styles/font/DIN-Regular.otf differ
diff --git a/src/assets/styles/font/SourceHanSansCN-Bold.otf b/src/assets/styles/font/SourceHanSansCN-Bold.otf
new file mode 100644
index 0000000..4b3429a
Binary files /dev/null and b/src/assets/styles/font/SourceHanSansCN-Bold.otf differ
diff --git a/src/assets/styles/font/SourceHanSansCN-Medium.otf b/src/assets/styles/font/SourceHanSansCN-Medium.otf
new file mode 100644
index 0000000..53e03e0
Binary files /dev/null and b/src/assets/styles/font/SourceHanSansCN-Medium.otf differ
diff --git a/src/assets/styles/font/SourceHanSansCN-Regular.otf b/src/assets/styles/font/SourceHanSansCN-Regular.otf
new file mode 100644
index 0000000..886f82f
Binary files /dev/null and b/src/assets/styles/font/SourceHanSansCN-Regular.otf differ
diff --git a/src/assets/styles/font/din-bold-2.ttf b/src/assets/styles/font/din-bold-2.ttf
new file mode 100644
index 0000000..1220089
Binary files /dev/null and b/src/assets/styles/font/din-bold-2.ttf differ
diff --git a/src/assets/styles/font/兮妞中黑体_0.TTF b/src/assets/styles/font/兮妞中黑体_0.TTF
new file mode 100644
index 0000000..9c413b9
Binary files /dev/null and b/src/assets/styles/font/兮妞中黑体_0.TTF differ
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
new file mode 100644
index 0000000..d6dcece
--- /dev/null
+++ b/src/layout/newyjLayout.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+ 黄金糕
+ 狮子头
+ 螺蛳粉
+ 双皮奶
+ 蚵仔煎
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 6433a0d..c5f61e9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,8 @@ import Cookies from "js-cookie";
import Element from "element-ui";
import "./assets/styles/element-variables.scss";
+import "./assets/styles/font.css";
+
Element.Dialog.props.closeOnClickModal.default = false; //模态框单击空白处不允许关闭
// 带有斑马纹
diff --git a/src/permission.js b/src/permission.js
index b121a27..35e6331 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,19 +9,7 @@ import { isRelogin } from "@/utils/request";
NProgress.configure({ showSpinner: false });
const whiteList = [
- "/login",
- "/mudu/check",
- "/mudu/profile",
- "/mudu/point",
- "/mudu/records",
- "/mudu/receiver",
- "/mudu/transportation",
- "/mudu/equipment",
- "/mudu/order",
- "/mudu/article",
- "/mudu/train",
- "/mudu/directory",
- "/login2",
+ '/toLogin'
];
router.beforeEach((to, from, next) => {
@@ -29,7 +17,7 @@ router.beforeEach((to, from, next) => {
if (getToken()) {
to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
/* has token*/
- if (to.path === "/login") {
+ if (to.path === "/toLogin") {
next({ path: "/" });
NProgress.done();
} else {
@@ -62,7 +50,7 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单,直接进入
next();
} else {
- next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
+ next(`/toLogin`); // 否则全部重定向到登录页
NProgress.done();
}
}
diff --git a/src/router/index.js b/src/router/index.js
index 7b49ff0..603e41d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,7 +6,7 @@ Vue.use(Router);
/* Layout */
import Layout from "@/layout";
import Simplely from "@/layout/simplely.vue";
-
+import newyjLayout from "@/layout/newyjLayout.vue";
/**
* Note: 路由配置项
*
@@ -42,14 +42,19 @@ export const constantRoutes = [
},
],
},
+ // {
+ // path: "/login",
+ // component: () => import("@/views/login"),
+ // hidden: true,
+ // },
+ // {
+ // path: "/login2",
+ // component: (resolve) => require(["@/views/login2"], resolve),
+ // hidden: true,
+ // },
{
- path: "/login",
- component: () => import("@/views/login"),
- hidden: true,
- },
- {
- path: "/login2",
- component: (resolve) => require(["@/views/login2"], resolve),
+ path: "/toLogin",
+ component: (resolve) => require(["@/views/newLogin"], resolve),
hidden: true,
},
{
@@ -67,19 +72,34 @@ export const constantRoutes = [
component: () => import("@/views/error/401"),
hidden: true,
},
-
{
- path: "",
- component: Layout,
- redirect: "profile",
- // children: [
- // {
- // path: "index",
- // component: () => import("@/views/mudu/profile/index"),
- // name: "Index",
- // // meta: { title: "园区概况", icon: "dashboard", affix: true },
- // },
- // ],
+ path: "/",
+ component: newyjLayout,
+ hidden: true,
+ redirect: "/home",
+ children: [
+ {
+ path: "/home",
+ component: () => import("@/views/yingji/home.vue"),
+ name: "home",
+ },
+ {
+ path: "/planManage",
+ component: () => import("@/views/yingji/planManage.vue"),
+ name: "planManage",
+ },
+ {
+ path: "/enforcing",
+ component: () => import("@/views/yingji/enforcing.vue"),
+ name: "enforcing",
+ },
+ {
+ path: "/enterprise",
+ component: () => import("@/views/yingji/enterprise.vue"),
+ name: "enterprise",
+ },
+
+ ],
},
{
path: "/mudu",
@@ -148,7 +168,6 @@ export const constantRoutes = [
},
],
},
-
{
path: "/user",
component: Layout,
diff --git a/src/views/newLogin.vue b/src/views/newLogin.vue
new file mode 100644
index 0000000..2f359f1
--- /dev/null
+++ b/src/views/newLogin.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+ 欢迎登录!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 记住密码
+
+
+
+
+ 立即注册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/yingji/echarts/completePlan.vue b/src/views/yingji/echarts/completePlan.vue
new file mode 100644
index 0000000..7915270
--- /dev/null
+++ b/src/views/yingji/echarts/completePlan.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue
new file mode 100644
index 0000000..826ab60
--- /dev/null
+++ b/src/views/yingji/echarts/finishRate.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
new file mode 100644
index 0000000..db0a50a
--- /dev/null
+++ b/src/views/yingji/enforcing.vue
@@ -0,0 +1,5 @@
+
+
+ 执法结果
+
+
\ No newline at end of file
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
new file mode 100644
index 0000000..bc43060
--- /dev/null
+++ b/src/views/yingji/enterprise.vue
@@ -0,0 +1,5 @@
+
+
+ 企业名录
+
+
\ No newline at end of file
diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue
new file mode 100644
index 0000000..c080bd7
--- /dev/null
+++ b/src/views/yingji/home.vue
@@ -0,0 +1,229 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
new file mode 100644
index 0000000..3bdab44
--- /dev/null
+++ b/src/views/yingji/planManage.vue
@@ -0,0 +1,5 @@
+
+
+ 计划管理
+
+
\ No newline at end of file