解决冲突

src/views/projectAdmin/zjsj/command/ReftThree.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <Card title="进度管理">
+      <div class="contentBox">
+        123
+      </div>
+    </Card>
+  </div>
+</template>
+
+<script>
+import Card from '../components/Card'
+export default {
+  components: { Card },
+  data() {
+    return { }
+  }
+}
+</script>
+
+<style lang="less" scoped></style>

src/views/projectAdmin/zjsj/command/rightTwo.vue

@@ -26,7 +26,6 @@
 
 <script>
 import Card from '../components/Card'
-
 import echarts from 'echarts4'
 
 export default {