diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue index 35fab28c..f3f2186d 100644 --- a/ruoyi-ui/src/App.vue +++ b/ruoyi-ui/src/App.vue @@ -63,4 +63,10 @@ export default { src: url("/static/fonts/优设标题黑.ttf"); } +@font-face { + font-family: "PangMenZhengDao"; + src: url("/static/fonts/优设标题黑.ttf"); +} + + diff --git a/ruoyi-ui/src/assets/images/Vector.png b/ruoyi-ui/src/assets/images/Vector.png new file mode 100644 index 00000000..3d8a8a54 Binary files /dev/null and b/ruoyi-ui/src/assets/images/Vector.png differ diff --git a/ruoyi-ui/src/assets/images/locked.png b/ruoyi-ui/src/assets/images/locked.png new file mode 100644 index 00000000..370115e4 Binary files /dev/null and b/ruoyi-ui/src/assets/images/locked.png differ diff --git a/ruoyi-ui/src/assets/images/login-background.png b/ruoyi-ui/src/assets/images/login-background.png new file mode 100644 index 00000000..936b18c7 Binary files /dev/null and b/ruoyi-ui/src/assets/images/login-background.png differ diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/ruoyi-ui/src/assets/images/login-background1.jpg similarity index 100% rename from ruoyi-ui/src/assets/images/login-background.jpg rename to ruoyi-ui/src/assets/images/login-background1.jpg diff --git a/ruoyi-ui/src/assets/images/login-head.png b/ruoyi-ui/src/assets/images/login-head.png new file mode 100644 index 00000000..8332b14a Binary files /dev/null and b/ruoyi-ui/src/assets/images/login-head.png differ diff --git a/ruoyi-ui/src/components/eventDialogTable/video.vue b/ruoyi-ui/src/components/eventDialogTable/video.vue index 641e2175..165e6f63 100644 --- a/ruoyi-ui/src/components/eventDialogTable/video.vue +++ b/ruoyi-ui/src/components/eventDialogTable/video.vue @@ -407,7 +407,7 @@ export default { status: "正在进行", }, { - pic: require("@/assets/images/login-background.jpg"), + pic: require("@/assets/images/login-background.png"), time: "2022-03-11 14:47:13", event: "事件: 道路拥堵", status: "正在进行", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue index a4981257..c11ee616 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue @@ -189,6 +189,24 @@ .buttonbar { display: inline-flex; flex-direction: row; + padding-top:15px; + + > .button { + display: inline-flex; + min-width:90px; + height:28px; + background: linear-gradient(180deg, #005C79 0%, #009BCC 100%); + border-radius: 2px 2px 2px 2px; + justify-content: center; + align-items: center; + padding: 1px 10px;; + opacity: 1; + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #FFFFFF; + margin-left:15px; + } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/publicService/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/publicService/index.vue new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/publicService/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/publicService/statistics/index.vue new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 0c73c671..647cca7f 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -14,7 +14,8 @@ padding-bottom: 10px; " > - + +
欢迎登录
{{ 济菏数字运营管理平台 }}
@@ -22,31 +23,31 @@ v-model="loginForm.username" type="text" auto-complete="off" - placeholder="账号" + placeholder="请输入用户名" > - -
+
- -
+
- + 记住密码 { this.captchaOnOff = response.captchaOnOff; }); @@ -237,12 +238,46 @@ export default { diff --git a/ruoyi-ui/src/views/loginjqtunnel.vue b/ruoyi-ui/src/views/loginjqtunnel.vue index 7415b2ce..29baac4d 100644 --- a/ruoyi-ui/src/views/loginjqtunnel.vue +++ b/ruoyi-ui/src/views/loginjqtunnel.vue @@ -150,7 +150,7 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/image/login-background.jpg"); + background-image: url("../assets/images/login-background.png"); background-size: cover; } .title { diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue index caf70bcd..7a1c6d1e 100644 --- a/ruoyi-ui/src/views/register.vue +++ b/ruoyi-ui/src/views/register.vue @@ -152,7 +152,7 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/images/login-background.png"); background-size: cover; } .title { diff --git a/ruoyi-ui/src/views/workbench/config/components/video.vue b/ruoyi-ui/src/views/workbench/config/components/video.vue index f3719524..be6f1135 100644 --- a/ruoyi-ui/src/views/workbench/config/components/video.vue +++ b/ruoyi-ui/src/views/workbench/config/components/video.vue @@ -474,7 +474,7 @@ export default { status: "正在进行", }, { - pic: require("@/assets/images/login-background.jpg"), + pic: require("@/assets/images/login-background1.jpg"), time: "2022-03-11 14:47:13", event: "事件: 道路拥堵", status: "正在进行",