diff --git a/src/assets/images/shuju/renfang/house-logo.png b/src/assets/images/shuju/renfang/house-logo.png
new file mode 100644
index 000000000..4ebb8c86c
Binary files /dev/null and b/src/assets/images/shuju/renfang/house-logo.png differ
diff --git a/src/assets/scss/dataBoard/bread.scss b/src/assets/scss/dataBoard/bread.scss
index 62d666431..57fd47a13 100644
--- a/src/assets/scss/dataBoard/bread.scss
+++ b/src/assets/scss/dataBoard/bread.scss
@@ -38,6 +38,10 @@
padding: 0 5px;
}
}
+ .router_parents:hover {
+ cursor: pointer;
+ }
+
.router_child{
line-height: 25px;
diff --git a/src/views/dataBoard/cpts/screen-echarts-frame/index.vue b/src/views/dataBoard/cpts/screen-echarts-frame/index.vue
new file mode 100644
index 000000000..11b9fd232
--- /dev/null
+++ b/src/views/dataBoard/cpts/screen-echarts-frame/index.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
diff --git a/src/views/dataBoard/renfang/cpts/fwBarOption.js b/src/views/dataBoard/renfang/cpts/fwBarOption.js
new file mode 100644
index 000000000..9ae582204
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/fwBarOption.js
@@ -0,0 +1,130 @@
+import * as echarts from 'echarts'
+export function barOption () {
+
+ return {
+ title: {
+ text: '单位(户)',
+ left: 5,
+ textStyle: {
+
+ fontSize: 14,
+ color: " rgba(255,255,255,0.65)",
+ fontWeight: 400,
+ },
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ // legend: {},
+ grid: {
+ top:40,
+ left: '3%',
+ right: '4%',
+ bottom: 19,
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisLine: {
+ lineStyle: {
+ color:'rgba(255,255,255,0.15)',
+ width: 1,
+ type: 'solid'
+ }
+ },
+ axisTick: {
+ alignWithLabel: true
+ },
+ axisLabel: {
+ show: true,
+ textStyle: {
+ color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+ fontSize : 12 //更改坐标轴文字大小
+ }
+ },
+
+ data: []
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ max : 1000,
+ splitNumber : 5,
+ splitLine: {
+ show: true,
+ lineStyle:{
+ color:'rgba(255,255,255,0.15)',
+ width: 1,
+ type: 'solid'
+ }
+ },
+ axisLabel: {
+ show: true,
+ textStyle: {
+ color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+ fontSize : 12 //更改坐标轴文字大小
+ }
+ },
+ }
+ ],
+ series: [
+
+ {
+ name: '自住房屋',
+ type: 'bar',
+ stack: 'Ad',
+ barWidth:12,
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#6FDEFF' },
+ { offset: 1, color: 'rgba(168,241,255,0)' }
+ ])
+ },
+ data: []
+ },
+ {
+ name: '出租房屋',
+ type: 'bar',
+ barWidth:12,
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#1A95FF' },
+ { offset: 1, color: 'rgba(168,241,255,0)' }
+ ])
+ },
+ data: []
+ },
+ {
+ name: '闲置房屋',
+ type: 'bar',
+ barWidth:12,
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#FFAA00' },
+ { offset: 1, color: 'rgba(168,241,255,0)' }
+ ])
+ },
+ data: []
+ },
+
+
+ ]
+
+ }
+}
diff --git a/src/views/dataBoard/renfang/cpts/fwPieOption.js b/src/views/dataBoard/renfang/cpts/fwPieOption.js
new file mode 100644
index 000000000..c7ca041d4
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/fwPieOption.js
@@ -0,0 +1,93 @@
+import * as echarts from 'echarts'
+export function pieOption() {
+ const center = ["50%", "170px"];
+ return {
+ title: {
+ text: "0",
+ top: 45,
+ left: "center",
+ textStyle: {
+ width: "100%",
+ fontSize: 24,
+ color: "#FFFFFF",
+ fontWeight: 400,
+ },
+ itemGap: 5,
+ // subtext: "总数",
+ // subtextStyle: {
+ // fontSize: 20,
+ // color: "#fff",
+ // fontWeight: 400,
+ // },
+ },
+ tooltip: {
+ show: false,
+ },
+ // legend: {
+ // top: 350,
+ // bottom: 0,
+ // itemWidth: 20,
+ // itemHeight: 10,
+ // textStyle: {
+ // color: '#D2E7FF',
+ // fontSize: 16,
+ // lineHeight: 20,
+ // },
+
+ // },
+ series: [
+ {
+ name: 'Access From',
+ type: 'pie',
+ radius: ['60%', '90%'],
+ avoidLabelOverlap: false,
+ label: {
+ show: false,
+ position: 'center'
+ },
+ // emphasis: {
+ // label: {
+ // show: true,
+ // fontSize: 40,
+ // fontWeight: 'bold'
+ // }
+ // },
+ labelLine: {
+ show: false
+ },
+ itemStyle: {
+ normal: {
+ color: (list) => {
+ // 注意 !!!!! 这里的数组一定要和实际的类目长度相等或大于,不然会缺少颜色报错
+ var colorList = [
+ {
+ colorStart:'#00023A',
+ colorEnd:'#6FDEFF'
+ },
+ {
+ colorStart:'#00023A',
+ colorEnd:'#FFAA00'
+ },
+ {
+ colorStart:'#00023A',
+ colorEnd:'#1A95FF'
+ },
+
+ ]
+ return new echarts.graphic.LinearGradient(1, 0, 0, 0, [{ //左、下、右、上
+ offset: 0,
+ color: colorList[list.dataIndex]['colorStart']
+ }, {
+ offset: 1,
+ color: colorList[list.dataIndex]['colorEnd']
+ }])
+ }
+ }
+ },
+
+ data: [
+ ]
+ }
+ ]
+ };
+}
diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue
index edaf98176..bc382af13 100644
--- a/src/views/dataBoard/renfang/cpts/fwgl.vue
+++ b/src/views/dataBoard/renfang/cpts/fwgl.vue
@@ -1,9 +1,124 @@
- 房屋概览
+
+
+
+
+
+
+
+
+
+
+
+

+
房屋总数
+
+
+
+
+
+
+
+

+
自住房屋
+
+
+
+
+
+
+
+
+

+
出租房屋
+
+
+
+
+
+
+
+

+
闲置房屋
+
+
+
+
+
+
+
+
+
+
+

+
近一年房屋状态变化趋势图
+
+
+
+
+
+
自住房屋
+
+
出租房屋
+
+
闲置房屋
+
+
+
+
+
+
+
+
+
+
-
+