diff --git a/src/components/xEcharts/index.vue b/src/components/xEcharts/index.vue index 7d00e8c..84c0a40 100644 --- a/src/components/xEcharts/index.vue +++ b/src/components/xEcharts/index.vue @@ -27,7 +27,7 @@ option: { deep:true, handler (v) { - unwarp(this.myChart).setOption(v); + unwarp(this.myChart)&&unwarp(this.myChart).setOption(v); } } }, @@ -58,6 +58,10 @@ myChart.setOption(this.myOptions); this.myChart = myChart; window.addEventListener('resize', () => myChart.resize()); + }, + setEchartOption(){ + var myChart = echarts.init(this.$refs.xEcharts, 'T'); + myChart.setOption(this.myOptions); } } } diff --git a/src/views/home/widgets/components/StoreData.vue b/src/views/home/widgets/components/StoreData.vue new file mode 100644 index 0000000..81fe6eb --- /dev/null +++ b/src/views/home/widgets/components/StoreData.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/views/home/widgets/components/allDataFrom.vue b/src/views/home/widgets/components/allDataFrom.vue index ea2cb88..e1898a4 100644 --- a/src/views/home/widgets/components/allDataFrom.vue +++ b/src/views/home/widgets/components/allDataFrom.vue @@ -1,95 +1,21 @@ @@ -227,10 +205,13 @@ export default { display: flex; align-items: center; justify-content: space-between; + flex-wrap: wrap; } .card-item { width: 24%; + min-width: 246px; + /* margin-right: 10px; */ } .item-text { @@ -261,19 +242,43 @@ export default { position: relative; } -.progress-box .line { +.progress-box .line-box { height: 20px; width: 1px; position: absolute; - top: -6px; + top: -7px; z-index: 6; + + display: flex; + justify-content: space-between; + align-items: center; + flex-direction: column; +} + +.progress-box .line-box .line { background: #409EFF; + height: 3px; + width: 2px; } /* .el-progress--line { width: 350px } */ -::v-deep .el-progress{ - display:block; +::v-deep .el-progress { + display: block; +} + +@media screen and (max-width: 550px) { + .card-item { + width: 100%; + } +} + +@media (min-width:550px) and (max-width: 1115px) { + .card-item { + width: 48%; + min-width: 246px; + /* margin-right: 10px; */ + } } diff --git a/src/views/home/widgets/components/component/StoreInfo.vue b/src/views/home/widgets/components/component/StoreInfo.vue new file mode 100644 index 0000000..f9bdd89 --- /dev/null +++ b/src/views/home/widgets/components/component/StoreInfo.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/home/widgets/components/hotSearch.vue b/src/views/home/widgets/components/hotSearch.vue new file mode 100644 index 0000000..9c8a0b9 --- /dev/null +++ b/src/views/home/widgets/components/hotSearch.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/src/views/home/widgets/components/saleInfo.vue b/src/views/home/widgets/components/saleInfo.vue new file mode 100644 index 0000000..2df497a --- /dev/null +++ b/src/views/home/widgets/components/saleInfo.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/views/home/widgets/components/tool.js b/src/views/home/widgets/components/tool.js new file mode 100644 index 0000000..e05fec1 --- /dev/null +++ b/src/views/home/widgets/components/tool.js @@ -0,0 +1,4 @@ +const setMark=(num)=> { + return num.replace(/\B(?=(\d{3})+(?!\d))/g, ',') +} +export {setMark} \ No newline at end of file diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue index 77e0a6b..7ce7b1f 100644 --- a/src/views/home/widgets/index.vue +++ b/src/views/home/widgets/index.vue @@ -111,7 +111,7 @@ comp.disabled = true } } - console.log(allCompsList) + // console.log(allCompsList) return allCompsList }, myCompsList(){ @@ -222,7 +222,7 @@ border: 1px dashed var(--el-color-primary); padding: 15px; } - .customize-overlay {position: absolute;top:0;right:0;bottom:0;left:0;z-index: 1;display: flex;flex-direction: column;align-items: center;justify-content: center;background: rgba(255,255,255,0.9);cursor: move;} + .customize-overlay {position: absolute;top:0;right:0;bottom:0;left:0;z-index: 666;display: flex;flex-direction: column;align-items: center;justify-content: center;background: rgba(255,255,255,0.9);cursor: move;} .customize-overlay label {background: var(--el-color-primary);color: #fff;height:40px;padding:0 30px;border-radius: 40px;font-size: 18px;display: flex;align-items: center;justify-content: center;cursor: move;} .customize-overlay label i {margin-right: 15px;font-size: 24px;} .customize-overlay .close {position: absolute;top:15px;right:15px;}