diff --git a/src/assets/img/login/login-bg.png b/src/assets/img/login/login-bg.png new file mode 100644 index 0000000..2b282ac Binary files /dev/null and b/src/assets/img/login/login-bg.png differ diff --git a/src/assets/img/login/login-right.png b/src/assets/img/login/login-right.png new file mode 100644 index 0000000..3e22730 Binary files /dev/null and b/src/assets/img/login/login-right.png differ diff --git a/src/assets/img/login/logo.png b/src/assets/img/login/logo.png new file mode 100644 index 0000000..0817b2e Binary files /dev/null and b/src/assets/img/login/logo.png differ diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index c05fbae..0d5c857 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -13,7 +13,9 @@ key="1">{{website.indexTitle}} --> - +
运维管理系统
@@ -58,8 +60,7 @@ export default { z-index: 1024; display: flex; .logo { - width: 90px; - background: skyblue; + width: 80px; } .title { line-height: 92px; diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 9e470db..0f443dc 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -5,7 +5,9 @@
- +
-
+
+ +
diff --git a/src/styles/common.scss b/src/styles/common.scss index 6653240..5fd6dbf 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -18,6 +18,8 @@ @import './media.scss'; //通用配置 @import './normalize.scss'; +//自定义 +@import './custom/custom.scss'; // 字体 // @import '~@/assets/font/font.css'; a{ diff --git a/src/styles/custom/custom.scss b/src/styles/custom/custom.scss index 9e685ca..08b04cf 100644 --- a/src/styles/custom/custom.scss +++ b/src/styles/custom/custom.scss @@ -1,16 +1,23 @@ -// input输入框 -.el-input--small .el-input__inner { - width: 420px; - height: 50px; - line-height: 50px; - border-radius: 3px 3px 3px 3px; - color: #333; - position: relative; - border: 1px solid #CFCFCF -} -// input输入框label -.el-form--label-top .el-form-item__label { - font-size: 16px; - color: #273240; - padding: 0!important; +// // input输入框 +// .el-input--small .el-input__inner { +// width: 420px; +// height: 50px; +// line-height: 50px; +// border-radius: 3px 3px 3px 3px; +// color: #333; +// position: relative; +// border: 1px solid #CFCFCF +// } +// // input输入框label +// .el-form--label-top .el-form-item__label { +// font-size: 16px; +// color: #273240; +// padding: 0!important; +// } +// 包裹容器 +.cus-container { + margin: 0 38px; + border: 1px solid blue; + height: 100%; + width: calc(100% - 76px); } diff --git a/src/styles/login.scss b/src/styles/login.scss index a3860be..332fc62 100644 --- a/src/styles/login.scss +++ b/src/styles/login.scss @@ -5,7 +5,7 @@ width: 100%; height: 100%; margin: 0 auto; - background-image: url("/img/bg/bg4.jpg"); + background-image: url("~@/assets/img/login/login-bg.png"); background-size: 100% 100%; } @@ -29,11 +29,11 @@ } .login-right { + background-color: #F1F7FB; border-top-right-radius: 9px; border-bottom-right-radius: 9px; justify-content: center; flex-direction: column; - background-color: #8b9aac; color: #fff; float: left; width: 50%; @@ -63,7 +63,6 @@ .login-logo { width: 118px; height: 124px; - background: pink; display: flex; margin: 0 auto; } diff --git a/src/styles/media.scss b/src/styles/media.scss index b26c50c..765e18f 100644 --- a/src/styles/media.scss +++ b/src/styles/media.scss @@ -70,7 +70,7 @@ } .avue-view { - padding: 0 10px !important; + // padding: 0 10px !important; width: 100%; box-sizing: border-box; } diff --git a/src/views/monitoring/index.vue b/src/views/monitoring/index.vue new file mode 100644 index 0000000..40a2a7a --- /dev/null +++ b/src/views/monitoring/index.vue @@ -0,0 +1,119 @@ + + + diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue index 0e21c3f..ee44b71 100644 --- a/src/views/plugin/workflow/process/components/form.vue +++ b/src/views/plugin/workflow/process/components/form.vue @@ -31,7 +31,7 @@ 发起 + @click="handleStartProcess">提 交