new

src/views/dashboard/index.vue

@@ -3,7 +3,11 @@
     <div class="dashboard-container">
       <div class="sudoku_row" >
         <div class="dashboard-text" style="color:white">用户名：{{ name }}</div>
+<<<<<<< HEAD
         <el-divider content-position="right" style="margin:24px">消息通知</el-divider>
+=======
+        <el-divider content-position="right">消息通知</el-divider>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-card v-for="(sudoku,index) in sudokus" :class="curSelect === sudoku.id?'opacity':''" :key="index+9999" shadow="hover" class="sudoku_item ">
           <div>
             <el-badge :value="sudoku.value">
@@ -12,10 +16,17 @@
             </el-badge>
           </div>
         </el-card>
+<<<<<<< HEAD
         <el-divider content-position="right" style="margin:24px"/>
 
         <div v-for="(value1,index1) in fathers" :key="index1" style="width:100%">
           <el-divider content-position="left" style="margin:24px">{{ value1.title }}</el-divider>
+=======
+        <el-divider content-position="right"/>
+
+        <div v-for="(value1,index1) in fathers" :key="index1" style="width:100%">
+          <el-divider content-position="left">{{ value1.title }}</el-divider>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <router-link v-for="(value2,index2) in sons" v-if="value2.pid === value1.id" :key="index2" :to="value2.path">
             <el-card shadow="hover" class="sudoku_item" style="height:150px;width:170px;margin: 5px;display: inline-block;background: rgba(255,255,255,0.4)">
               <svg-icon :icon-class="value2.icon" :style="{color:Color(index2)}" class="bgc" style="display:block;margin: auto;border: 0 solid black;width:70px;height:70px"/><br>
@@ -149,7 +160,10 @@ export default {
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
+<<<<<<< HEAD
 
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   /*.text {*/
     /*font-size: 14px;*/
   /*}*/