liu 6 years ago
parent
commit
858c4bb36b

+ 1
- 1
hksystem/build/env.js View File

@@ -1 +1 @@
1
-export default "production";
1
+export default "development";

+ 1
- 6
hksystem/src/router/router.js View File

@@ -61,13 +61,8 @@ export const otherRouter = {
61 61
     component: Main,
62 62
     children: [{
63 63
         path: 'home',
64
-        title: {
65
-            i18n: 'home'
66
-        },
67 64
         name: 'home_index',
68
-        component: resolve => {
69
-            require(['@/views/home/home.vue'], resolve);
70
-        }
65
+        redirect: '/order/housekeeper'
71 66
     }]
72 67
 };
73 68
 

+ 1
- 168
hksystem/src/views/home/home.vue View File

@@ -4,174 +4,7 @@
4 4
 </style>
5 5
 <template>
6 6
     <div class="home-main">
7
-        <Row :gutter="10">
8
-            <Col :md="24" :lg="8">
9
-                <Row class-name="home-page-row1" :gutter="10">
10
-                    <Col :md="12" :lg="24" :style="{marginBottom: '10px'}">
11
-                        <Card>
12
-                            <Row type="flex" class="user-infor">
13
-                                <Col span="8">
14
-                                    <Row class-name="made-child-con-middle" type="flex" align="middle">
15
-                                        <img class="avator-img" :src="avatorPath" />
16
-                                    </Row>
17
-                                </Col>
18
-                                <Col span="16" style="padding-left:6px;">
19
-                                    <Row class-name="made-child-con-middle" type="flex" align="middle">
20
-                                        <div>
21
-                                            <b class="card-user-infor-name">Admin</b>
22
-                                            <p>super admin</p>
23
-                                        </div>
24
-                                    </Row>
25
-                                </Col>
26
-                            </Row>
27
-                            <div class="line-gray"></div>
28
-                            <Row class="margin-top-8">
29
-                                <Col span="8"><p class="notwrap">上次登录时间:</p></Col>
30
-                                <Col span="16" class="padding-left-8">2017.09.12-13:32:20</Col>
31
-                            </Row>
32
-                            <Row class="margin-top-8">
33
-                                <Col span="8"><p class="notwrap">上次登录地点:</p></Col>
34
-                                <Col span="16" class="padding-left-8">北京</Col>
35
-                            </Row>
36
-                        </Card>
37
-                    </Col>
38
-                    <Col :md="12" :lg="24" :style="{marginBottom: '10px'}">
39
-                        <Card>
40
-                            <p slot="title" class="card-title">
41
-                                <Icon type="android-checkbox-outline"></Icon>
42
-                                待办事项
43
-                            </p>
44
-                            <a type="text" slot="extra" @click.prevent="addNewToDoItem">
45
-                                <Icon type="plus-round"></Icon>
46
-                            </a>
47
-                            <Modal
48
-                                v-model="showAddNewTodo"
49
-                                title="添加新的待办事项"
50
-                                @on-ok="addNew"
51
-                                @on-cancel="cancelAdd">
52
-                                <Row type="flex" justify="center">
53
-                                    <Input v-model="newToDoItemValue" icon="compose" placeholder="请输入..." style="width: 300px" />
54
-                                </Row>
55
-                                <Row slot="footer">
56
-                                    <Button type="text" @click="cancelAdd">取消</Button>
57
-                                    <Button type="primary" @click="addNew">确定</Button>
58
-                                </Row>
59
-                            </Modal>
60
-                            <div class="to-do-list-con">
61
-                                <div v-for="(item, index) in toDoList" :key="index" class="to-do-item">
62
-                                    <to-do-list-item :content="item.title"></to-do-list-item>
63
-                                </div>
64
-                            </div>
65
-                        </Card>
66
-                    </Col>
67
-                </Row>
68
-            </Col>
69
-            <Col :md="24" :lg="16">
70
-                <Row :gutter="5">
71
-                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
72
-                        <infor-card
73
-                            id-name="user_created_count"
74
-                            :end-val="count.createUser"
75
-                            iconType="android-person-add"
76
-                            color="#2d8cf0"
77
-                            intro-text="今日新增用户"
78
-                        ></infor-card>
79
-                    </Col>
80
-                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
81
-                        <infor-card
82
-                            id-name="visit_count"
83
-                            :end-val="count.visit"
84
-                            iconType="ios-eye"
85
-                            color="#64d572"
86
-                            :iconSize="50"
87
-                            intro-text="今日浏览量"
88
-                        ></infor-card>
89
-                    </Col>
90
-                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
91
-                        <infor-card
92
-                            id-name="collection_count"
93
-                            :end-val="count.collection"
94
-                            iconType="upload"
95
-                            color="#ffd572"
96
-                            intro-text="今日数据采集量"
97
-                        ></infor-card>
98
-                    </Col>
99
-                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
100
-                        <infor-card
101
-                            id-name="transfer_count"
102
-                            :end-val="count.transfer"
103
-                            iconType="shuffle"
104
-                            color="#f25e43"
105
-                            intro-text="今日服务调用量"
106
-                        ></infor-card>
107
-                    </Col>
108
-                </Row>
109
-                <Row>
110
-                    <Card :padding="0">
111
-                        <p slot="title" class="card-title">
112
-                            <Icon type="map"></Icon>
113
-                            今日服务调用地理分布
114
-                        </p>
115
-                        <div class="map-con">
116
-                            <Col span="10">
117
-                                <map-data-table :cityData="cityData" height="281" :style-obj="{margin: '12px 0 0 11px'}"></map-data-table>
118
-                            </Col>
119
-                            <Col span="14" class="map-incon">
120
-                                <Row type="flex" justify="center" align="middle">
121
-                                    <home-map :city-data="cityData"></home-map>
122
-                                </Row>
123
-                            </Col>
124
-                        </div>
125
-                    </Card>
126
-                </Row>
127
-            </Col>
128
-        </Row>
129
-        <Row :gutter="10" class="margin-top-10">
130
-            <Col :md="24" :lg="8" :style="{marginBottom: '10px'}">
131
-                <Card>
132
-                    <p slot="title" class="card-title">
133
-                        <Icon type="android-map"></Icon>
134
-                        上周每日来访量统计
135
-                    </p>
136
-                    <div class="data-source-row">
137
-                        <visite-volume></visite-volume>
138
-                    </div>
139
-                </Card>
140
-            </Col>
141
-            <Col :md="24" :lg="8" :style="{marginBottom: '10px'}">
142
-                <Card>
143
-                    <p slot="title" class="card-title">
144
-                        <Icon type="ios-pulse-strong"></Icon>
145
-                        数据来源统计
146
-                    </p>
147
-                    <div class="data-source-row">
148
-                        <data-source-pie></data-source-pie>
149
-                    </div>
150
-                </Card>
151
-            </Col>
152
-            <Col :md="24" :lg="8">
153
-                <Card>
154
-                    <p slot="title" class="card-title">
155
-                        <Icon type="android-wifi"></Icon>
156
-                        各类用户服务调用变化统计
157
-                    </p>
158
-                    <div class="data-source-row">
159
-                        <user-flow></user-flow>
160
-                    </div>
161
-                </Card>
162
-            </Col>
163
-        </Row>
164
-        <Row class="margin-top-10">
165
-            <Card>
166
-                <p slot="title" class="card-title">
167
-                    <Icon type="ios-shuffle-strong"></Icon>
168
-                    上周每日服务调用量(万)
169
-                </p>
170
-                <div class="line-chart-con">
171
-                    <service-requests></service-requests>
172
-                </div>
173
-            </Card>
174
-        </Row>
7
+        
175 8
     </div>
