浏览代码

合并本地

weiximei 6 年前
父节点
当前提交
e99c6ce490

+ 1
- 1
VUECODE/smart-property-manage/config/dev.env.js 查看文件

4
 
4
 
5
 module.exports = merge(prodEnv, {
5
 module.exports = merge(prodEnv, {
6
   NODE_ENV: '"development"',
6
   NODE_ENV: '"development"',
7
-  BASE_API: '"http://localhost:8085/operate-api"',
7
+  BASE_API: '"http://localhost:8085/property-api"',
8
 })
8
 })

+ 14
- 15
VUECODE/smart-property-manage/src/components/chart/chart1.vue 查看文件

1
 <template>
1
 <template>
2
-  <div id="node1">
3
-  </div>
2
+  <div id="node1"/>
4
 </template>
3
 </template>
5
 
4
 
6
 <script>
5
 <script>
9
 import $ from 'jquery'
8
 import $ from 'jquery'
10
 
9
 
11
 export default {
10
 export default {
12
-  mounted () {
11
+  mounted() {
13
     this.rander()
12
     this.rander()
14
   },
13
   },
15
   methods: {
14
   methods: {
16
-    rander () {
15
+    rander() {
17
       var data = [{
16
       var data = [{
18
         type: '未解决',
17
         type: '未解决',
19
         percent: 0.3
18
         percent: 0.3
20
       }, {
19
       }, {
21
         type: '已解决',
20
         type: '已解决',
22
         percent: 0.7
21
         percent: 0.7
23
-      },]
22
+      }]
24
       var sum = 200
23
       var sum = 200
25
       var ds = new DataSet()
24
       var ds = new DataSet()
26
       var dv = ds.createView().source(data)
25
       var dv = ds.createView().source(data)
27
       dv.transform({
26
       dv.transform({
28
         type: 'map',
27
         type: 'map',
29
-        callback: function callback (row) {
28
+        callback: function callback(row) {
30
           row.value = parseInt(sum * row.percent)
29
           row.value = parseInt(sum * row.percent)
31
           return row
30
           return row
32
         }
31
         }
58
         },
57
         },
59
         rotate: 0,
58
         rotate: 0,
60
         autoRotate: false,
59
         autoRotate: false,
61
-        formatter: function formatter (text, item) {
60
+        formatter: function formatter(text, item) {
62
           return String(parseInt(item.point.percent * 100)) + '%'
61
           return String(parseInt(item.point.percent * 100)) + '%'
63
         }
62
         }
64
       })
63
       })
70
         position: ['50%', '-10%'],
69
         position: ['50%', '-10%'],
71
         html: '<div class="g2-guide-title"><p class="title">昨日工单解决情况200单</p></div>'
70
         html: '<div class="g2-guide-title"><p class="title">昨日工单解决情况200单</p></div>'
72
       })
71
       })
73
-      chart.on('interval:mouseenter', function (ev) {
72
+      chart.on('interval:mouseenter', function(ev) {
74
         var data = ev.data._origin
73
         var data = ev.data._origin
75
-        $(".g2-guide-html").css('opacity', 1)
76
-        $(".g2-guide-html .title").text(data.type)
77
-        $(".g2-guide-html .value").text(data.value)
74
+        $('.g2-guide-html').css('opacity', 1)
75
+        $('.g2-guide-html .title').text(data.type)
76
+        $('.g2-guide-html .value').text(data.value)
78
       })
77
       })
79
 
78
 
80
-      chart.on('interval:mouseleave', function () {
81
-        $(".g2-guide-html .title").text('总计')
82
-        $(".g2-guide-html .value").text(200)
79
+      chart.on('interval:mouseleave', function() {
80
+        $('.g2-guide-html .title').text('总计')
81
+        $('.g2-guide-html .value').text(200)
83
       })
82
       })
84
       chart.render()
83
       chart.render()
85
     }
84
     }
105
     }
104
     }
106
   }
105
   }
107
 }
106
 }
108
-</style>
107
+</style>

