diff --git a/.env b/.env index cefd998..ec174cc 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ VUE_APP_MODE=production VUE_APP_PREVIEW=false -VUE_APP_URL=http://test.tall.wiki/ +VUE_APP_URL=http://www.tall.wiki/ diff --git a/.env.production b/.env.production index f7eca03..ec30b9f 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ VUE_APP_MODE=production VUE_APP_NODE_ENV=production VUE_APP_SCENE=wisdomcar -VUE_APP_BASE_URL=http://test.tall.wiki/ -VUE_APP_API_URL=http://test.tall.wiki/wisdomcar +VUE_APP_BASE_URL=http://www.tall.wiki/ +VUE_APP_API_URL=http://www.tall.wiki/wisdomcar VUE_APP_PROXY_URL=/gateway VUE_APP_PUBLIC_PATH=/wisdomcar -VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws +VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws VUE_APP_TITLE=盐湖区人民医院数字看板 VUE_APP_DESCRIPTION=盐湖区人民医院数字看板 diff --git a/rest/project.http b/rest/project.http index e1470f0..d696082 100644 --- a/rest/project.http +++ b/rest/project.http @@ -1,7 +1,7 @@ # @tall = {{url}}/tall/v1.0 -@tall = http://test.tall.wiki/gateway/tall/v1.0 +@tall = http://www.tall.wiki/gateway/tall/v1.0 @greenvalley = http://www.sxwikionline.com/gateway/greenvalley -@record = https://test.tall.wiki/gateway/wisdomcar +@record = https://www.tall.wiki/gateway/wisdomcar @type = content-type: application/json;charset=utf-8 ### login diff --git a/src/common/index.styl b/src/common/index.styl index 327c74f..42405be 100644 --- a/src/common/index.styl +++ b/src/common/index.styl @@ -1,8 +1,10 @@ .wrap{ - width: 100vw; - height: 100vh; + position: absolute; + width: 100%; + height: 100%; color: #fff; - background: url('assets/bg.jpg') no-repeat fixed top; + background: url('assets/bg.jpg') no-repeat top; + background-size: 100% 100%; } .wrap .bg-left{ diff --git a/src/components/RFID/RFID.styl b/src/components/RFID/RFID.styl index b3baa53..4838cc0 100644 --- a/src/components/RFID/RFID.styl +++ b/src/components/RFID/RFID.styl @@ -3,7 +3,7 @@ } .list { - width: 4.4rem; + width: 18%; height: 4.4rem; font-size: 12px; color: #C8CED5; @@ -17,6 +17,10 @@ flex-direction: column; } +.list span{ + width: 80%; +} + .active { width: 5.4rem; height: 5.4rem; @@ -29,53 +33,53 @@ } .list1 { - top: 0.5rem; - left: 4rem; + top: 5%; + left: 16%; } .list2 { - top: 0.5rem; - left: 11.5rem; + top: 5%; + left: 41%; } .list3 { - top: 0.5rem; - left: 19rem; + top: 5%; + right: 16%; } .list4 { - top: 5rem; - left: 0.5rem; + top: 35%; + left: 3.5%; } .list5 { - top: 5rem; - left: 8rem; + top: 35%; + left: 28.5%; } .list6 { - top: 5rem; - left: 15.5rem; + top: 35%; + right: 28.5%; } .list7 { - top: 5rem; - left: 23rem; + top: 35%; + right: 3.5%; } .list8 { - top: 10rem; - left: 4rem; + top: 65%; + left: 16%; } .list9 { - top: 10rem; - left: 11.5rem; + top: 65%; + left: 41%; } .list10 { - top: 10rem; - left: 19rem; + top: 65%; + right: 16%; } @@ -83,7 +87,7 @@ @media (max-width: 1500px){ .list { width: 4rem; - height: 3.4rem; + height: 3rem; } .list span { @@ -96,52 +100,52 @@ } .list1 { - top: 0.5rem; + // top: 0.5rem; left: 3rem; } .list2 { - top: 0.5rem; + // top: 0.5rem; left: 8rem; } .list3 { - top: 0.5rem; + // top: 0.5rem; left: 13rem; } .list4 { - top: 3.5rem; + // top: 3.5rem; left: 0.5rem; } .list5 { - top: 3.5rem; + // top: 3.5rem; left: 5.5rem; } .list6 { - top: 3.5rem; + // top: 3.5rem; left: 10.5rem; } .list7 { - top: 3.5rem; + // top: 3.5rem; left: 15.5rem; } .list8 { - top: 6.5rem; + // top: 6.5rem; left: 3rem; } .list9 { - top: 6.5rem; + // top: 6.5rem; left: 8rem; } .list10 { - top: 6.5rem; + // top: 6.5rem; left: 13rem; } } diff --git a/src/components/RFID/RFID.vue b/src/components/RFID/RFID.vue index 2103275..230c31f 100644 --- a/src/components/RFID/RFID.vue +++ b/src/components/RFID/RFID.vue @@ -1,7 +1,12 @@