diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue index 61e315b..b4826ff 100644 --- a/src/views/dashboard/components/passCount.vue +++ b/src/views/dashboard/components/passCount.vue @@ -1,5 +1,12 @@ + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue index 61e315b..b4826ff 100644 --- a/src/views/dashboard/components/passCount.vue +++ b/src/views/dashboard/components/passCount.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue index c2a52ac..8d02422 100644 --- a/src/views/dashboard/components/passOneDay.vue +++ b/src/views/dashboard/components/passOneDay.vue @@ -1,5 +1,12 @@ + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue index 61e315b..b4826ff 100644 --- a/src/views/dashboard/components/passCount.vue +++ b/src/views/dashboard/components/passCount.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue index c2a52ac..8d02422 100644 --- a/src/views/dashboard/components/passOneDay.vue +++ b/src/views/dashboard/components/passOneDay.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 7e22102..488197e 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue index 61e315b..b4826ff 100644 --- a/src/views/dashboard/components/passCount.vue +++ b/src/views/dashboard/components/passCount.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue index c2a52ac..8d02422 100644 --- a/src/views/dashboard/components/passOneDay.vue +++ b/src/views/dashboard/components/passOneDay.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 7e22102..488197e 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue index 10502d8..8875f5a 100644 --- a/src/views/dashboard/components/tempAnalysis.vue +++ b/src/views/dashboard/components/tempAnalysis.vue @@ -1,5 +1,12 @@ + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue index 61e315b..b4826ff 100644 --- a/src/views/dashboard/components/passCount.vue +++ b/src/views/dashboard/components/passCount.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue index c2a52ac..8d02422 100644 --- a/src/views/dashboard/components/passOneDay.vue +++ b/src/views/dashboard/components/passOneDay.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 7e22102..488197e 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue index 10502d8..8875f5a 100644 --- a/src/views/dashboard/components/tempAnalysis.vue +++ b/src/views/dashboard/components/tempAnalysis.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue index f1404bb..a53b5a5 100644 --- a/src/views/dashboard/components/tempOneDay.vue +++ b/src/views/dashboard/components/tempOneDay.vue @@ -1,5 +1,14 @@ + diff --git a/config/dev.env.js b/config/dev.env.js index d0398c7..568bd50 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"111.198.10.15:11802"' + BASE_API: '"http://111.198.10.15:11802"' // BASE_API: '"http://192.168.0.18:8095"' - BASE_API: '"http://192.168.0.166:8093"' + // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/api/statistics.js b/src/api/statistics.js index d149a26..5f0a35f 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,6 +37,14 @@ }) } +export function peopleCountByParentDept(params) { + return request({ + url: 'statistic/peopleCountByParentDept', + method: 'get', + params + }) +} + export function printCountByDept(params) { return request({ url: 'statistic/printCountByDept', @@ -45,6 +53,14 @@ }) } +export function canteenCountByDept(params) { + return request({ + url: 'statistic/canteenCountByDept', + method: 'get', + params + }) +} + export function countbyTime(params) { return request({ url: 'statistic/countbyTime', @@ -61,3 +77,11 @@ }) } +export function countbyLocation(params) { + return request({ + url: 'statistic/countbyLocation', + method: 'get', + params + }) +} + diff --git a/src/assets/eryuan/1.png b/src/assets/eryuan/1.png new file mode 100644 index 0000000..6a2c345 --- /dev/null +++ b/src/assets/eryuan/1.png Binary files differ diff --git a/src/assets/eryuan/4.png b/src/assets/eryuan/4.png new file mode 100644 index 0000000..4cb855c --- /dev/null +++ b/src/assets/eryuan/4.png Binary files differ diff --git a/src/assets/eryuan/8.png b/src/assets/eryuan/8.png new file mode 100644 index 0000000..3bf3c92 --- /dev/null +++ b/src/assets/eryuan/8.png Binary files differ diff --git a/src/assets/eryuan/B1.png b/src/assets/eryuan/B1.png new file mode 100644 index 0000000..08c6f68 --- /dev/null +++ b/src/assets/eryuan/B1.png Binary files differ diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index daf4f41..fcf192a 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -53,7 +53,7 @@ diff --git a/src/views/dashboard/components/mealAnalysis.vue b/src/views/dashboard/components/mealAnalysis.vue new file mode 100644 index 0000000..1ddf9dd --- /dev/null +++ b/src/views/dashboard/components/mealAnalysis.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue index a841e49..74923e5 100644 --- a/src/views/dashboard/components/passAnalysis.vue +++ b/src/views/dashboard/components/passAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/passAnalysisParentDept.vue b/src/views/dashboard/components/passAnalysisParentDept.vue new file mode 100644 index 0000000..08e8920 --- /dev/null +++ b/src/views/dashboard/components/passAnalysisParentDept.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue index 61e315b..b4826ff 100644 --- a/src/views/dashboard/components/passCount.vue +++ b/src/views/dashboard/components/passCount.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue index c2a52ac..8d02422 100644 --- a/src/views/dashboard/components/passOneDay.vue +++ b/src/views/dashboard/components/passOneDay.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 7e22102..488197e 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue index 10502d8..8875f5a 100644 --- a/src/views/dashboard/components/tempAnalysis.vue +++ b/src/views/dashboard/components/tempAnalysis.vue @@ -1,5 +1,12 @@ + diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue index f1404bb..a53b5a5 100644 --- a/src/views/dashboard/components/tempOneDay.vue +++ b/src/views/dashboard/components/tempOneDay.vue @@ -1,5 +1,14 @@ + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 1577e75..5f3aceb 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,7 +1,20 @@