Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev

src/views/components/systemTime/index.vue

@@ -19,43 +19,43 @@ import Digit from './digit';
 import Separator from './separator';
 
 export default {
-	name: 'SystenTime',
+    name: 'SystenTime',
-	components: {
+    components: {
-		Digit,
+        Digit,
-		Separator
+        Separator
-	},
+    },
-	props: {
+    props: {
-		background: {
+        background: {
-			type: String,
+            type: String,
-			default() {
+            default() {
-				return '#000';
+                return '#000';
-			}
+            }
-		},
+        },
-		color: {
+        color: {
-			type: String,
+            type: String,
-			default() {
+            default() {
-				return '#00FF00';
+                return '#00FF00';
-			}
+            }
-		},
+        },
-		time: {
+        time: {
-			type: String,
+            type: String,
-			default() {
+            default() {
-				return '12:3456';
+                return '12:3456';
-			}
+            }
-		},
+        },
-		zoom: {
+        zoom: {
-			type: Number,
+            type: Number,
-			default() {
+            default() {
-				return 4;
+                return 4;
-			}
+            }
-		},
+        },
-		fine: {
+        fine: {
-			type: Number,
+            type: Number,
-			default() {
+            default() {
-				return 2;
+                return 2;
-			}
+            }
-		}
+        }
-	}
+    }
 };
 </script>
 
@@ -63,5 +63,6 @@ export default {
     .system-time-box {
         display: inline-block;
         text-align: center;
+		background: #000;
     }
 </style>