tongshanglei 2 years ago
parent
commit
6359818bd1
1 changed files with 0 additions and 3 deletions
  1. 0 3
      src/views/dashboard/rladmin/index.vue

+ 0 - 3
src/views/dashboard/rladmin/index.vue

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