diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 640b85f..dd8e410 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -3,44 +3,35 @@
请选择生成报表的考勤月或起止日期 - - - - - - - - - - - - - - - - - - - - - 生成报表 - + + + + + + + + + + + + 生成报表 + 生成实习生报表
@@ -48,7 +39,7 @@ + + diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 640b85f..dd8e410 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -3,44 +3,35 @@
请选择生成报表的考勤月或起止日期 - - - - - - - - - - - - - - - - - - - - - 生成报表 - + + + + + + + + + + + + 生成报表 + 生成实习生报表
@@ -48,7 +39,7 @@ + + diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 43370ca..02a9a5b 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -115,6 +115,16 @@ + + + + + + + + + + @@ -289,7 +299,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 640b85f..dd8e410 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -3,44 +3,35 @@
请选择生成报表的考勤月或起止日期 - - - - - - - - - - - - - - - - - - - - - 生成报表 - + + + + + + + + + + + + 生成报表 + 生成实习生报表
@@ -48,7 +39,7 @@ + + diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 43370ca..02a9a5b 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -115,6 +115,16 @@ + + + + + + + + + + @@ -289,7 +299,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index 824a451..bae024b 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -116,6 +116,16 @@ + + + + + + + + + + @@ -309,7 +319,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 640b85f..dd8e410 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -3,44 +3,35 @@
请选择生成报表的考勤月或起止日期 - - - - - - - - - - - - - - - - - - - - - 生成报表 - + + + + + + + + + + + + 生成报表 + 生成实习生报表
@@ -48,7 +39,7 @@ + + diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 43370ca..02a9a5b 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -115,6 +115,16 @@ + + + + + + + + + + @@ -289,7 +299,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index 824a451..bae024b 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -116,6 +116,16 @@ + + + + + + + + + + @@ -309,7 +319,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index fbb7be0..1ff7ff1 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -110,7 +110,7 @@ deptid: '', // 部门 sex: '', // 性别 duty: '', // 职务 - personType: '1', // 人员类型 + personType: '', // 人员类 offset: 1, limit: 20, sort: '', @@ -207,6 +207,12 @@ value: 'annualLeave', align: 'center' }) + this.columns.push( + { + text: '是否实习生', + value: 'personType', + align: 'center' + }) } this.fetchSexType()// 获取性别列表 this.fetchDutyType() // 获取职务列表 diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 640b85f..dd8e410 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -3,44 +3,35 @@
请选择生成报表的考勤月或起止日期 - - - - - - - - - - - - - - - - - - - - - 生成报表 - + + + + + + + + + + + + 生成报表 + 生成实习生报表
@@ -48,7 +39,7 @@ + + diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 43370ca..02a9a5b 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -115,6 +115,16 @@ + + + + + + + + + + @@ -289,7 +299,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index 824a451..bae024b 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -116,6 +116,16 @@ + + + + + + + + + + @@ -309,7 +319,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index fbb7be0..1ff7ff1 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -110,7 +110,7 @@ deptid: '', // 部门 sex: '', // 性别 duty: '', // 职务 - personType: '1', // 人员类型 + personType: '', // 人员类 offset: 1, limit: 20, sort: '', @@ -207,6 +207,12 @@ value: 'annualLeave', align: 'center' }) + this.columns.push( + { + text: '是否实习生', + value: 'personType', + align: 'center' + }) } this.fetchSexType()// 获取性别列表 this.fetchDutyType() // 获取职务列表 diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue index a905f23..35affe4 100644 --- a/src/views/statistics/pieChart.vue +++ b/src/views/statistics/pieChart.vue @@ -29,7 +29,7 @@ show: true } this.chartSettings = { - limitShowNum: 5, + limitShowNum: this.baseConfig.pieChartLimit, label: { normal: { show: true diff --git a/config/dev.env.js b/config/dev.env.js index 22aea85..b33ce77 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://127.0.0.1:8095"' + BASE_API: '"http://192.168.8.109:8095"' // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index 853adc5..72c5e6e 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -14,6 +14,16 @@ }) } +export function makeReportTrainee(params) { + return request({ + url: 'makeReport/makeTrainee', + method: 'get', + timeout: 180000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + // 获取报表数据查询页的部门列表数据 export function getDeptList() { return request({ diff --git a/src/main.js b/src/main.js index d8a2486..536ffcb 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,10 @@ import '@/icons' // icon import '@/permission' // permission control + +import 'leaflet/dist/leaflet.css' +import L from "leaflet" + /** * This project originally used easy-mock to simulate data, * but its official service is very unstable, @@ -68,17 +72,23 @@ // 配置是否启用考勤功能 export const attendanceEnable = true -new Vue({ - el: '#app', - router, - data() { - return { - ws: null, - wsURL: 'ws://127.0.0.1:1234', - devInited: false - } - }, - store, - render: h => h(App) +import axios from 'axios' +axios.get('./static/config.json').then((result) => { + Vue.prototype.baseConfig = result.data + new Vue({ + el: '#app', + router, + data() { + return { + ws: null, + wsURL: 'ws://127.0.0.1:1234', + devInited: false + } + }, + store, + render: h => h(App) + }) +}).catch((error) => { + console.log('get base config ...' + error) }) diff --git a/src/router/index.js b/src/router/index.js index 57555ea..790e1b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,6 +58,7 @@ path: 'dashboard', name: 'Dashboard', component: () => import('@/views/dashboard/indexPro'), + // component: () => import('@/views/leaflet-test/overview-leaflet'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 640b85f..dd8e410 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -3,44 +3,35 @@
请选择生成报表的考勤月或起止日期 - - - - - - - - - - - - - - - - - - - - - 生成报表 - + + + + + + + + + + + + 生成报表 + 生成实习生报表
@@ -48,7 +39,7 @@ + + diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 43370ca..02a9a5b 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -115,6 +115,16 @@ + + + + + + + + + + @@ -289,7 +299,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index 824a451..bae024b 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -116,6 +116,16 @@ + + + + + + + + + + @@ -309,7 +319,7 @@ remarks: '', // 备注 duty: '', // 职务 sex: '', // 性别 - personType: '1', // 人员类型 + personType: '', // 人员类型 birthday: '', // 出生日期 nation: '', // 民族 photo: '', diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index fbb7be0..1ff7ff1 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -110,7 +110,7 @@ deptid: '', // 部门 sex: '', // 性别 duty: '', // 职务 - personType: '1', // 人员类型 + personType: '', // 人员类 offset: 1, limit: 20, sort: '', @@ -207,6 +207,12 @@ value: 'annualLeave', align: 'center' }) + this.columns.push( + { + text: '是否实习生', + value: 'personType', + align: 'center' + }) } this.fetchSexType()// 获取性别列表 this.fetchDutyType() // 获取职务列表 diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue index a905f23..35affe4 100644 --- a/src/views/statistics/pieChart.vue +++ b/src/views/statistics/pieChart.vue @@ -29,7 +29,7 @@ show: true } this.chartSettings = { - limitShowNum: 5, + limitShowNum: this.baseConfig.pieChartLimit, label: { normal: { show: true diff --git a/static/config.json b/static/config.json new file mode 100644 index 0000000..0b8ef76 --- /dev/null +++ b/static/config.json @@ -0,0 +1,3 @@ +{ + "pieChartLimit": 0 +}