--no commit message

@@ -29,12 +29,12 @@
   </div>
 </template>
 <script>
-// 定时任务
-import data from "./data"
-import sjsbTask from '@/api/sjsbTask.js'
-import tableMixin from '@/mixins/tableMixin.js'
-import addTask from '../components/addTask.vue'
-export default {
+  // 定时任务
+  import data from "./data"
+  import sjsbTask from '@/api/sjsbTask.js'
+  import tableMixin from '@/mixins/tableMixin.js'
+  import addTask from '../components/addTask.vue'
+  export default {
     name: "timedTask",
     mixins: [tableMixin],
     components: {
@@ -248,8 +248,8 @@ export default {
           })
       }
     }
-}
+  }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
 </style>

@@ -408,9 +408,5 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-<<<<<<< HEAD
   @import "~@/styles/mixin.scss";
-=======
-@import "~@/styles/mixin.scss";
->>>>>>> 7c233183698a503df659c8b6cf28f340f4de3587
 </style>