diff --git a/src/components/module/module-one-1-1.vue b/src/components/module/module-one-1-1.vue index 317ba30..fd4034e 100644 --- a/src/components/module/module-one-1-1.vue +++ b/src/components/module/module-one-1-1.vue @@ -1,22 +1,54 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/pages/components/BorderBox1.vue b/src/pages/components/BorderBox1.vue index b8416c6..fd658f4 100644 --- a/src/pages/components/BorderBox1.vue +++ b/src/pages/components/BorderBox1.vue @@ -1,77 +1,76 @@ + + + \ No newline at end of file diff --git a/src/pages/components/BorderBox3.vue b/src/pages/components/BorderBox3.vue new file mode 100644 index 0000000..ad12be8 --- /dev/null +++ b/src/pages/components/BorderBox3.vue @@ -0,0 +1,129 @@ + + + + + \ No newline at end of file diff --git a/src/pages/components/BorderBox4.vue b/src/pages/components/BorderBox4.vue new file mode 100644 index 0000000..34c4645 --- /dev/null +++ b/src/pages/components/BorderBox4.vue @@ -0,0 +1,144 @@ + + + + + \ No newline at end of file diff --git a/src/pages/components/BorderBox5.vue b/src/pages/components/BorderBox5.vue new file mode 100644 index 0000000..7def0f4 --- /dev/null +++ b/src/pages/components/BorderBox5.vue @@ -0,0 +1,223 @@ + + + + + \ No newline at end of file diff --git a/src/pages/components/BorderBox6.vue b/src/pages/components/BorderBox6.vue index f95a343..f2c0584 100644 --- a/src/pages/components/BorderBox6.vue +++ b/src/pages/components/BorderBox6.vue @@ -56,24 +56,26 @@ export default { colorRight:{ type:String, default:'#2cf7fe' - }, - width:{ - type:Number, - default:150 - }, - height:{ - type:Number, - default:150 - } + }, }, data() { return { - + width:150, + height:150 }; }, mounted() { - + this.$nextTick(()=>{ + let resizeObserver = new ResizeObserver(els=>{ + if(els.length>0){ + let el=els[0]; + this.width=el.contentRect?.width||150; + this.height=el.contentRect?.height||150; + } + }); + resizeObserver.observe(this.$parent.$el); + }); }, methods: { diff --git a/src/pages/init.js b/src/pages/init.js index 31b9560..cb66cbd 100644 --- a/src/pages/init.js +++ b/src/pages/init.js @@ -7,12 +7,14 @@ import {tryToJson} from '../utils/tools' import H265Player from '../components/h265-player/index' import { Loading } from 'element-ui'; import BorderBox6 from './components/BorderBox6.vue' +import BorderBox1 from './components/BorderBox1.vue' import moduleOne11 from '../components/module/module-one-1-1.vue' Loading.install(Vue); H265Player.install(Vue); dayfilter(Vue); const vue=new Vue(); Vue.component("border-box6",BorderBox6) +Vue.component("border-box1",BorderBox1) Vue.component("module-one-1-1",moduleOne11) Vue.prototype.$api=Api; Vue.prototype.$bus=vue; diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index e4cf558..57a3b25 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -9,35 +9,35 @@
- + - + - + - + - + - + - + - + - +