diff --git a/rest/project.http b/rest/project.http index 1a820a5..92caa52 100644 --- a/rest/project.http +++ b/rest/project.http @@ -64,8 +64,8 @@ POST {{record}}/debug/record { "param":{ - "carNumber": "001", - "type": "1", + "authId": "1", + "type": "2", "value":"70000", "time":"1607937529000" } diff --git a/src/assets/aaa.mp4 b/src/assets/aaa.mp4 new file mode 100644 index 0000000..9159108 Binary files /dev/null and b/src/assets/aaa.mp4 differ diff --git a/src/assets/aaa.png b/src/assets/aaa.png new file mode 100644 index 0000000..06ed12a Binary files /dev/null and b/src/assets/aaa.png differ diff --git a/src/common/index.styl b/src/common/index.styl index ee3614c..9112637 100644 --- a/src/common/index.styl +++ b/src/common/index.styl @@ -106,6 +106,7 @@ display: inline-block; position: relative; top: -10px; + z-index: 999; text-shadow: rgb(0, 117, 255) 0px 0px 8px; font-family: SourceHanSansCN-Bold; font-size: 1.2rem; @@ -120,9 +121,11 @@ } .s-pic{ - width:200px; - height: 100px; - position: relative; + width:191.85px; + height: 107.85px; + position: absolute; top: 10px; - left: 10px + left: 10px; + border-radius: 6px; + overflow: hidden; } diff --git a/src/components/Duration/Duration.js b/src/components/Duration/Duration.js index e8caddf..aedb10d 100644 --- a/src/components/Duration/Duration.js +++ b/src/components/Duration/Duration.js @@ -66,11 +66,6 @@ const mixin = { // symbol: 'star', data: this.pointTimeHospital, color: 'rgb(18, 131, 227)', - lineStyle: { - shadowColor: '#5cfbff', - shadowBlur: 8, - width: 4, - }, }, { name: '国际水准', @@ -79,11 +74,6 @@ const mixin = { symbolSize: 6, data: this.pointTimeInternation, color: 'rgb(30, 231, 231)', - lineStyle: { - shadowColor: '#5cfbff', - shadowBlur: 8, - width: 4, - }, }, { name: '当前数据', @@ -92,11 +82,6 @@ const mixin = { symbolSize: 6, data: this.pointTimeCurrentList, color: 'rgb(227, 18, 187)', - lineStyle: { - shadowColor: '#5cfbff', - shadowBlur: 8, - width: 4, - }, }, ], }; diff --git a/src/components/FastEd/FastEd.vue b/src/components/FastEd/FastEd.vue index f2f9ad5..770802f 100644 --- a/src/components/FastEd/FastEd.vue +++ b/src/components/FastEd/FastEd.vue @@ -9,7 +9,12 @@
{{ item.b }}
{{ item.c }}
-
+
{{ item.a }}
{{ item.b }}
{{ item.c }}
diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js index 1f5ea58..3572831 100644 --- a/src/components/Map/Map.js +++ b/src/components/Map/Map.js @@ -8,7 +8,7 @@ var option = { regionHeight: 6, //地图高度 map: '山西', viewControl: { - distance: 1000, //地图视角 控制初始大小 + distance: 350, //地图视角 控制初始大小 rotateSensitivity: 1, //禁止旋转 zoomSensitivity: 1, //禁止缩放 }, diff --git a/src/components/RFID/RFID.styl b/src/components/RFID/RFID.styl index 280ae31..b8adf7d 100644 --- a/src/components/RFID/RFID.styl +++ b/src/components/RFID/RFID.styl @@ -9,25 +9,19 @@ color: #C8CED5; background: url('~assets/rfid-bg.png') no-repeat center; background-size: contain; - position: absolute; -} - -.list span{ - display: inline-block; - position: relative; - top: 25%; - width: 100%; - height: 50%; text-align: center; + position: absolute; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; } .active { - width: 5.4rem; - height: 5.4rem; - font-size: 12px; - background: url('~assets/rfid-bg-active.png') no-repeat center; - background-size: contain; - text-align: center; + width: 5.4rem; + height: 5.4rem; + background: url('~assets/rfid-bg-active.png') no-repeat center; + background-size: contain; } .list.active span{ @@ -50,37 +44,37 @@ } .list4 { - top: 5.5rem; + top: 5rem; left: 0.5rem; } .list5 { - top: 5.5rem; + top: 5rem; left: 8rem; } .list6 { - top: 5.5rem; + top: 5rem; left: 15.5rem; } .list7 { - top: 5.5rem; + top: 5rem; left: 23rem; } .list8 { - top: 10.5rem; + top: 10rem; left: 4rem; } .list9 { - top: 10.5rem; + top: 10rem; left: 11.5rem; } .list10 { - top: 10.5rem; + top: 10rem; left: 19rem; } diff --git a/src/components/RFID/RFID.vue b/src/components/RFID/RFID.vue index d82d833..46bc9a9 100644 --- a/src/components/RFID/RFID.vue +++ b/src/components/RFID/RFID.vue @@ -13,36 +13,112 @@