diff --git a/src/assets/images/titleIcon.png b/src/assets/images/titleIcon.png new file mode 100644 index 0000000..9f534f3 Binary files /dev/null and b/src/assets/images/titleIcon.png differ diff --git a/src/assets/images/titleImg.png b/src/assets/images/titleImg.png new file mode 100644 index 0000000..582c726 Binary files /dev/null and b/src/assets/images/titleImg.png differ diff --git a/src/assets/images/titleImg.webp b/src/assets/images/titleImg.webp deleted file mode 100644 index 8a21148..0000000 Binary files a/src/assets/images/titleImg.webp and /dev/null differ diff --git a/src/components/card.vue b/src/components/card.vue index 0fea771..b099877 100644 --- a/src/components/card.vue +++ b/src/components/card.vue @@ -1,7 +1,10 @@ @@ -24,22 +26,27 @@ export default { width: 100%; height: 100%; .title { - height: 15%; - line-height: 4vh; - text-align: left; - font-size: calc(100vw * 18 / 1920); - color: #ffffff; - background: url("@/assets/images/titleImg.webp") no-repeat; + background: url("@/assets/images/titleImg.png") no-repeat; background-size: 100% 100%; - - i { - margin-left: 45px; - font-family: OPPOSansH; + display: flex; + div { + font-size: calc(100vw * 18 / 1920); + color: #ffffff; + img { + width: 110%; + margin-left: 30%; + } + i { + font-family: OPPOSansH; + } + } + .titltText { + margin: 1% 0 0 2%; } } .content { - margin-top: 10px; - height: calc(100% - 34px); + margin-top: 2%; + height: 88%; background: url("@/assets/images/cardImg.png") no-repeat; background-size: 100% 100%; } diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index e930df6..d1e39af 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -76,13 +76,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/safetyManagement/securityManagement", name: "安全管理", - component: () => import("@/views/sevenLargeScreen/safetyManagement/securityManagement.vue") + component: () => import("@/views/sevenLargeScreen/safetyManagement/securityManagement/index.vue") }, - { - path: "/safetyManagement/foundationPitMonitoring", - name: "基坑监测", - component: () => import("@/views/sevenLargeScreen/safetyManagement/foundationPitMonitoring.vue") - } ], meta: { title: "七参数大屏" diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 19dc677..a50005d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,4 +1,6 @@ - - \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement.vue deleted file mode 100644 index 5a144ab..0000000 --- a/src/views/sevenLargeScreen/safetyManagement/securityManagement.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement/centerBottom.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement/centerBottom.vue new file mode 100644 index 0000000..38d4206 --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement/centerBottom.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement/centerTop.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement/centerTop.vue new file mode 100644 index 0000000..1e96f6c --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement/centerTop.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement/index.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement/index.vue new file mode 100644 index 0000000..43cc78e --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement/index.vue @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement/leftBottom.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement/leftBottom.vue new file mode 100644 index 0000000..1659138 --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement/leftBottom.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement/leftTop.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement/leftTop.vue new file mode 100644 index 0000000..c81263c --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement/leftTop.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement/rightBox.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement/rightBox.vue new file mode 100644 index 0000000..9c1d922 --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement/rightBox.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file