+ 9
- 10
VUECODE/smart-property-manage/src/components/chart/chart2.vue 查看文件

1
 <template>
1
 <template>
2
-  <div id="node2"></div>
2
+  <div id="node2"/>
3
 </template>
3
 </template>
4
 
4
 
5
 <script>
5
 <script>
6
 import G2 from '@antv/g2'
6
 import G2 from '@antv/g2'
7
-import DataSet from '@antv/data-set'
8
 
7
 
9
 export default {
8
 export default {
10
-  mounted () {
9
+  mounted() {
11
     this.rander()
10
     this.rander()
12
   },
11
   },
13
   methods: {
12
   methods: {
14
-    rander () {
13
+    rander() {
15
       var data = [{
14
       var data = [{
16
         item: '报修单一',
15
         item: '报修单一',
17
         count: 40,
16
         count: 40,
37
       })
36
       })
38
       chart.source(data, {
37
       chart.source(data, {
39
         percent: {
38
         percent: {
40
-          formatter: function formatter (val) {
39
+          formatter: function formatter(val) {
41
             val = val * 100 + '%'
40
             val = val * 100 + '%'
42
             return val
41
             return val
43
           }
42
           }
54
         showTitle: false,
53
         showTitle: false,
55
         itemTpl: '<li><span style="background-color:{color}" class="g2-tooltip-marker"></span>{name}: {value}</li>'
54
         itemTpl: '<li><span style="background-color:{color}" class="g2-tooltip-marker"></span>{name}: {value}</li>'
56
       })
55
       })
57
-      chart.intervalStack().position('percent').color('item', function (val) {
56
+      chart.intervalStack().position('percent').color('item', function(val) {
58
         if (val === '报修单一') {
57
         if (val === '报修单一') {
59
           return '#53F9FF'
58
           return '#53F9FF'
60
         } else if (val === '报修单二') {
59
         } else if (val === '报修单二') {
65
           return '#454D54'
64
           return '#454D54'
66
         }
65
         }
67
       }).label('percent', {
66
       }).label('percent', {
68
-        formatter: function formatter (val, item) {
67
+        formatter: function formatter(val, item) {
69
           return item._origin.item + ': ' + val
68
           return item._origin.item + ': ' + val
70
         },
69
         },
71
         textStyle: {
70
         textStyle: {
72
           fill: '#a4b6c5', // 文本的颜色
71
           fill: '#a4b6c5', // 文本的颜色
73
-          fontSize: '12', // 文本大小
72
+          fontSize: '12' // 文本大小
74
         }
73
         }
75
-      }).tooltip('item*percent', function (item, percent) {
74
+      }).tooltip('item*percent', function(item, percent) {
76
         percent = percent * 100 + '%'
75
         percent = percent * 100 + '%'
77
         return {
76
         return {
78
           name: item,
77
           name: item,
95
     color: #a4b6c5;
94
     color: #a4b6c5;
96
   }
95
   }
97
 }
96
 }
98
-</style>
97
+</style>

+ 16
- 17
VUECODE/smart-property-manage/src/components/chart/chart5.vue 查看文件

1
 <template>
1
 <template>
2
-  <div id="node5"></div>
2
+  <div id="node5"/>
3
 </template>
3
 </template>
4
 
4
 
5
 <script>
5
 <script>
6
 import G2 from '@antv/g2'
6
 import G2 from '@antv/g2'
7
-import DataSet from '@antv/data-set'
8
 import { mapState, mapActions } from 'vuex'
7
 import { mapState, mapActions } from 'vuex'
9
 
8
 
10
 export default {
9
 export default {
22
     ...mapActions('trunkIndex', [
21
     ...mapActions('trunkIndex', [
23
       'GetSignUser'
22
       'GetSignUser'
24
     ]),
23
     ]),
25
-    rander () {
24
+    rander() {
26
       console.log(this.signUser)
25
       console.log(this.signUser)
27
       var data = this.signUser
26
       var data = this.signUser
28
       var chart = new G2.Chart({
27
       var chart = new G2.Chart({
30
         forceFit: true,
29
         forceFit: true,
31
         height: 282,
30
         height: 282,
32
         padding: [80, 20, 30, 40]
31
         padding: [80, 20, 30, 40]
33
-      });
34
-      chart.source(data);
32
+      })
33
+      chart.source(data)
35
       console.log(chart)
34
       console.log(chart)
36
       chart.axis('count', {
35
       chart.axis('count', {
37
         line: {
36
         line: {
38
           lineWidth: 1, // 设置线的宽度
37
           lineWidth: 1, // 设置线的宽度
39
-          stroke: '#a4b6c5', // 设置线的颜色
38
+          stroke: '#a4b6c5' // 设置线的颜色
40
         },
39
         },
41
         grid: null,
40
         grid: null,
42
         label: {
41
         label: {
47
             textBaseline: 'middle' // 文本基准线,可取 top middle bottom,默认为middle
46
             textBaseline: 'middle' // 文本基准线,可取 top middle bottom,默认为middle
48
           }
47
           }
49
         }
48
         }
50
-      });
49
+      })
51
       chart.axis('message', {
50
       chart.axis('message', {
52
         line: {
51
         line: {
53
           lineWidth: 1, // 设置线的宽度
52
           lineWidth: 1, // 设置线的宽度
54
-          stroke: '#a4b6c5', // 设置线的颜色
53
+          stroke: '#a4b6c5' // 设置线的颜色
55
         },
54
         },
56
         grid: null,
55
         grid: null,
57
         label: {
56
         label: {
58
           textStyle: {
57
           textStyle: {
59
             fill: '#a4b6c5', // 文本的颜色
58
             fill: '#a4b6c5', // 文本的颜色
60
-            fontSize: '12', // 文本大小
59
+            fontSize: '12' // 文本大小
61
           }
60
           }
62
         }
61
         }
63
-      });
62
+      })
64
       chart.scale('', {
63
       chart.scale('', {
65
         tickInterval: 200
64
         tickInterval: 200
66
-      });
65
+      })
67
       chart.guide().html({
66
       chart.guide().html({
68
         position: ['5%', '-25%'],
67
         position: ['5%', '-25%'],
69
         html: '<div class="chart5-title"><p class="title">注册用户统计</p></div>'
68
         html: '<div class="chart5-title"><p class="title">注册用户统计</p></div>'
73
         html: `<div class="chart-right-btn"><span>18/11/27</span>&nbsp;<i class='el-icon-date'></i></div>`
72
         html: `<div class="chart-right-btn"><span>18/11/27</span>&nbsp;<i class='el-icon-date'></i></div>`
74
       })
73
       })
75
 
74
 
76
-      chart.interval().position('message*count').color('message', function (val) {
75
+      chart.interval().position('message*count').color('message', function(val) {
77
         if (val === '业主总数' || val === '家属总数') {
76
         if (val === '业主总数' || val === '家属总数') {
78
-          return '#53F9FF';
77
+          return '#53F9FF'
79
         }
78
         }
80
-        return '#FF5367';
81
-      });
82
-      chart.render();
79
+        return '#FF5367'
80
+      })
81
+      chart.render()
83
     }
82
     }
84
   }
83
   }
85
 }
84
 }
104
     color: #a4b6c5;
103
     color: #a4b6c5;
105
   }
104
   }
106
 }
105
 }
107
-</style>
106
+</style>

+ 33
- 33
VUECODE/smart-property-manage/src/components/chart/chart6.vue 查看文件

1
 <template>
1
 <template>
2
-  <div id="node6"></div>
2
+  <div id="node6"/>
3
 </template>
3
 </template>
4
 
4
 
5
 <script>
5
 <script>
6
 import G2 from '@antv/g2'
6
 import G2 from '@antv/g2'
7
 import DataSet from '@antv/data-set'
7
 import DataSet from '@antv/data-set'
8
 export default {
8
 export default {
9
-  mounted () {
9
+  mounted() {
10
     this.rander()
10
     this.rander()
11
   },
11
   },
12
   methods: {
12
   methods: {
13
-    rander () {
13
+    rander() {
14
       var data = [{
14
       var data = [{
15
-        "year": "11.17",
16
-        "ACME": 300,
15
+        'year': '11.17',
16
+        'ACME': 300
17
       }, {
17
       }, {
18
-        "year": "11.18",
19
-        "ACME": 280,
18
+        'year': '11.18',
19
+        'ACME': 280
20
       }, {
20
       }, {
21
-        "year": "11.19",
22
-        "ACME": 320,
21
+        'year': '11.19',
22
+        'ACME': 320
23
       }, {
23
       }, {
24
-        "year": "11.20",
25
-        "ACME": 250,
24
+        'year': '11.20',
25
+        'ACME': 250
26
       }, {
26
       }, {
27
-        "year": "11.21",
28
-        "ACME": 310,
27
+        'year': '11.21',
28
+        'ACME': 310
29
       }, {
29
       }, {
30
-        "year": "11.22",
31
-        "ACME": 323,
30
+        'year': '11.22',
31
+        'ACME': 323
32
       }, {
32
       }, {
33
-        "year": "11.23",
34
-        "ACME": 350,
35
-      }];
36
-      var dv = new DataSet.View().source(data);
33
+        'year': '11.23',
34
+        'ACME': 350
35
+      }]
36
+      var dv = new DataSet.View().source(data)
37
       dv.transform({
37
       dv.transform({
38
         type: 'fold',
38
         type: 'fold',
39
         fields: ['ACME'],
39
         fields: ['ACME'],
40
         key: 'type',
40
         key: 'type',
41
         value: 'value'
41
         value: 'value'
42
-      });
42
+      })
43
       var chart = new G2.Chart({
43
       var chart = new G2.Chart({
44
         container: 'node6',
44
         container: 'node6',
45
         forceFit: true,
45
         forceFit: true,
46
         height: 282,
46
         height: 282,
47
         padding: [80, 20, 30, 40]
47
         padding: [80, 20, 30, 40]
48
-      });
48
+      })
49
       chart.source(dv, {
49
       chart.source(dv, {
50
         value: {
50
         value: {
51
           alias: 'The Share Price in Dollars',
51
           alias: 'The Share Price in Dollars',
52
-          formatter: function formatter (val) {
53
-            return val;
52
+          formatter: function formatter(val) {
53
+            return val
54
           }
54
           }
55
         },
55
         },
56
         year: {
56
         year: {
57
           range: [0, 1]
57
           range: [0, 1]
58
         }
58
         }
59
-      });
59
+      })
60
       chart.axis('value', {
60
       chart.axis('value', {
61
         line: {
61
         line: {
62
           lineWidth: 1, // 设置线的宽度
62
           lineWidth: 1, // 设置线的宽度
63
-          stroke: '#a4b6c5', // 设置线的颜色
63
+          stroke: '#a4b6c5' // 设置线的颜色
64
         },
64
         },
65
         grid: null,
65
         grid: null,
66
         label: {
66
         label: {
71
             textBaseline: 'middle' // 文本基准线,可取 top middle bottom,默认为middle
71
             textBaseline: 'middle' // 文本基准线,可取 top middle bottom,默认为middle
72
           }
72
           }
73
         }
73
         }
74
-      });
74
+      })
75
       chart.axis('year', {
75
       chart.axis('year', {
76
         line: {
76
         line: {
77
           lineWidth: 1, // 设置线的宽度
77
           lineWidth: 1, // 设置线的宽度
78
-          stroke: '#a4b6c5', // 设置线的颜色
78
+          stroke: '#a4b6c5' // 设置线的颜色
79
         },
79
         },
80
         grid: null,
80
         grid: null,
81
         label: {
81
         label: {
82
           textStyle: {
82
           textStyle: {
83
             fill: '#a4b6c5', // 文本的颜色
83
             fill: '#a4b6c5', // 文本的颜色
84
-            fontSize: '12', // 文本大小
84
+            fontSize: '12' // 文本大小
85
           }
85
           }
86
         }
86
         }
87
-      });
87
+      })
88
       chart.tooltip({
88
       chart.tooltip({
89
         crosshairs: true
89
         crosshairs: true
90
-      });
90
+      })
91
       chart.guide().html({
91
       chart.guide().html({
92
         position: ['90%', '-15%'],
92
         position: ['90%', '-15%'],
93
         html: `<div class="chart-right-btn"><span>日活跃量</span>&nbsp;<i class='el-icon-arrow-down'></i></div>`
93
         html: `<div class="chart-right-btn"><span>日活跃量</span>&nbsp;<i class='el-icon-arrow-down'></i></div>`
94
       })
94
       })
95
-      chart.area().position('year*value').color('type', function (val) { return '#53F9FF' }).shape('smooth');
96
-      chart.line().position('year*value').color('type', function (val) { return '#53F9FF' }).size(2).shape('smooth');
95
+      chart.area().position('year*value').color('type', function(val) { return '#53F9FF' }).shape('smooth')
96
+      chart.line().position('year*value').color('type', function(val) { return '#53F9FF' }).size(2).shape('smooth')
97
       chart.guide().html({
97
       chart.guide().html({
98
         position: ['5%', '-25%'],
98
         position: ['5%', '-25%'],
99
         html: '<div class="chart5-title"><p class="title">上线活跃用户</p></div>'
99
         html: '<div class="chart5-title"><p class="title">上线活跃用户</p></div>'
100
       })
100
       })
101
-      chart.render();
101
+      chart.render()
102
     }
102
     }
103
   }
103
   }
104
 }
104
 }