176 9
 </template>
177 10
 

+ 246
- 0
hksystem/src/views/home/home.vue.bak View File

@@ -0,0 +1,246 @@
1
+<style lang="less">
2
+    @import "./home.less";
3
+    @import "../../styles/common.less";
4
+</style>
5
+<template>
6
+    <div class="home-main">
7
+        <Row :gutter="10">
8
+            <Col :md="24" :lg="8">
9
+                <Row class-name="home-page-row1" :gutter="10">
10
+                    <Col :md="12" :lg="24" :style="{marginBottom: '10px'}">
11
+                        <Card>
12
+                            <Row type="flex" class="user-infor">
13
+                                <Col span="8">
14
+                                    <Row class-name="made-child-con-middle" type="flex" align="middle">
15
+                                        <img class="avator-img" :src="avatorPath" />
16
+                                    </Row>
17
+                                </Col>
18
+                                <Col span="16" style="padding-left:6px;">
19
+                                    <Row class-name="made-child-con-middle" type="flex" align="middle">
20
+                                        <div>
21
+                                            <b class="card-user-infor-name">Admin</b>
22
+                                            <p>super admin</p>
23
+                                        </div>
24
+                                    </Row>
25
+                                </Col>
26
+                            </Row>
27
+                            <div class="line-gray"></div>
28
+                            <Row class="margin-top-8">
29
+                                <Col span="8"><p class="notwrap">上次登录时间:</p></Col>
30
+                                <Col span="16" class="padding-left-8">2017.09.12-13:32:20</Col>
31
+                            </Row>
32
+                            <Row class="margin-top-8">
33
+                                <Col span="8"><p class="notwrap">上次登录地点:</p></Col>
34
+                                <Col span="16" class="padding-left-8">北京</Col>
35
+                            </Row>
36
+                        </Card>
37
+                    </Col>
38
+                    <Col :md="12" :lg="24" :style="{marginBottom: '10px'}">
39
+                        <Card>
40
+                            <p slot="title" class="card-title">
41
+                                <Icon type="android-checkbox-outline"></Icon>
42
+                                待办事项
43
+                            </p>
44
+                            <a type="text" slot="extra" @click.prevent="addNewToDoItem">
45
+                                <Icon type="plus-round"></Icon>
46
+                            </a>
47
+                            <Modal
48
+                                v-model="showAddNewTodo"
49
+                                title="添加新的待办事项"
50
+                                @on-ok="addNew"
51
+                                @on-cancel="cancelAdd">
52
+                                <Row type="flex" justify="center">
53
+                                    <Input v-model="newToDoItemValue" icon="compose" placeholder="请输入..." style="width: 300px" />
54
+                                </Row>
55
+                                <Row slot="footer">
56
+                                    <Button type="text" @click="cancelAdd">取消</Button>
57
+                                    <Button type="primary" @click="addNew">确定</Button>
58
+                                </Row>
59
+                            </Modal>
60
+                            <div class="to-do-list-con">
61
+                                <div v-for="(item, index) in toDoList" :key="index" class="to-do-item">
62
+                                    <to-do-list-item :content="item.title"></to-do-list-item>
63
+                                </div>
64
+                            </div>
65
+                        </Card>
66
+                    </Col>
67
+                </Row>
68
+            </Col>
69
+            <Col :md="24" :lg="16">
70
+                <Row :gutter="5">
71
+                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
72
+                        <infor-card
73
+                            id-name="user_created_count"
74
+                            :end-val="count.createUser"
75
+                            iconType="android-person-add"
76
+                            color="#2d8cf0"
77
+                            intro-text="今日新增用户"
78
+                        ></infor-card>
79
+                    </Col>
80
+                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
81
+                        <infor-card
82
+                            id-name="visit_count"
83
+                            :end-val="count.visit"
84
+                            iconType="ios-eye"
85
+                            color="#64d572"
86
+                            :iconSize="50"
87
+                            intro-text="今日浏览量"
88
+                        ></infor-card>
89
+                    </Col>
90
+                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
91
+                        <infor-card
92
+                            id-name="collection_count"
93
+                            :end-val="count.collection"
94
+                            iconType="upload"
95
+                            color="#ffd572"
96
+                            intro-text="今日数据采集量"
97
+                        ></infor-card>
98
+                    </Col>
99
+                    <Col :xs="24" :sm="12" :md="6" :style="{marginBottom: '10px'}">
100
+                        <infor-card
101
+                            id-name="transfer_count"
102
+                            :end-val="count.transfer"
103
+                            iconType="shuffle"
104
+                            color="#f25e43"
105
+                            intro-text="今日服务调用量"
106
+                        ></infor-card>
107
+                    </Col>
108
+                </Row>
109
+                <Row>
110
+                    <Card :padding="0">
111
+                        <p slot="title" class="card-title">
112
+                            <Icon type="map"></Icon>
113
+                            今日服务调用地理分布
114
+                        </p>
115
+                        <div class="map-con">
116
+                            <Col span="10">
117
+                                <map-data-table :cityData="cityData" height="281" :style-obj="{margin: '12px 0 0 11px'}"></map-data-table>
118
+                            </Col>
119
+                            <Col span="14" class="map-incon">
120
+                                <Row type="flex" justify="center" align="middle">
121
+                                    <home-map :city-data="cityData"></home-map>
122
+                                </Row>
123
+                            </Col>
124
+                        </div>
125
+                    </Card>
126
+                </Row>
127
+            </Col>
128
+        </Row>
129
+        <Row :gutter="10" class="margin-top-10">
130
+            <Col :md="24" :lg="8" :style="{marginBottom: '10px'}">
131
+                <Card>
132
+                    <p slot="title" class="card-title">
133
+                        <Icon type="android-map"></Icon>
134
+                        上周每日来访量统计
135
+                    </p>
136
+                    <div class="data-source-row">
137
+                        <visite-volume></visite-volume>
138
+                    </div>
139
+                </Card>
140
+            </Col>
141
+            <Col :md="24" :lg="8" :style="{marginBottom: '10px'}">
142
+                <Card>
143
+                    <p slot="title" class="card-title">
144
+                        <Icon type="ios-pulse-strong"></Icon>
145
+                        数据来源统计
146
+                    </p>
147
+                    <div class="data-source-row">
148
+                        <data-source-pie></data-source-pie>
149
+                    </div>
150
+                </Card>
151
+            </Col>
152
+            <Col :md="24" :lg="8">
153
+                <Card>
154
+                    <p slot="title" class="card-title">
155
+                        <Icon type="android-wifi"></Icon>
156
+                        各类用户服务调用变化统计
157
+                    </p>
158
+                    <div class="data-source-row">
159
+                        <user-flow></user-flow>
160
+                    </div>
161
+                </Card>
162
+            </Col>
163
+        </Row>
164
+        <Row class="margin-top-10">
165
+            <Card>
166
+                <p slot="title" class="card-title">
167
+                    <Icon type="ios-shuffle-strong"></Icon>
168
+                    上周每日服务调用量(万)
169
+                </p>
170
+                <div class="line-chart-con">
171
+                    <service-requests></service-requests>
172
+                </div>
173
+            </Card>
174
+        </Row>
175
+    </div>
176
+</template>
177
+
178
+<script>
179
+import cityData from './map-data/get-city-value.js';
180
+import homeMap from './components/map.vue';
181
+import dataSourcePie from './components/dataSourcePie.vue';
182
+import visiteVolume from './components/visiteVolume.vue';
183
+import serviceRequests from './components/serviceRequests.vue';
184
+import userFlow from './components/userFlow.vue';
185
+import countUp from './components/countUp.vue';
186
+import inforCard from './components/inforCard.vue';
187
+import mapDataTable from './components/mapDataTable.vue';
188
+import toDoListItem from './components/toDoListItem.vue';
189
+
190
+export default {
191
+    name: 'home',
192
+    components: {
193
+        homeMap,
194
+        dataSourcePie,
195
+        visiteVolume,
196
+        serviceRequests,
197
+        userFlow,
198
+        countUp,
199
+        inforCard,
200
+        mapDataTable,
201
+        toDoListItem
202
+    },
203
+    data () {
204
+        return {
205
+            toDoList: [
206
+            ],
207
+            count: {
208
+                createUser: 496,
209
+                visit: 3264,
210
+                collection: 24389305,
211
+                transfer: 39503498
212
+            },
213
+            cityData: cityData,
214
+            showAddNewTodo: false,
215
+            newToDoItemValue: ''
216
+        };
217
+    },
218
+    computed: {
219
+        avatorPath () {
220
+            return localStorage.avatorImgPath;
221
+        }
222
+    },
223
+    methods: {
224
+        addNewToDoItem () {
225
+            this.showAddNewTodo = true;
226
+        },
227
+        addNew () {
228
+            if (this.newToDoItemValue.length !== 0) {
229
+                this.toDoList.unshift({
230
+                    title: this.newToDoItemValue
231
+                });
232
+                setTimeout(() => {
233
+                    this.newToDoItemValue = '';
234
+                }, 200);
235
+                this.showAddNewTodo = false;
236
+            } else {
237
+                this.$Message.error('请输入待办事项内容');
238
+            }
239
+        },
240
+        cancelAdd () {
241
+            this.showAddNewTodo = false;
242
+            this.newToDoItemValue = '';
243
+        }
244
+    }
245
+};
246
+</script>

Loading…
Cancel
Save