Merge branch '第一次美化' of http://121.196.213.68:3000/xiaozhiyong/safePower into 大屏

# Conflicts:
#	src/style/main.scss
#	src/view/equipment/alarmRecord/index.vue
#	src/view/equipment/gateway/index.vue
#	src/view/equipment/list/index.vue
#	src/view/equipment/particulars/index.vue
#	src/view/systemTools/autoCode/picture.vue

src/view/largeScreen2/index.vue

@@ -433,7 +433,7 @@
     const testData = devices.value.slice(0, 20)
 
     testData.forEach((device, index) => {
-      console.log(`渲染第 ${index} 个点:`, device)
+      // console.log(`渲染第 ${index} 个点:`, device)
 
       const marker = new AMap.Marker({
         position: [device.gatewayLong, device.gatewayLat],