+ 18
- 19
VUECODE/smart-property-manage/src/components/chart/chart7.vue 查看文件

1
 <template>
1
 <template>
2
-  <div id="node7"></div>
2
+  <div id="node7"/>
3
 </template>
3
 </template>
4
 
4
 
5
 <script>
5
 <script>
6
 import G2 from '@antv/g2'
6
 import G2 from '@antv/g2'
7
-import DataSet from '@antv/data-set'
8
 
7
 
9
 export default {
8
 export default {
10
-  mounted () {
9
+  mounted() {
11
     this.rander()
10
     this.rander()
12
   },
11
   },
13
   methods: {
12
   methods: {
14
-    rander () {
13
+    rander() {
15
       var data = [{
14
       var data = [{
16
         type: '公告',
15
         type: '公告',
17
         sales: 500
16
         sales: 500
21
       }, {
20
       }, {
22
         type: '帖子',
21
         type: '帖子',
23
         sales: 1000
22
         sales: 1000
24
-      }];
23
+      }]
25
       var chart = new G2.Chart({
24
       var chart = new G2.Chart({
26
         container: 'node7',
25
         container: 'node7',
27
         forceFit: true,
26
         forceFit: true,
28
         height: 282,
27
         height: 282,
29
         padding: [80, 20, 30, 40]
28
         padding: [80, 20, 30, 40]
30
-      });
31
-      chart.source(data);
29
+      })
30
+      chart.source(data)
32
       chart.scale('', {
31
       chart.scale('', {
33
         tickInterval: 200
32
         tickInterval: 200
34
-      });
33
+      })
35
       chart.guide().html({
34
       chart.guide().html({
36
         position: ['5%', '-25%'],
35
         position: ['5%', '-25%'],
37
         html: '<div class="chart7-title"><p class="title">内容运营统计</p></div>'
36
         html: '<div class="chart7-title"><p class="title">内容运营统计</p></div>'
43
       chart.axis('sales', {
42
       chart.axis('sales', {
44
         line: {
43
         line: {
45
           lineWidth: 1, // 设置线的宽度
44
           lineWidth: 1, // 设置线的宽度
46
-          stroke: '#a4b6c5', // 设置线的颜色
45
+          stroke: '#a4b6c5' // 设置线的颜色
47
         },
46
         },
48
         grid: null,
47
         grid: null,
49
         label: {
48
         label: {
54
             textBaseline: 'middle' // 文本基准线,可取 top middle bottom,默认为middle
53
             textBaseline: 'middle' // 文本基准线,可取 top middle bottom,默认为middle
55
           }
54
           }
56
         }
55
         }
57
-      });
56
+      })
58
       chart.axis('type', {
57
       chart.axis('type', {
59
         line: {
58
         line: {
60
           lineWidth: 1, // 设置线的宽度
59
           lineWidth: 1, // 设置线的宽度
61
-          stroke: '#a4b6c5', // 设置线的颜色
60
+          stroke: '#a4b6c5' // 设置线的颜色
62
         },
61
         },
63
         grid: null,
62
         grid: null,
64
         label: {
63
         label: {
65
           textStyle: {
64
           textStyle: {
66
             fill: '#a4b6c5', // 文本的颜色
65
             fill: '#a4b6c5', // 文本的颜色
67
-            fontSize: '12', // 文本大小
66
+            fontSize: '12' // 文本大小
68
           }
67
           }
69
         }
68
         }
70
-      });
71
-      chart.interval().position('type*sales').color('type', function (val) {
69
+      })
70
+      chart.interval().position('type*sales').color('type', function(val) {
72
         if (val === '公告') {
71
         if (val === '公告') {
73
-          return '#53F9FF';
72
+          return '#53F9FF'
74
         } else if (val === '活动') {
73
         } else if (val === '活动') {
75
-          return '#FF5367';
74
+          return '#FF5367'
76
         }
75
         }
77
-        return '#3F688D';
78
-      });
79
-      chart.render();
76
+        return '#3F688D'
77
+      })
78
+      chart.render()
80
     }
79
     }
81
   }
80
   }
82
 }
81
 }

+ 7
- 7
VUECODE/smart-property-manage/src/router/index.js 查看文件

68
         name: 'owner-index',
68
         name: 'owner-index',
69
         meta: { title: '已认证业主', icon: 'building' }
69
         meta: { title: '已认证业主', icon: 'building' }
70
       },
70
       },
