likang

src/views/dashboard/rladmin/index.vue

@@ -216,7 +216,6 @@ export default {
        ]
       },
       //维保记录规律统计
-<<<<<<< HEAD
        torque:{
          name:"扭矩",
          url:'',
@@ -227,34 +226,6 @@ export default {
        },
 
 //
-=======
-      Maintenance:{
-
-      },
-      table_data:[
-         {
-           'alarm': 62,
-          'online': 31,
-          'text': "液压泵",
-          'total': 40,
-          'value': "0",
-         },
-          {
-           'alarm': 80,
-          'online': 32,
-          'text': "液压扳手",
-          'total': 75,
-          'value': "0",
-         },
-         {
-           'alarm': 80,
-          'online': 32,
-          'text': "其他",
-          'total': 100,
-          'value': "0",
-         },
-       ],
->>>>>>> 30c9f6aee676707746ad5265ca62f6ecba845c15
       countData: {
        department_count:24,
        device_online_count:31,