Skip to content

M
mes-ui
Commit 76c4a34c authored by 周远喜's avatar 周远喜
Browse files
Options

ok

parent a1ad66df
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
pages/project/project/index.vue
View file @ 76c4a34c
...@@ -113,9 +113,6 @@ ...@@ -113,9 +113,6 @@
</Card> </Card>
</template> </template>
</DataGrid> </DataGrid>
<<<<<<< HEAD
<Modal v-model="modal" :title="title" width="1200" footer-hide :mask-closable="false" >
=======
<Modal <Modal
v-model="modal" v-model="modal"
:title="title" :title="title"
...@@ -124,7 +121,6 @@ ...@@ -124,7 +121,6 @@
:mask-closable="false" :mask-closable="false"
:fullscreen="fullscreen" :fullscreen="fullscreen"
> >
>>>>>>> d2663a62c98f5257aee5b0294c066fda5b9d4d6d
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment