-
@@ -333,13 +42,13 @@
import html2canvas from 'html2canvas'
import jsPDF from 'jspdf'
import TitleWithCircle from '@/components/top/index';
- import {
- statistical,
- } from '@/api/information'
import * as echarts from 'echarts'
import {
- async
- } from 'q';
+ resourceQuantityGrowth,
+ resourceDistributionStatistics,
+ resourceSituationProportion,
+ resourceUtilizationProportion,
+ } from '@/api/newly.js'
export default {
components: {
TitleWithCircle,
@@ -381,376 +90,53 @@
},
mounted() {
-
- // this.charDam1()
- // this.charDam2()
- // this.charDam3()
- // this.charDam4()
- // this.charDam5()
-
- // this.charDam7()
-
- // this.charDam9()
},
methods: {
- charDam(datas) {
- let Dom = this.$refs.shop2TJ
- let myChart = echarts.init(Dom)
- let processedData = datas.map(item => ({
- name: item.trendDate,
- value: item.trendQuantity
- }))
- let option = {
- legend: {},
- tooltip: {},
- xAxis: {
- type: 'category',
- data: processedData.map(item => item.name),
- },
- yAxis: {
- type: 'value',
- },
- grid: {
- left: '1%',
- right: '1%',
- top: '5%',
- bottom: '6%',
- containLabel: true
- },
- series: [{
- type: 'bar',
- color: '#3f9b6a',
- data: processedData.map(item => item.value),
- }]
- };
- option && myChart.setOption(option);
- },
- charDam1(datas) {
- let Dom = this.$refs.shop1ZX
- let myChart = echarts.init(Dom);
-
- let processedData = datas.map(item => ({
- name: item.trendDate || '11',
- value: item.trendQuantity
- }))
- processedData.push({
- name: '',
- value: 0
- })
- let option = {
- xAxis: {
- type: 'category',
- data: ['商铺', '场地', '广告位'],
- },
- yAxis: {
- type: 'value',
- max: 50
- },
- grid: {
- left: '1%',
- right: '5%',
- top: '5%',
- bottom: '6%',
- containLabel: true
- },
- series: [{ // 设置线条颜色
- lineStyle: {
- color: '#3f9b6a', // 这里设置为红色
- width: 2, // 线条宽度
- },
- data: processedData.map(item => item.value),
- type: 'line'
- }]
+ initecharts1(datas) {
+ console.error(datas)
+ let allx = []
+ let list1 = {
+ cent:[],
+ name:'商铺资源',
}
- option && myChart.setOption(option);
- },
- charDam2(datas) {
- let Dom = this.$refs.shop2BT
- let myChart = echarts.init(Dom);
- let processedData = datas.map(item => ({
- name: item.trendDate,
- value: item.trendQuantity
- }))
-
-
- let option = {
- tooltip: {
- trigger: 'item'
- },
- legend: {
- top: '5%',
- left: 'right'
- },
- series: [{
- type: 'pie',
- radius: ['40%', '70%'],
- avoidLabelOverlap: false,
- itemStyle: {
- borderRadius: 10,
- borderColor: '#fff',
- borderWidth: 2
- },
- label: {
- show: false,
- position: 'center'
- },
- emphasis: {
- label: {
- show: true,
- fontSize: 40,
- fontWeight: 'bold'
- }
- },
- labelLine: {
- show: false
- },
- color: ['#3f9b6a', 'rgb(61,182,211)'],
- data: processedData,
- }]
+ for (let index = 0; index < datas.shopTrend.length; index++) {
+ const element = datas.shopTrend[index];
+ allx.push(element.trendDate)
+ list1.cent.push(element.trendQuantity)
}
- option && myChart.setOption(option);
- },
- charDam3(datas) {
- let Dom = this.$refs.shop1TJ
- let myChart = echarts.init(Dom);
-
- let processedData = datas.map(item => ({
- // name: item.trendDate || '11',
- value: item.trendQuantity
- }))
+ let Dom = this.$refs.echarts1
+ let myChart = echarts.init(Dom);
let option = {
- legend: {},
- tooltip: {},
- xAxis: {
- type: 'category',
- data: ['商铺', '场地', '广告位'],
- },
- yAxis: {
- type: 'value',
- max: 50
- },
grid: {
- left: '1%',
- right: '1%',
- top: '5%',
+ top: '3%',
+ left: '6%',
+ right: '6%',
bottom: '6%',
- containLabel: true
},
- series: [{
- type: 'bar',
- color: '#3f9b6a',
- data: processedData.map(item => item.value),
- type: 'line'
- }, ]
- };
- option && myChart.setOption(option);
- },
- // charDam4() {
- // let Dom = this.$refs.shop4ZX
- // let myChart = echarts.init(Dom);
- // let option = {
- // xAxis: {
- // type: 'category',
- // data: ['2024-07', '2024-08', '2024-09', '2024-10', '2024-11', '2024-12', '2024-13']
- // },
- // yAxis: {
- // type: 'value'
- // },
- // grid: {
- // left: '1%',
- // right: '1%',
- // top: '5%',
- // bottom: '6%',
- // containLabel: true
- // },
- // series: [{ // 设置线条颜色
- // lineStyle: {
- // color: '#3f9b6a', // 这里设置为红色
- // width: 2, // 线条宽度
- // },
- // data: [0,0, 0, 1, 0, 0],
- // type: 'line'
- // }]
- // }
- // option && myChart.setOption(option);
-
- // },
- // charDam5() {
- // let Dom = this.$refs.shop4TJ
- // let myChart = echarts.init(Dom);
- // let option = {
- // tooltip: {
- // trigger: 'axis',
- // axisPointer: {
- // type: 'shadow'
- // }
- // },
- // grid: {
- // left: '3%',
- // right: '4%',
- // bottom: '3%',
- // containLabel: true
- // },
- // xAxis: {
- // type: 'value',
- // boundaryGap: [0, 0.01]
- // },
- // yAxis: {
- // type: 'category',
- // data: ['商户A', '商户B', '商户C', '商户D', '商户E', ]
- // },
- // series: [{
- // lineStyle: {
- // color: '#3f9b6a', // 这里设置为红色
- // width: 2, // 线条宽度
- // },
- // name: '2011',
- // type: 'bar',
- // data: [2, 4, 5, 4, 1, 5]
- // }]
- // };
- // option && myChart.setOption(option);
- // },
- charDam6(datas) {
-
- let Dom = this.$refs.shop5ZX
- let myChart = echarts.init(Dom)
- let processedData = datas.map(item => ({
- name: item.trendDate,
- value: item.trendQuantity
- }))
- let option = {
xAxis: {
type: 'category',
- data: processedData.map(item => item.name),
+ boundaryGap: false,
+ data: allx
},
yAxis: {
type: 'value'
},
- grid: {
- left: '1%',
- right: '1%',
- top: '5%',
- bottom: '6%',
- containLabel: true
- },
- series: [{ // 设置线条颜色
- lineStyle: {
- color: '#3f9b6a', // 这里设置为红色
- width: 2, // 线条宽度
- },
- data: processedData.map(item => item.value),
- type: 'line'
- }]
- }
- option && myChart.setOption(option);
-
-
- },
- charDam7(datas) {
- let Dom = this.$refs.shop5BT
- let myChart = echarts.init(Dom);
-
- let processedData = datas.map(item => ({
- name: '签约数',
- value: item.trendQuantity
- }))
-
- // processedData.push({name:'签约数',value:0})
- let option = {
- tooltip: {
- trigger: 'item'
- },
- legend: {
- top: '5%',
- left: 'center'
- },
- series: [{
- type: 'pie',
- radius: ['40%', '70%'],
- avoidLabelOverlap: false,
- itemStyle: {
- borderRadius: 10,
- borderColor: '#fff',
- borderWidth: 2
- },
- label: {
- show: false,
- position: 'center'
- },
- emphasis: {
- label: {
- show: true,
- fontSize: 40,
- fontWeight: 'bold'
- }
- },
- labelLine: {
- show: false
+ series: [
+ {
+ name: list1.name,
+ type: 'line',
+ stack: 'Total',
+ data: list1.cent
},
- data: processedData
- }]
- }
+
+ ]
+ };
option && myChart.setOption(option);
},
-
- // charDam9(){
-
- // let Dom = this.$refs.shop3TJ
- // let myChart = echarts.init(Dom);
- // let option = {
- // tooltip: {
- // trigger: 'axis',
- // axisPointer: {
- // type: 'shadow'
- // }
- // },
- // grid: {
- // left: '3%',
- // right: '4%',
- // bottom: '3%',
- // containLabel: true
- // },
- // xAxis: {
- // type: 'value',
- // boundaryGap: [0, 0.01]
- // },
- // yAxis: {
- // type: 'category',
- // data: ['商户A', '商户B', '商户C', '商户D', '商户E', ]
- // },
- // series: [{
- // lineStyle: {
- // color: '#3f9b6a', // 这里设置为红色
- // width: 2, // 线条宽度
- // },
- // name: '2011',
- // type: 'bar',
- // data: [1, 2, 3, 4, 5, 10]
- // }]
- // };
- // option && myChart.setOption(option);
-
- // },
-
async getAll() {
- const res = await statistical(this.pageindex)
- console.log(res)
- this.charDam(res.data.seekingIntentionStatistics)
- this.charDam2(res.data.seekingIntentionStatistics)
- this.charDam6(res.data.contractTrend)
-
- this.charDam7(res.data.basicQueryTrends)
- let trends = [...res.data.shopTrend, ...res.data.venueTrend, ...res.data.advertisingTrend]
-
- this.charDam1(trends)
- this.charDam3(trends)
- },
- handleSizeChange() {
-
- },
- handleCurrentChange() {
-
+ const res1 = await resourceQuantityGrowth({...this.pageindex})
+ console.log(res1.data)
+ this.initecharts1(res1.data)
},
resetting() {
let today = new Date();
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 157e209..c62f778 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -195,7 +195,7 @@
},
tableData: [],
total: 0,
- onaction: '1',
+ onaction: '2',
formInline: {},
}
},
diff --git a/admin-web-master/src/views/serve/PerWorkstation/index.vue b/admin-web-master/src/views/serve/PerWorkstation/index.vue
index f97beb1..aae4d1a 100644
--- a/admin-web-master/src/views/serve/PerWorkstation/index.vue
+++ b/admin-web-master/src/views/serve/PerWorkstation/index.vue
@@ -35,22 +35,22 @@
)
" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
style="width: 100%">
-
+
{{scope.$index+1}}
-
-
-
-
+
+
+
-
-
-
+
-
-
+
-
-
- 立即发布
-
-
-
-
-
-
+
+
+ 立即发布
+
+
+
+
+
+
+
+
+
-
+