ok

76c4a34c · 周远喜 · a1ad66df · 76c4a34c
Commit 76c4a34c authored Oct 22, 2020 by 周远喜
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

index.vue pages/project/project/index.vue +0 -4

No files found.
--- a/pages/project/project/index.vue
+++ b/pages/project/project/index.vue
@@ -113,9 +113,6 @@
        </Card>
      </template>
    </DataGrid>
-<<<<<<< HEAD
-    <Modal v-model="modal" :title="title" width="1200" footer-hide  :mask-closable="false" >
-=======
    <Modal
      v-model="modal"
      :title="title"
@@ -124,7 +121,6 @@
      :mask-closable="false"
      :fullscreen="fullscreen"
    >
->>>>>>> d2663a62c98f5257aee5b0294c066fda5b9d4d6d
      <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
    </Modal>
  </div>