修改

src/views/dashboard/rladmin/index.vue

@@ -216,7 +216,6 @@ export default {
        ]
       },
       //维保记录规律统计
-<<<<<<< HEAD
        torque:{
          name:"扭矩",
          url:'',
@@ -227,7 +226,6 @@ export default {
        },
 
 //
-=======
       Maintenance:{
 
       },
@@ -254,7 +252,6 @@ export default {
           'value': "0",
          },
        ],
->>>>>>> 30c9f6aee676707746ad5265ca62f6ecba845c15
       countData: {
        department_count:24,
        device_online_count:31,