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..684e13b --- /dev/null +++ b/src/assets/styles/font.css @@ -0,0 +1,70 @@ +@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"); +} + 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/layout/newyjLayout.vue b/src/layout/newyjLayout.vue new file mode 100644 index 0000000..d518120 --- /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/router/index.js b/src/router/index.js index 7b49ff0..8f2ae46 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: 路由配置项 * @@ -82,72 +82,101 @@ export const constantRoutes = [ // ], }, { - path: "/mudu", - component: Simplely, + path: "/yingji", + component: newyjLayout, hidden: true, + redirect: "/home", children: [ { - path: "test", - component: () => import("@/views/test.vue"), - name: "test", - }, - { - path: "check", - component: () => import("@/views/mudu/check/index"), - name: "check", - }, - { - path: "profile", - component: () => import("@/views/mudu/none/profile.vue"), - name: "profile", - }, - { - path: "point", - component: () => import("@/views/mudu/point/index.vue"), - name: "point", - }, - { - path: "records", - component: () => import("@/views/mudu/records/index"), - name: "records", + path: "/home", + component: () => import("@/views/yingji/home.vue"), + name: "home", }, { - path: "receiver", - component: () => import("@/views/mudu/receiver/index.vue"), - name: "receiver", + path: "/planManage", + component: () => import("@/views/yingji/planManage.vue"), + name: "planManage", }, { - path: "transportation", - component: () => import("@/views/mudu/transportation/index.vue"), - name: "transportation", + path: "/enforcing", + component: () => import("@/views/yingji/enforcing.vue"), + name: "enforcing", }, { - path: "equipment", - component: () => import("@/views/mudu/equipment/index.vue"), - name: "equipment", - }, - { - path: "train", - component: () => import("@/views/mudu/train/index.vue"), - name: "train", - }, - { - path: "order", - component: () => import("@/views/mudu/none/order.vue"), - name: "order", - }, - { - path: "article", - component: () => import("@/views/mudu/article/index.vue"), - name: "article", - }, - { - path: "directory", - component: () => import("@/views/mudu/directory/index.vue"), - name: "directory", + path: "/enterprise", + component: () => import("@/views/yingji/enterprise.vue"), + name: "enterprise", }, + ], }, + // { + // path: "/mudu", + // component: Simplely, + // hidden: true, + // children: [ + // { + // path: "test", + // component: () => import("@/views/test.vue"), + // name: "test", + // }, + // { + // path: "check", + // component: () => import("@/views/mudu/check/index"), + // name: "check", + // }, + // { + // path: "profile", + // component: () => import("@/views/mudu/none/profile.vue"), + // name: "profile", + // }, + // { + // path: "point", + // component: () => import("@/views/mudu/point/index.vue"), + // name: "point", + // }, + // { + // path: "records", + // component: () => import("@/views/mudu/records/index"), + // name: "records", + // }, + // { + // path: "receiver", + // component: () => import("@/views/mudu/receiver/index.vue"), + // name: "receiver", + // }, + // { + // path: "transportation", + // component: () => import("@/views/mudu/transportation/index.vue"), + // name: "transportation", + // }, + // { + // path: "equipment", + // component: () => import("@/views/mudu/equipment/index.vue"), + // name: "equipment", + // }, + // { + // path: "train", + // component: () => import("@/views/mudu/train/index.vue"), + // name: "train", + // }, + // { + // path: "order", + // component: () => import("@/views/mudu/none/order.vue"), + // name: "order", + // }, + // { + // path: "article", + // component: () => import("@/views/mudu/article/index.vue"), + // name: "article", + // }, + // { + // path: "directory", + // component: () => import("@/views/mudu/directory/index.vue"), + // name: "directory", + // }, + // ], + // }, { path: "/user", 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