diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue new file mode 100644 index 0000000..14fbdf4 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontal.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue new file mode 100644 index 0000000..14fbdf4 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontal.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue new file mode 100644 index 0000000..4ee1096 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue new file mode 100644 index 0000000..14fbdf4 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontal.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue new file mode 100644 index 0000000..4ee1096 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue new file mode 100644 index 0000000..f6e3b3b --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -0,0 +1,464 @@ + + + + + diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue new file mode 100644 index 0000000..14fbdf4 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontal.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue new file mode 100644 index 0000000..4ee1096 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue new file mode 100644 index 0000000..f6e3b3b --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -0,0 +1,464 @@ + + + + + diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue new file mode 100644 index 0000000..4e2065e --- /dev/null +++ b/src/views/tested/dashboard/components/tableList.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue new file mode 100644 index 0000000..14fbdf4 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontal.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue new file mode 100644 index 0000000..4ee1096 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue new file mode 100644 index 0000000..f6e3b3b --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -0,0 +1,464 @@ + + + + + diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue new file mode 100644 index 0000000..4e2065e --- /dev/null +++ b/src/views/tested/dashboard/components/tableList.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue index f0351a8..9243061 100644 --- a/src/views/tested/dashboard/index.vue +++ b/src/views/tested/dashboard/index.vue @@ -2,12 +2,13 @@ diff --git a/.env.development b/.env.development index 19ebebf..f5906c2 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.100:5909 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.100:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 13aa1a9..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.100:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/dashboard/calendar.ts b/src/api/eqpt/dashboard/calendar.ts index c91b411..2bec052 100644 --- a/src/api/eqpt/dashboard/calendar.ts +++ b/src/api/eqpt/dashboard/calendar.ts @@ -6,7 +6,7 @@ // 新增日程 export function addSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/add', + url: '/board/calendar/save', method: 'post', data, }) @@ -14,24 +14,24 @@ // 编辑日程 export function editSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/update', + url: '/board/calendar/save', method: 'post', data, }) } // 日历列表 -export function getCalendarList(data: { calendarMonth: string; userId: string }) { +export function getCalendarList(params: { calendarMonth: string; userId: string }) { return request({ - // url: '/workbench/calendarSchedule/list', - method: 'post', - data, + url: '/board/calendar/list', + method: 'get', + params, }) } // 删除日程 export function delSchedule(data: object) { return request({ - // url: '/workbench/calendarSchedule/delete', + url: '/board/calendar/remove', method: 'post', data, }) diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts new file mode 100644 index 0000000..3f6e96d --- /dev/null +++ b/src/api/eqpt/dashboard/index.ts @@ -0,0 +1,19 @@ +/** + * 首页接口 + */ +import request from '@/api/index' + +// 检定统计 +export function getMeasureDetail() { + return request({ + url: '/board/check/summary', + method: 'get', + }) +} +// 检定统计趋势 - echart数据 +export function getMeasureDetailTrend() { + return request({ + url: '/board/check/trend', + method: 'get', + }) +} diff --git a/src/assets/images/bench/have.png b/src/assets/images/bench/have.png new file mode 100644 index 0000000..ab7899a --- /dev/null +++ b/src/assets/images/bench/have.png Binary files differ diff --git a/src/assets/images/bench/to.png b/src/assets/images/bench/to.png new file mode 100644 index 0000000..19e7bf3 --- /dev/null +++ b/src/assets/images/bench/to.png Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..5c52340 --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" new file mode 100644 index 0000000..2e6b31b --- /dev/null +++ "b/src/assets/images/bench/\345\234\250\347\224\250\350\256\276\345\244\207.png" Binary files differ diff --git "a/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" new file mode 100644 index 0000000..09ef11b --- /dev/null +++ "b/src/assets/images/bench/\345\276\205\346\243\200\350\256\276\345\244\207.png" Binary files differ diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue index 74d506a..e2b8f12 100644 --- a/src/components/Echart/PieChart.vue +++ b/src/components/Echart/PieChart.vue @@ -192,6 +192,11 @@ option.title = { show: true, text: props.title, + // textStyle: { + // color: props.fontColor, + // fontWeight: 'bolder', + // fontSize: 19, + // }, } } // 标题 @@ -211,7 +216,7 @@ right: props.right, label: { show: props.labelShow, - position: 'center', + position: props.labelPosition, formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'), fontSize: 20, fontWeight: 'bold', diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue new file mode 100644 index 0000000..14fbdf4 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontal.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue new file mode 100644 index 0000000..4ee1096 --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue new file mode 100644 index 0000000..f6e3b3b --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -0,0 +1,464 @@ + + + + + diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue new file mode 100644 index 0000000..4e2065e --- /dev/null +++ b/src/views/tested/dashboard/components/tableList.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue index f0351a8..9243061 100644 --- a/src/views/tested/dashboard/index.vue +++ b/src/views/tested/dashboard/index.vue @@ -2,12 +2,13 @@ diff --git a/src/views/tested/dashboard/index1.vue b/src/views/tested/dashboard/index1.vue index bc6d4ce..10362ba 100644 --- a/src/views/tested/dashboard/index1.vue +++ b/src/views/tested/dashboard/index1.vue @@ -15,11 +15,11 @@
- + - + - +