71
-      // {
72
-      //   path: '/banner/infoBanner',
73
-      //   component: () => import('@/views/banner/infoBanner/index'),
74
-      //   name: 'banner-info',
75
-      //   hidden: true,
76
-      //   meta: { title: '查看banner', icon: 'table' }
77
-      // }
71
+      {
72
+        path: '/building/batch',
73
+        component: () => import('@/views/building/batch/batchImport'),
74
+        name: 'batch-import',
75
+        hidden: true,
76
+        meta: { title: '批量导入楼栋信息', icon: 'table' }
77
+      }
78
     ]
78
     ]
79
   },
79
   },
80
 
80
 

+ 97
- 0
VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue 查看文件

1
+
2
+<template>
3
+  <div class="root">
4
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
5
+      <el-form-item>
6
+        <el-upload
7
+          class="upload-demo"
8
+          action="https://jsonplaceholder.typicode.com/posts/"
9
+          :on-preview="handlePreview"
10
+          :on-remove="handleRemove"
11
+          :before-remove="beforeRemove"
12
+          multiple
13
+          :limit="3"
14
+          :on-exceed="handleExceed"
15
+          :file-list="fileList">
16
+          <el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button>
17
+          <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
18
+          <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
19
+        </el-upload>
20
+      </el-form-item>
21
+    </el-form>
22
+    <el-table
23
+      ref="multipleTable"
24
+      :data="tableData3"
25
+      border
26
+      tooltip-effect="dark"
27
+      style="width: 100%; margin-top: 20px;"
28
+      @selection-change="handleSelectionChange">
29
+      <el-table-column label="栋">
30
+        <template slot-scope="scope">{{ scope.row.date }}</template>
31
+      </el-table-column>
32
+      <el-table-column prop="name" label="单元"/>
33
+      <el-table-column prop="address" label="楼层"/>
34
+      <el-table-column prop="address" label="户号"/>
35
+      <el-table-column prop="address" label="业主姓名"/>
36
+      <el-table-column prop="address" label="手机号码"/>
37
+    </el-table>
38
+    <div class="block">
39
+      <el-pagination
40
+        :current-page="listQuery.pageNum"
41
+        :page-sizes="[5, 10, 20, 30]"
42
+        :page-size="listQuery.pageSize"
43
+        :total="40"
44
+        layout="total, sizes, prev, pager, next, jumper"
45
+        @size-change="handleSizeChange"
46
+        @current-change="handleCurrentChange"/>
47
+    </div>
48
+  </div>
49
+</template>
50
+
51
+<script>
52
+export default {
53
+  data() {
54
+    return {
55
+      listQuery: {
56
+        pageNum: 1,
57
+        pageSize: 20
58
+      },
59
+      currentPage4: 4
60
+    }
61
+  },
62
+  methods: {
63
+    handleSizeChange(val) {
64
+      console.log(`每页 ${val} 条`)
65
+    },
66
+    handleCurrentChange(val) {
67
+      console.log(`当前页: ${val}`)
68
+    },
69
+    dialogBatchImport() {
70
+      this.$router.push({ name: 'batch-import' })
71
+    }
72
+  }
73
+}
74
+</script>
75
+
76
+<style scoped>
77
+.root{
78
+  display: flex;
79
+  flex-flow: column;
80
+}
81
+.form-listQuery{
82
+  margin-top: 20px;
83
+  margin-left: 30px;
84
+}
85
+.operation{
86
+  display: flex;
87
+  justify-content: space-between;
88
+  margin-left: 20px;
89
+  margin-right: 20px;
90
+}
91
+.block{
92
+  display: flex;
93
+  justify-content: flex-end;
94
+  margin-top: 10px;
95
+}
96
+</style>
97
+

