Commit b5e5fca5 authored by 仇晓婷's avatar 仇晓婷

Merge branch 'new-product' into product

parents 0a699746 4472d3bf
This diff is collapsed.
...@@ -123,14 +123,16 @@ ...@@ -123,14 +123,16 @@
> >
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
<!-- width="800" -->
<Modal <Modal
v-model="modal1" v-model="modal1"
title="查看附件" title="查看附件"
width="800" fullscreen
footer-hide footer-hide
:mask-closable="false" :mask-closable="false"
> >
<FilesView ref="refFile" :parms="parms" /> <FilesViewer :parms="parms"/>
<!-- <FilesView ref="refFile" :parms="parms" /> -->
</Modal> </Modal>
</div> </div>
</template> </template>
......
...@@ -77,6 +77,7 @@ import Pictrue from '@/components/page/pictrue.vue' ...@@ -77,6 +77,7 @@ import Pictrue from '@/components/page/pictrue.vue'
import WordTree from '@/components/page/wordTree.vue' import WordTree from '@/components/page/wordTree.vue'
import Actions from '@/components/page/actions.vue' import Actions from '@/components/page/actions.vue'
import TimeDifference from '@/components/page/timeDifference.vue' import TimeDifference from '@/components/page/timeDifference.vue'
import FilesViewer from '@/components/page/filesViewer.vue'
...@@ -159,7 +160,7 @@ Vue.component("WordTree", WordTree) ...@@ -159,7 +160,7 @@ Vue.component("WordTree", WordTree)
Vue.component("Actions", Actions) Vue.component("Actions", Actions)
Vue.component("TimeDifference", TimeDifference) Vue.component("TimeDifference", TimeDifference)
Vue.component("Life", Life) Vue.component("Life", Life)
Vue.component("FilesViewer",FilesViewer)
//注入mock //注入mock
......
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