diff --git a/package.json b/package.json
index 0bf8326f1..03f705960 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
"turf": "^3.0.14",
"v-distpicker": "^1.2.2",
"vue": "^2.6.11",
+ "vue-awesome-swiper": "^3.1.3",
"vue-baidu-map": "^0.21.22",
"vue-i18n": "^8.12.0",
"vue-quill-editor": "^3.0.6",
diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss
index 5b348c199..5a03c302a 100644
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@@ -293,7 +293,9 @@
}
}
-
+.m-wtqd{
+ padding: 0 16px;
+}
@keyframes move {
from {
diff --git a/src/views/dataBoard/overview/components/jdjs.vue b/src/views/dataBoard/overview/components/jdjs.vue
index b8d015601..93c1d8c5a 100644
--- a/src/views/dataBoard/overview/components/jdjs.vue
+++ b/src/views/dataBoard/overview/components/jdjs.vue
@@ -146,7 +146,7 @@ export default {
getChartData() {
this.loading = true
- this.$http.get('/actual/base/resiCategory/intelligentPredictioncategoryCountList').then(({data: {data}}) => {
+ this.$http.get('/actual/base/resiCategory/categoryCountList').then(({data: {data}}) => {
this.initCharts(data)
})
},
@@ -156,12 +156,11 @@ export default {
let chartData = data.categoryList.map((item) => {
return {
name: resiCategoryMap[item.categoryName] || "",
- count: item.categoryCountNext,
+ count: item.categoryCount,
};
- });
+ }).slice(0,8);
let xData = chartData.map(item=>item.name);
let yData = chartData.map(item=>item.count)
- console.log(yData,xData);
let color = [[
{
offset: 0,
@@ -172,25 +171,6 @@ export default {
color: 'rgba(38, 244, 248, 1)' // 100% 处的颜色
}
]]
- // let seriesArray = series.map((item, index) => {
- // return {
- // name: item.name,
- // type: 'bar',
- // barWidth: 14,
- // itemStyle: {
- // opacity: 1,
- // color: new echarts.graphic.LinearGradient(
- // 0,
- // 1,
- // 0,
- // 0,
- // color[0],
- // false
- // )
- // },
- // data: item.data,
- // }
- // })
let num = yData
const max = Math.max(...num)
let barArray = new Array(xData.length).fill((parseInt(max / 100) + 1) * 100)
@@ -219,7 +199,18 @@ export default {
return res;
},
},
-
+ dataZoom: [
+ {
+ "type": "slider",
+ "start": 0,
+ "end": parseInt((5 / xData.length) * 10) / 10 * 100,
+ "height": 10,
+ "bottom": 0,
+ "showDetail": false,
+ "showDataShadow": false,
+ "borderColor": "transparent"
+ }
+ ],
grid: {
top: '18%',
left: '2%',
diff --git a/src/views/dataBoard/overview/components/wtqd.vue b/src/views/dataBoard/overview/components/wtqd.vue
new file mode 100644
index 000000000..18a00b15d
--- /dev/null
+++ b/src/views/dataBoard/overview/components/wtqd.vue
@@ -0,0 +1,292 @@
+
+