diff --git a/src/components/charts/line/index.js b/src/components/charts/line/index.js index 7a4df22..34bd4d2 100644 --- a/src/components/charts/line/index.js +++ b/src/components/charts/line/index.js @@ -20,6 +20,18 @@ export default { } ]; } + }, + color: { + type: Array, + default: function () { + return ['rgba(134, 91, 252, 1)', 'rgba(26, 106, 226, 0.5)', 'rgba(26, 106, 226, 0)'] + } + }, + areaStyle: { + type: Array, + default: function () { + return ['rgba(134, 91, 252, 1)', 'rgba(26, 106, 226, 0.5)', 'rgba(26, 106, 226, 0)'] + } } }, data () { @@ -47,6 +59,7 @@ export default { this.chartSetOption(); }, chartSetOption () { + let xAxisData = []; let data = []; this.data.forEach(item => { @@ -72,15 +85,15 @@ export default { color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ { offset: 1, - color: "rgba(134, 91, 252, 1)", + color: this.color[0], }, { offset: 0.5, - color: "rgba(26, 106, 226, 0.5)", + color: this.color[1], }, { offset: 0, - color: "rgba(26, 106, 226, 0)", + color: this.color[2], }, ]), }, @@ -134,32 +147,30 @@ export default { ], series: [ { - name: "", type: "line", smooth: true, - // symbol: "circle", symbolSize: 12, itemStyle: { normal: { - color: "#0092f6", + color: this.color[0], lineStyle: { - color: "#0092f6", + color: this.color[0], width: 1, }, areaStyle: { color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ { offset: 1, - color: "rgba(134, 91, 252, 1)", + color: this.areaStyle[0], }, { offset: 0.5, - color: "rgba(26, 106, 226, 0.5)", + color: this.areaStyle[1], }, { offset: 0, - color: "rgba(26, 106, 226, 0)", + color: this.areaStyle[2], }, ]), }, diff --git a/src/views/property/comps/buttom/1/data.js b/src/views/property/comps/buttom/1/data.js index 33dd7a4..3301af3 100644 --- a/src/views/property/comps/buttom/1/data.js +++ b/src/views/property/comps/buttom/1/data.js @@ -2,33 +2,40 @@ export default [ [ { show: true, - name: '农用地(亩)', + name: '长期投资(万)', value: '716' }, { show: true, - name: '建设用地(亩)', - value: '716' + name: '短期投资(万)', + value: '103' }, { show: true, - name: '未利用地(亩)', + name: '应收款(万)', value: '716' + } + ], + [ + { + show: true, + name: '库存物资(万)', + value: '301' }, { show: true, - name: '农用地(宗)', - value: '716' + name: '生物资产(万)', + value: '103' }, { show: true, - name: '建设用地(宗)', + name: '固定资产(万)', value: '716' }, { show: true, - name: '未利用地(宗)', - value: '103' + name: '无形资产(万)', + value: '716' } ] ] \ No newline at end of file diff --git a/src/views/property/comps/buttom/1/index.html b/src/views/property/comps/buttom/1/index.html index 6d8e753..5fb34bd 100644 --- a/src/views/property/comps/buttom/1/index.html +++ b/src/views/property/comps/buttom/1/index.html @@ -1,9 +1,8 @@
- - - - -
- -
+
+ +
+
+ +
\ No newline at end of file diff --git a/src/views/property/comps/buttom/1/index.scss b/src/views/property/comps/buttom/1/index.scss index fb1b8a3..ead0cc3 100644 --- a/src/views/property/comps/buttom/1/index.scss +++ b/src/views/property/comps/buttom/1/index.scss @@ -1,16 +1,13 @@ .buttom2 { - width: 960px; + width: 860px; - table { + .line { width: 100%; + display: flex; + justify-content: center; - tr { - width: 100%; - - td { - - width: 16.6%; - } + .item { + margin: 0px 20px; } } } \ No newline at end of file diff --git a/src/views/property/comps/left/bottom/2/index.html b/src/views/property/comps/left/bottom/2/index.html index 15a02f7..3501bd3 100644 --- a/src/views/property/comps/left/bottom/2/index.html +++ b/src/views/property/comps/left/bottom/2/index.html @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/views/property/comps/left/bottom/2/index.js b/src/views/property/comps/left/bottom/2/index.js index 3b95b31..36ea38d 100644 --- a/src/views/property/comps/left/bottom/2/index.js +++ b/src/views/property/comps/left/bottom/2/index.js @@ -1,16 +1,12 @@ import Pannel from '@/components/pannel/index.vue'; -import ScrollTable from '@/components/scroll-table/index.vue'; +import Lines from '@/components/charts/line/index.vue'; export default { components: { - ScrollTable, + Lines, Pannel }, data () { return { - headers: ['资源名称', '类别', '面积(亩)', '部门'], - data: [ - ['资源名称', '类别', '面积(亩)', '部门'] - ] }; } }; diff --git a/src/views/property/comps/right/bottom/2/index.html b/src/views/property/comps/right/bottom/2/index.html index 5c56209..72c9d71 100644 --- a/src/views/property/comps/right/bottom/2/index.html +++ b/src/views/property/comps/right/bottom/2/index.html @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/views/property/comps/right/bottom/2/index.js b/src/views/property/comps/right/bottom/2/index.js index 1b2fd92..00455d1 100644 --- a/src/views/property/comps/right/bottom/2/index.js +++ b/src/views/property/comps/right/bottom/2/index.js @@ -7,8 +7,8 @@ export default { }, data () { return { - headers: ['合同编码', '合同名称', '合同截止日期', '部门'], - data: [['合同编码', '合同名称', '合同截止日期', '部门']] + headers: ['经济组织名称', '债务金额', '债务率'], + data: [['经济组织名称', '债务金额', '21%']] }; }, created () { diff --git a/src/views/property/comps/right/middle/1/index.js b/src/views/property/comps/right/middle/1/index.js index f03e899..a6d9491 100644 --- a/src/views/property/comps/right/middle/1/index.js +++ b/src/views/property/comps/right/middle/1/index.js @@ -27,5 +27,8 @@ export default { mounted () { }, methods: { + tabChange () { + + } } }; diff --git a/src/views/property/comps/right/middle/2/index.html b/src/views/property/comps/right/middle/2/index.html index f1d0bae..0087236 100644 --- a/src/views/property/comps/right/middle/2/index.html +++ b/src/views/property/comps/right/middle/2/index.html @@ -1,4 +1,12 @@ - - + + +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/views/property/comps/right/middle/2/index.js b/src/views/property/comps/right/middle/2/index.js index 1b2fd92..4e04619 100644 --- a/src/views/property/comps/right/middle/2/index.js +++ b/src/views/property/comps/right/middle/2/index.js @@ -1,14 +1,26 @@ import Pannel from '@/components/pannel/index.vue'; import ScrollTable from '@/components/scroll-table/index.vue'; +import PannelTabs from '@/components/pannel-tabs/index.vue'; export default { components: { + PannelTabs, ScrollTable, Pannel }, data () { return { - headers: ['合同编码', '合同名称', '合同截止日期', '部门'], - data: [['合同编码', '合同名称', '合同截止日期', '部门']] + pannelData: [ + { + id: '1', + name: '减少' + }, + { + id: '2', + name: '增加' + }, + ], + headers: ['部门名称', '债务金额', '排名'], + data: [['部门名称', '债务金额', '1']] }; }, created () { @@ -16,5 +28,8 @@ export default { mounted () { }, methods: { + tabChange () { + + } } }; diff --git a/src/views/property/comps/right/top/2/index.html b/src/views/property/comps/right/top/2/index.html index d47cd90..6575384 100644 --- a/src/views/property/comps/right/top/2/index.html +++ b/src/views/property/comps/right/top/2/index.html @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/views/property/comps/right/top/2/index.js b/src/views/property/comps/right/top/2/index.js index 3166123..b0115ff 100644 --- a/src/views/property/comps/right/top/2/index.js +++ b/src/views/property/comps/right/top/2/index.js @@ -7,8 +7,8 @@ export default { }, data () { return { - headers: ['合同编码', '合同名称', '预结款日期', '结款金额', '部门'], - data: [['合同编码', '合同名称', '预结款日期', '结款金额', '部门']] + headers: ['部门名称', '债务金额', '排名'], + data: [['部门名称', '债务金额', '1']] }; }, created () {