Merge branch 'master' of http://113.204.105.114:10011/TwoKe/zhgkpt-datav into master

app/src/views/PoliceSituation/components/Alarm.vue

@@ -204,6 +204,15 @@
 </script>
 
 <style scoped lang="less">
+	::-webkit-scrollbar {
+			border-radius: 3px;
+		width: 8px;
+		height: 8px;
+		background: rgba(0, 213, 255, 0.3);
+	}
+	::-webkit-scrollbar-thumb {
+	    background: rgba(0, 213, 255, 0.3);
+	}
 	.selected {
 		width: 100%;
 		height: 40px;