|
@@ -1,5 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<div>
|
|
<div>
|
|
|
|
+<<<<<<< HEAD
|
|
home
|
|
home
|
|
<!-- <button @click="detailsModal = true">测试打开模态框</button> -->
|
|
<!-- <button @click="detailsModal = true">测试打开模态框</button> -->
|
|
<!-- 详细信息 -->
|
|
<!-- 详细信息 -->
|
|
@@ -37,12 +38,16 @@
|
|
</span> -->
|
|
</span> -->
|
|
</el-dialog>
|
|
</el-dialog>
|
|
</div>
|
|
</div>
|
|
|
|
+=======
|
|
|
|
+ <BulletBox :windowWidth="'150rem'" :windowHeight="'72rem'"></BulletBox>
|
|
|
|
+>>>>>>> 4c60367544f81037f455ba94b83a8e7cd6623afb
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
|
+import BulletBox from "@/components/bulletBox/index.vue"
|
|
export default {
|
|
export default {
|
|
- name: 'ScdProjectIndex',
|
|
|
|
|
|
+ components:{BulletBox},
|
|
|
|
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|