diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue
index 34a502be..cfb4b54b 100644
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/yanzhu-bigscreen/src/components/header.vue
@@ -23,18 +23,9 @@
                                     <button type="button" :class="nav == 308 ? 'active' : ''" class="sub-btn" @click="doNav(308)">施工电梯监测</button>
                                 </div>
                                 <div class="header-btn-list-padding menu-row1" style="text-align: left;">
-<<<<<<< HEAD
-                                    <button type="button" :class="nav == 309 ? 'active' : ''" class="sub-btn"
-                                        @click="doNav(309)">视频监控</button>
-                                    <button type="button" :class="nav == 310 ? 'active' : ''" class="sub-btn"
-                                        @click="doNav(310)">AI预警</button>
-                                    <button type="button" :class="nav == 311 ? 'active' : ''" class="sub-btn"
-                                        @click="doNav(311)">标准化管理</button>
-=======
                                     <button type="button" :class="nav == 309 ? 'active' : ''" class="sub-btn" @click="doNav(309)">视频监控</button>
-                                    <button type="button" :class="nav == 310 ? 'active' : ''" class="sub-btn" @click="doNav(310)">AI测控</button>
+                                    <button type="button" :class="nav == 310 ? 'active' : ''" class="sub-btn" @click="doNav(310)">AI预警</button>
                                     <button type="button" :class="nav == 311 ? 'active' : ''" class="sub-btn" @click="doNav(311)">标准化管理</button>
->>>>>>> 73fd57044f093b7a1819035a572efe8a70a36234
                                 </div>
                             </div>
                         </div>
@@ -205,16 +196,11 @@ export default {
                     this.$router.push('/towerCrane')
                     break
                 case 306:
-<<<<<<< HEAD
-                    this.$router.push("/powerIot");
-                    break;
-                case 310:
-                    this.$router.push("/aiWarning");
-                    break; 
-=======
                     this.$router.push('/powerIot')
                     break
->>>>>>> 73fd57044f093b7a1819035a572efe8a70a36234
+                case 310:
+                    this.$router.push('/aiWarning')
+                    break
                 case 4:
                     this.$router.push('/prjQuality')
                     break