+ 4
- 2
VUECODE/smart-property-manage/src/views/building/index.vue 查看文件

35
         <el-button type="danger">删除</el-button>
35
         <el-button type="danger">删除</el-button>
36
       </div>
36
       </div>
37
       <div>
37
       <div>
38
-        <el-button type="primary">下载模板</el-button>
39
-        <el-button type="success">批量导入</el-button>
38
+        <el-button type="success" @click="dialogBatchImport">批量导入楼栋信息</el-button>
40
       </div>
39
       </div>
41
     </div>
40
     </div>
42
     <el-table
41
     <el-table
89
     },
88
     },
90
     handleCurrentChange(val) {
89
     handleCurrentChange(val) {
91
       console.log(`当前页: ${val}`)
90
       console.log(`当前页: ${val}`)
91
+    },
92
+    dialogBatchImport(){
93
+      this.$router.push({ name: 'batch-import'})
92
     }
94
     }
93
   }
95
   }
94
 }
96
 }

+ 8
- 8
VUECODE/smart-property-manage/src/views/index/index.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="main">
2
   <div class="main">
3
     <div class="left">
3
     <div class="left">
4
-      <chart1></chart1>
5
-      <chart2></chart2>
6
-      <chart3></chart3>
4
+      <chart1/>
5
+      <chart2/>
6
+      <chart3/>
7
     </div>
7
     </div>
8
     <div class="middle">
8
     <div class="middle">
9
-      <chart4></chart4>
9
+      <chart4/>
10
     </div>
10
     </div>
11
     <div class="right">
11
     <div class="right">
12
-      <chart5></chart5>
13
-      <chart6></chart6>
14
-      <chart7></chart7>
12
+      <chart5/>
13
+      <chart6/>
14
+      <chart7/>
15
     </div>
15
     </div>
16
   </div>
16
   </div>
17
 </template>
17
 </template>
34
     chart5,
34
     chart5,
35
     chart6,
35
     chart6,
36
     chart7
36
     chart7
37
-  },
37
+  }
38
 }
38
 }
39
 
39
 
40
 </script>
40
 </script>