diff --git a/tzipc-ui/public/theme/blueTheme/img1.png b/tzipc-ui/public/theme/blueTheme/img1.png new file mode 100644 index 0000000..0486d0a Binary files /dev/null and b/tzipc-ui/public/theme/blueTheme/img1.png differ diff --git a/tzipc-ui/public/theme/blueTheme/img2.png b/tzipc-ui/public/theme/blueTheme/img2.png new file mode 100644 index 0000000..999d45b Binary files /dev/null and b/tzipc-ui/public/theme/blueTheme/img2.png differ diff --git a/tzipc-ui/public/theme/blueTheme/img3.png b/tzipc-ui/public/theme/blueTheme/img3.png new file mode 100644 index 0000000..cff7465 Binary files /dev/null and b/tzipc-ui/public/theme/blueTheme/img3.png differ diff --git a/tzipc-ui/public/theme/blueTheme/img4.png b/tzipc-ui/public/theme/blueTheme/img4.png new file mode 100644 index 0000000..1500732 Binary files /dev/null and b/tzipc-ui/public/theme/blueTheme/img4.png differ diff --git a/tzipc-ui/public/theme/blueTheme/loginBg.png b/tzipc-ui/public/theme/blueTheme/loginBg.png index aed1e5d..9aa90bc 100644 Binary files a/tzipc-ui/public/theme/blueTheme/loginBg.png and b/tzipc-ui/public/theme/blueTheme/loginBg.png differ diff --git a/tzipc-ui/public/theme/default/img1.png b/tzipc-ui/public/theme/default/img1.png new file mode 100644 index 0000000..3f249f2 Binary files /dev/null and b/tzipc-ui/public/theme/default/img1.png differ diff --git a/tzipc-ui/public/theme/default/img2.png b/tzipc-ui/public/theme/default/img2.png new file mode 100644 index 0000000..971faeb Binary files /dev/null and b/tzipc-ui/public/theme/default/img2.png differ diff --git a/tzipc-ui/public/theme/default/img3.png b/tzipc-ui/public/theme/default/img3.png new file mode 100644 index 0000000..7bdc8f7 Binary files /dev/null and b/tzipc-ui/public/theme/default/img3.png differ diff --git a/tzipc-ui/public/theme/default/img4.png b/tzipc-ui/public/theme/default/img4.png new file mode 100644 index 0000000..0f32827 Binary files /dev/null and b/tzipc-ui/public/theme/default/img4.png differ diff --git a/tzipc-ui/public/theme/default/logo.png b/tzipc-ui/public/theme/default/logo.png index 0b60a96..9f1d536 100644 Binary files a/tzipc-ui/public/theme/default/logo.png and b/tzipc-ui/public/theme/default/logo.png differ diff --git a/tzipc-ui/public/theme/redTheme/img1.png b/tzipc-ui/public/theme/redTheme/img1.png new file mode 100644 index 0000000..11c0e01 Binary files /dev/null and b/tzipc-ui/public/theme/redTheme/img1.png differ diff --git a/tzipc-ui/public/theme/redTheme/img2.png b/tzipc-ui/public/theme/redTheme/img2.png new file mode 100644 index 0000000..70c8f7a Binary files /dev/null and b/tzipc-ui/public/theme/redTheme/img2.png differ diff --git a/tzipc-ui/public/theme/redTheme/img3.png b/tzipc-ui/public/theme/redTheme/img3.png new file mode 100644 index 0000000..5a397b2 Binary files /dev/null and b/tzipc-ui/public/theme/redTheme/img3.png differ diff --git a/tzipc-ui/public/theme/redTheme/img4.png b/tzipc-ui/public/theme/redTheme/img4.png new file mode 100644 index 0000000..23dfed0 Binary files /dev/null and b/tzipc-ui/public/theme/redTheme/img4.png differ diff --git a/tzipc-ui/src/App.vue b/tzipc-ui/src/App.vue index 6a655b1..d8d8720 100644 --- a/tzipc-ui/src/App.vue +++ b/tzipc-ui/src/App.vue @@ -34,3 +34,26 @@ export default { }, }; + diff --git a/tzipc-ui/src/assets/styles/element-ui.scss b/tzipc-ui/src/assets/styles/element-ui.scss index b45c416..1f9e893 100644 --- a/tzipc-ui/src/assets/styles/element-ui.scss +++ b/tzipc-ui/src/assets/styles/element-ui.scss @@ -602,14 +602,11 @@ div.el-switch { border-radius: 10px; border: none; .el-message-box__title { - background: url("../images/login/modal-title.png") no-repeat 0px 0px; background-size: 100% 100%; padding-left: 26px; font-size: 16px; span { - background: linear-gradient(180deg, #ffffff 0%, #87c5f4 100%); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; + @include border_color(colorPrimary); } } .el-message-box__content { diff --git a/tzipc-ui/src/layout/components/Navbar.vue b/tzipc-ui/src/layout/components/Navbar.vue index e9c3334..246affc 100644 --- a/tzipc-ui/src/layout/components/Navbar.vue +++ b/tzipc-ui/src/layout/components/Navbar.vue @@ -71,7 +71,8 @@ v-for="item in themeOptions" :key="item.key" :value="item.key" - >{{item.label}} + :label="item.label" + >{{ item.label }} + +
油膜轴承监测与预测性维护数字管理系统
@import "@/theme/index.scss"; + +@font-face { + font-family: "BiaoTi"; + src: url(../assets/biaoti.ttf); +} + +.text-main-wrapper { + position: absolute; + left:calc(50% - 40vw); + bottom: .6rem; + @include font_color(loginTitleFontColor); + letter-spacing: .1rem; + width: 80vw; + font-size: 1.8rem; + font-family: "BiaoTi"; +} .login { height: 100vh; width: 100vw; @@ -245,6 +267,7 @@ export default { .login-content-title { padding: 0 15px; width: 100%; + position: relative; img { width: 100%; height: 100%; diff --git a/tzipc-ui/src/views/zf/bigscreen/index.vue b/tzipc-ui/src/views/zf/bigscreen/index.vue index a2c481c..602e5e9 100644 --- a/tzipc-ui/src/views/zf/bigscreen/index.vue +++ b/tzipc-ui/src/views/zf/bigscreen/index.vue @@ -20,11 +20,28 @@ style="grid-row: span 2;grid-column: span 2;padding: 2rem;" @click="(e) => { e.stopPropagation() }" > -
-
-
-
-
+
+
+
+
+
@@ -338,7 +355,7 @@