hebing

src/views/dashboard/index.vue

@@ -1,6 +1,5 @@
 <template>
     <div>
-<<<<<<< HEAD
         home
         <!-- <button @click="detailsModal = true">测试打开模态框</button> -->
         <!-- 详细信息 -->
@@ -24,8 +23,8 @@
                     <div class="inBoxRight">
                         <!-- 导航栏 -->
                         <div class="navigationBox">
-                            <template v-for="(item, index) in modalList">
-                                <p :class="['tabCard', { active: selectedIndex === index }]" @click="goUrl(item, index)">
+                            <template v-for="(item, index) in modalList" >
+                                <p :class="['tabCard', { active: selectedIndex === index }]" :key="item.url" @click="goUrl(item, index)">
                                     {{ item.name }}
                                 </p>
                             </template>
@@ -38,9 +37,6 @@
                 </span> -->
             </el-dialog>
         </div>
-=======
-        <BulletBox :windowWidth="'150rem'" :windowHeight="'72rem'"></BulletBox>
->>>>>>> 4c60367544f81037f455ba94b83a8e7cd6623afb
     </div>
 </template>