Resolved merge conflicts with origin/master

src/api/electronic/index.js

@@ -99,3 +99,11 @@ export function carDel(data) {
   })
 }
 
+// 解绑车辆
+export function carButton() {
+  return request({
+    url: '/electronic/carFence/aaa',
+    method: 'post',
+  })
+}
+

src/router/index.js

@@ -90,6 +90,7 @@ export const constantRoutes = [
   },
 
 
+
 ]
 
 // 动态路由，基于用户权限动态去加载

src/views/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container home">
     <h1 style="text-align: center ;color: #0072c6 ; font-size: 50px;font-weight: bold"> Ⅷ  智汇车联 </h1>
     <h2 style="text-align: right ;color: #1f2d3d; font-size: 20px">开发小组:八组</h2>
+    <button @click="carButton">111</button>
 
     <div>
       <el-chart :options="chartOptions"></el-chart>
@@ -26,6 +27,7 @@ import 'echarts-gl';
 import { ElChart } from 'element-ui';
 //引入 echarts
 import echarts from 'echarts'
+import { carButton } from '@/api/electronic'
 
 export default {
   components: {
@@ -35,9 +37,9 @@ export default {
     return {
       modules: [
         { id: 1, content: '车辆系统管理', pageUrl: '/car/information' },
-        { id: 2, content: '车辆故障管理', pageUrl: '/page2-url' },
-        { id: 3, content: '电子围栏管理', pageUrl: '/page3-url' },
-        { id: 4, content: '车辆预警管理', pageUrl: '/page4-url' }
+        { id: 2, content: '车辆故障管理', pageUrl: '/fault/faultrule' },
+        { id: 3, content: '电子围栏管理', pageUrl: '/carFence/fence' },
+        { id: 4, content: '车辆预警管理', pageUrl: '/platform/strategy' }
       ],
       myChart: '',
       chartOptions(){
@@ -56,6 +58,11 @@ export default {
     this.drawLine();
   },
   methods: {
+    carButton(){
+      carButton(res=>{
+        alert(res)
+      })
+    },
     navigateToPage(url) {
       this.$router.push(url);
     },